diff options
Diffstat (limited to 'src/levelnames.cpp')
| -rw-r--r-- | src/levelnames.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/levelnames.cpp b/src/levelnames.cpp index 02aa4b7..1f05386 100644 --- a/src/levelnames.cpp +++ b/src/levelnames.cpp @@ -8,40 +8,32 @@ //#define DEBUG_NAMES #ifndef DEBUG_NAMES -#define OSReport(...) #endif extern char CurrentLevel; extern char CurrentWorld; int DoNames(int state) { - OSReport("DoNames called - State param is %d\n", state); int wnum = (int)CurrentWorld; int lnum = (int)CurrentLevel; - OSReport("Current Level: %d-%d\n", wnum+1, lnum+1); // Skip the title screen // and only process the code if the State is set to 1 // (the screen has been initialised) if (state == 1 && lnum != STAGE_TITLE) { - OSReport("Processing\n"); // grab the CRSIN object Actor *ptr = FindActorByType(CRSIN, 0); - //OSReport("CRSIN actor found at : %08X\n", ptr); // FIX !!!!! if (ptr != 0) { void *worldObj = EmbeddedLayout_FindTextBoxByName((Layout*)((u32)ptr+0xB0), "TXT_WorldName"); void *levelObj = EmbeddedLayout_FindTextBoxByName((Layout*)((u32)ptr+0xB0), "TXT_LevelName"); - //OSReport("WorldObj TextBox : %08X; LevelObj TextBox : %08X\n", worldObj, levelObj); if (worldObj == 0 || levelObj == 0) return state; /*char *file = RetrieveFileFromArc(ARC_TABLE, "Mario", "newer/names.bin"); - //OSReport("RetrieveFileFromArc returned : %08X\n", file); char *worldname = file + (wnum * 0x40); char *levelname = file + 0x280 + (wnum * 0xA80) + (lnum * 0x40);*/ - OSReport("Loading file...\n"); FileHandle fh; void *info = LoadFile(&fh, "/NewerRes/LevelInfo.bin"); @@ -49,7 +41,6 @@ int DoNames(int state) { LevelInfo_Entry *entry = LevelInfo_Search(info, wnum, lnum); char *worldname = LevelInfo_GetName(info, entry); char *levelname = ""; - OSReport("Got name : %s\n", worldname); void *vtable = *((void**)levelObj); void *funcaddr = *((void**)((u32)vtable+0x7C)); @@ -65,19 +56,14 @@ int DoNames(int state) { SetString(worldObj, wbuffer, 0); SetString(levelObj, lbuffer, 0); - OSReport("Freeing file\n"); FreeFile(&fh); - OSReport("Inserted strings\n"); } } else { - OSReport("Skipped\n"); } - OSReport("Reached the end of DoNames\n"); return state; } int DoNamesTest2(int state, u32 ptr) { - OSReport("TEST 1:%08X 2:%08X\n", state, ptr); return DoNames(state); } |