diff options
author | Cameron Hall <cameronghall@cox.net> | 2019-08-11 20:57:10 -0500 |
---|---|---|
committer | Cameron Hall <cameronghall@cox.net> | 2019-08-11 20:57:10 -0500 |
commit | 93f755636be0dcf395ad86bcedc30cefb1fb369e (patch) | |
tree | 52d79bd639d0704aac4e84f92723b03d82ee1ebe | |
parent | d06a2d63c051f4f5eef247944e006ff93a9f3160 (diff) |
more labeling
-rwxr-xr-x | asm/bonus_field_select.s | 2 | ||||
-rwxr-xr-x | asm/ereader.s | 4 | ||||
-rwxr-xr-x | asm/high_scores.s | 6 | ||||
-rwxr-xr-x | asm/intro.s | 14 | ||||
-rwxr-xr-x | asm/pokedex.s | 2 | ||||
-rwxr-xr-x | asm/rom_3219C.s | 4 | ||||
-rwxr-xr-x | asm/rom_9BC.s | 8 | ||||
-rwxr-xr-x | data/rom.s | 2 | ||||
-rw-r--r-- | include/functions.h | 26 | ||||
-rwxr-xr-x | include/main.h | 12 | ||||
-rw-r--r-- | include/variables.h | 6 | ||||
-rw-r--r-- | src/field_select.c | 2 | ||||
-rwxr-xr-x | src/main.c | 36 | ||||
-rw-r--r-- | src/options.c | 2 | ||||
-rw-r--r-- | src/rom_1068C.c | 4 | ||||
-rw-r--r-- | src/rom_528AC.c | 2 | ||||
-rwxr-xr-x | src/rom_850.c | 52 | ||||
-rwxr-xr-x | src/titlescreen.c | 2 | ||||
-rwxr-xr-x | src/util.c | 6 | ||||
-rw-r--r-- | sym_ewram.txt | 6 |
20 files changed, 97 insertions, 101 deletions
diff --git a/asm/bonus_field_select.s b/asm/bonus_field_select.s index 75f11da..f1b177d 100755 --- a/asm/bonus_field_select.s +++ b/asm/bonus_field_select.s @@ -23,7 +23,7 @@ _080025C0: .4byte gMain thumb_func_start sub_25C4 sub_25C4: @ 0x080025C4 push {r4, lr} - bl sub_438 + bl ResetSomeGraphicsRelatedStuff movs r2, #0x80 lsls r2, r2, #0x13 movs r1, #0x84 diff --git a/asm/ereader.s b/asm/ereader.s index b5a612c..6ae020e 100755 --- a/asm/ereader.s +++ b/asm/ereader.s @@ -26,7 +26,7 @@ sub_2C78: @ 0x08002C78 mov r6, sb mov r5, r8 push {r5, r6} - bl sub_438 + bl ResetSomeGraphicsRelatedStuff movs r2, #0x80 lsls r2, r2, #0x13 movs r1, #0x86 @@ -922,7 +922,7 @@ sub_343C: @ 0x0800343C mov r6, sb mov r5, r8 push {r5, r6} - bl sub_438 + bl ResetSomeGraphicsRelatedStuff movs r2, #0x80 lsls r2, r2, #0x13 movs r1, #0x86 diff --git a/asm/high_scores.s b/asm/high_scores.s index 2db7c6a..b82e058 100755 --- a/asm/high_scores.s +++ b/asm/high_scores.s @@ -40,7 +40,7 @@ _0800CE84: .4byte gMain thumb_func_start sub_CE88 sub_CE88: @ 0x0800CE88 push {r4, r5, r6, r7, lr} - bl sub_438 + bl ResetSomeGraphicsRelatedStuff movs r2, #0x80 lsls r2, r2, #0x13 movs r1, #0x84 @@ -1864,7 +1864,7 @@ sub_DD70: @ 0x0800DD70 push {r4, r5, r6, lr} mov r6, r8 push {r6} - bl sub_438 + bl ResetSomeGraphicsRelatedStuff movs r2, #0x80 lsls r2, r2, #0x13 movs r1, #0x84 @@ -2283,7 +2283,7 @@ sub_E0EC: @ 0x0800E0EC push {r4, r5, r6, lr} mov r6, r8 push {r6} - bl sub_438 + bl ResetSomeGraphicsRelatedStuff movs r2, #0x80 lsls r2, r2, #0x13 movs r1, #0x84 diff --git a/asm/intro.s b/asm/intro.s index 401f925..0783af7 100755 --- a/asm/intro.s +++ b/asm/intro.s @@ -23,7 +23,7 @@ _08009298: .4byte gMain thumb_func_start sub_929C sub_929C: @ 0x0800929C push {r4, lr} - bl sub_438 + bl ResetSomeGraphicsRelatedStuff movs r3, #0x80 lsls r3, r3, #0x13 movs r0, #0x80 @@ -70,7 +70,7 @@ sub_929C: @ 0x0800929C ldr r0, _08009340 @ =gUnknown_0202C790 strb r2, [r0] ldr r0, _08009344 @ =sub_93F8 + 1 - bl sub_898 + bl SetMainCallback bl sub_CBC bl sub_24C ldrb r0, [r4, #3] @@ -169,7 +169,7 @@ sub_93D0: @ 0x080093D0 bl sub_2B4 bl m4aMPlayAllStop bl sub_D10 - bl sub_8BC + bl ResetMainCallback ldr r1, _080093F4 @ =gAutoDisplayTitlescreenMenu movs r0, #0 strb r0, [r1] @@ -266,7 +266,7 @@ sub_9498: @ 0x08009498 push {r5, r6, r7} bl ClearGraphicsMemory bl sub_518 - bl sub_578 + bl ClearSprites movs r2, #0x80 lsls r2, r2, #0x13 movs r1, #0x80 @@ -3630,7 +3630,7 @@ sub_B090: @ 0x0800B090 push {lr} sub sp, #8 bl sub_10480 - bl sub_578 + bl ClearSprites movs r2, #0 str r2, [sp] ldr r1, _0800B0D4 @ =0x040000D4 @@ -4488,7 +4488,7 @@ _0800B79C: .4byte gUnknown_0202C790 sub_B7A0: @ 0x0800B7A0 push {lr} sub sp, #8 - bl sub_578 + bl ClearSprites movs r2, #0 str r2, [sp] ldr r1, _0800B7E4 @ =0x040000D4 @@ -6093,7 +6093,7 @@ sub_C498: @ 0x0800C498 push {lr} sub sp, #8 bl sub_10480 - bl sub_578 + bl ClearSprites movs r2, #0 str r2, [sp] ldr r1, _0800C4DC @ =0x040000D4 diff --git a/asm/pokedex.s b/asm/pokedex.s index c0c5dea..8aaa2c7 100755 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -27,7 +27,7 @@ sub_3DCC: @ 0x08003DCC mov r6, sb mov r5, r8 push {r5, r6, r7} - bl sub_438 + bl ResetSomeGraphicsRelatedStuff movs r2, #0x80 lsls r2, r2, #0x13 movs r1, #0x86 diff --git a/asm/rom_3219C.s b/asm/rom_3219C.s index 78f972d..e88ef82 100755 --- a/asm/rom_3219C.s +++ b/asm/rom_3219C.s @@ -5595,7 +5595,7 @@ _08035170: .align 2, 0 _08035194: .4byte gMain _08035198: - bl sub_438 + bl ResetSomeGraphicsRelatedStuff ldr r0, [r5] strb r4, [r0, #0x1d] _080351A0: @@ -46258,7 +46258,7 @@ _08049EFA: ldr r1, _08049F1C @ =gUnknown_020314E0 ldr r0, _08049F20 @ =gUnknown_02000000 str r0, [r1] - bl sub_438 + bl ResetSomeGraphicsRelatedStuff ldr r1, _08049F18 @ =gMain movs r0, #0 strb r0, [r1, #0xe] diff --git a/asm/rom_9BC.s b/asm/rom_9BC.s index 12970f6..fc9c5bc 100755 --- a/asm/rom_9BC.s +++ b/asm/rom_9BC.s @@ -620,9 +620,9 @@ sub_1884: @ 0x08001884 mov r1, r8 strh r0, [r1] ldr r0, _08001960 @ =sub_19CC + 1 - bl sub_898 + bl SetMainCallback ldr r0, _08001964 @ =sub_1A78 + 1 - bl sub_8D4 + bl SetVBlankIntrFunc strh r4, [r5] ldrh r0, [r6] movs r1, #0x80 @@ -2250,8 +2250,8 @@ sub_2568: @ 0x08002568 ldr r4, _08002594 @ =0x04000208 movs r0, #0 strh r0, [r4] - bl sub_8BC - bl sub_8FC + bl ResetMainCallback + bl ResetVBlankIntrFunc ldr r1, _08002598 @ =0x04000200 ldr r2, _0800259C @ =0x00002005 adds r0, r2, #0 @@ -2008,7 +2008,7 @@ gUnknown_086A4A38:: @ 0x086A4A38 gIntrTableTemplate:: @ 0x086A4AA0 .4byte SerialIntr .4byte Timer3Intr - .4byte HBlankIntr + .4byte VBlankIntr .4byte IntrDummy .4byte VCountIntr .4byte IntrDummy diff --git a/include/functions.h b/include/functions.h index c84637b..fb19977 100644 --- a/include/functions.h +++ b/include/functions.h @@ -20,7 +20,7 @@ void sub_1340(void); void AgbMain(void); void sub_9BC_Main(void); -void HBlankIntr(void); +void VBlankIntr(void); void VCountIntr(void); void SerialIntr(void); void Timer3Intr(void); @@ -32,7 +32,7 @@ s16 sub_C74(u16 arg0); void sub_CBC(void); void sub_D10(void); void sub_D74(void); -void sub_DC4(void); +void DefaultMainCallback(void); // src/rom_3219C.c @@ -41,13 +41,13 @@ void sub_3219C(void); // src/rom_850.c -u16 sub_850(void); -void sub_898(void (*func)(void)); -void sub_8BC(void); -void sub_8D4(void (*func)(void)); -void sub_8FC(void); -void sub_918(void (*func)(void)); -void sub_940(void); +u16 IsInVblank(void); +void SetMainCallback(void (*func)(void)); +void ResetMainCallback(void); +void SetVBlankIntrFunc(void (*func)(void)); +void ResetVBlankIntrFunc(void); +void SetVCountIntrFunc(void (*func)(void)); +void ResetVCountIntrFunc(void); // src/titlescreen.c @@ -72,10 +72,10 @@ void SetMainGameState(u16 mainState); void sub_24C(void); void sub_2B4(void); s16 LoadSpriteSets(const struct SpriteSet *const *spriteSets, u16 numSpriteSets, struct SpriteGroup *spriteGroups); -void sub_438(void); +void ResetSomeGraphicsRelatedStuff(void); void ClearGraphicsMemory(void); void sub_518(void); -void sub_578(void); +void ClearSprites(void); void sub_678(u8 *arg0, s16 arg1, s16 arg2); void SetMatrixScale(s16 xScale, s16 yScale, s16 matrixNum); @@ -393,7 +393,7 @@ extern void sub_10708(void *volatile, void *volatile, s16, s16); //extern ? sub_10750(); //extern ? sub_10798(); //extern ? sub_10860(); -extern void sub_1090C(void); +extern void ClearSomeArray(void); // asm/rom_11B9C.s @@ -775,7 +775,7 @@ extern void sub_1090C(void); //extern ? sub_528DC(); //extern ? sub_5291C(); //extern ? sub_52940(); -extern void sub_52A18(void); +extern void SaveFile_LoadGameData(void); //extern ? LoadSaveDataFromSram(); extern void SaveFile_WriteToSram(void); //extern ? SaveFile_SetPokedexFlags(); diff --git a/include/main.h b/include/main.h index 752cc14..40446ee 100755 --- a/include/main.h +++ b/include/main.h @@ -74,8 +74,8 @@ extern struct Main gMain; extern struct SpriteGroup gUnknown_0200B3B8[]; extern u32 IntrMain_Buffer[0x200]; extern u32 IntrMain[]; -extern IntrFunc *gUnknown_0200FB98; -extern IntrFunc *gUnknown_02019BE0; +extern IntrFunc *gVBlankIntrFuncPtr; +extern IntrFunc *gVCountIntrFuncPtr; extern int gUnknown_02019BE4; extern int gUnknown_02019BE8; extern int gUnknown_02019BEC; @@ -91,7 +91,7 @@ extern u8 gUnknown_02019C10; extern u8 gUnknown_02002008[]; #define INTR_COUNT 14 extern IntrFunc gIntrTable[14]; -extern void (*gUnknown_0200FB9C)(void); +extern void (*gMainCallback)(void); extern void (*gUnknown_0200FBA0)(void); extern void (*gUnknown_02017BD0)(void); extern void (*gUnknown_02017BD4)(void); @@ -102,16 +102,16 @@ void sub_24C(void); void sub_2B4(void); void ClearGraphicsMemory(void); void sub_518(void); -void sub_578(void); +void ClearSprites(void); u32 Random(void); -void HBlankIntr(void); +void VBlankIntr(void); void VCountIntr(void); void SerialIntr(void); void Timer3Intr(void); void sub_CBC(void); void sub_D10(void); void sub_D74(void); -void sub_DC4(void); +void DefaultMainCallback(void); #endif // GUARD_MAIN_H diff --git a/include/variables.h b/include/variables.h index c1137b8..3cc1efd 100644 --- a/include/variables.h +++ b/include/variables.h @@ -40,13 +40,13 @@ extern u8 gUnknown_02002808[]; //extern ? gIntrTable; //extern ? gMain; //extern ? gUnknown_0200B3B8; -//extern ? gUnknown_0200FB98; -//extern ? gUnknown_0200FB9C; +//extern ? gVBlankIntrFuncPtr; +//extern ? gMainCallback; //extern ? gUnknown_0200FBA0; //extern ? gUnknown_02017BD0; //extern ? gUnknown_02017BD4; //extern ? gUnknown_02017BE0; -//extern ? gUnknown_02019BE0; +//extern ? gVCountIntrFuncPtr; //extern ? gUnknown_02019BE4; //extern ? gUnknown_02019BE8; //extern ? gUnknown_02019BEC; diff --git a/src/field_select.c b/src/field_select.c index 40bfb2a..3aa304b 100644 --- a/src/field_select.c +++ b/src/field_select.c @@ -37,7 +37,7 @@ void FieldSelectMain(void) void LoadFieldSelectGraphics(void) { - sub_438(); + ResetSomeGraphicsRelatedStuff(); REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_FORCED_BLANK | DISPCNT_OBJ_ON; @@ -3,7 +3,7 @@ #include "gbplayer.h" #include "m4a.h" -static void sub_B54(void); +static void InitGame(void); static void sub_B8C(void); static void InitIntrHandlers(void); static void ReadKeys(void); @@ -14,7 +14,7 @@ void AgbMain(void) InitIntrHandlers(); DmaCopy32(3, IntrMain, IntrMain_Buffer, sizeof(IntrMain_Buffer)); INTR_VECTOR = IntrMain_Buffer; - sub_B54(); + InitGame(); InitGameBoyPlayer(); while (1) { @@ -45,7 +45,7 @@ void sub_9BC_Main(void) } } -void HBlankIntr(void) +void VBlankIntr(void) { m4aSoundVSync(); INTR_CHECK |= INTR_FLAG_VBLANK; @@ -122,7 +122,7 @@ void IntrDummy(void) { } -static void sub_B54(void) +static void InitGame(void) { REG_WAITCNT = WAITCNT_AGB | WAITCNT_PREFETCH_ENABLE @@ -139,7 +139,7 @@ static void sub_B54(void) sub_B8C(); m4aSoundInit(); m4aSoundVSyncOff(); - sub_52A18(); + SaveFile_LoadGameData(); } static void sub_B8C(void) @@ -155,8 +155,8 @@ static void sub_B8C(void) gMain.unk30 = 0; gMain.vCount = 144; gMain.unk2C = 0; - sub_1090C(); - sub_438(); + ClearSomeArray(); + ResetSomeGraphicsRelatedStuff(); } static void InitIntrHandlers(void) @@ -166,11 +166,11 @@ static void InitIntrHandlers(void) for (i = 0; i < INTR_COUNT; i++) gIntrTable[i] = gIntrTableTemplate[i]; - gUnknown_0200FB98 = &gIntrTable[2]; - gUnknown_02019BE0 = &gIntrTable[4]; - sub_8BC(); - sub_8FC(); - sub_940(); + gVBlankIntrFuncPtr = &gIntrTable[2]; + gVCountIntrFuncPtr = &gIntrTable[4]; + ResetMainCallback(); + ResetVBlankIntrFunc(); + ResetVCountIntrFunc(); } // The number 1103515245 comes from the example implementation of rand and srand @@ -322,16 +322,16 @@ void sub_D10(void) void sub_D74(void) { - gUnknown_0200FB9C = gUnknown_02017BD4; - *gUnknown_0200FB98 = gUnknown_02017BD0; - *gUnknown_02019BE0 = gUnknown_0200FBA0; - if (gUnknown_0200FB9C) - gUnknown_0200FB9C(); + gMainCallback = gUnknown_02017BD4; + *gVBlankIntrFuncPtr = gUnknown_02017BD0; + *gVCountIntrFuncPtr = gUnknown_0200FBA0; + if (gMainCallback) + gMainCallback(); gMain.unk4C++; } -void sub_DC4(void) +void DefaultMainCallback(void) { if (REG_DISPSTAT & DISPSTAT_VBLANK_INTR) { diff --git a/src/options.c b/src/options.c index 4e03a7d..8e6b821 100644 --- a/src/options.c +++ b/src/options.c @@ -50,7 +50,7 @@ extern const u8 gUnknown_0852A048[]; void sub_51240(void) { - sub_438(); + ResetSomeGraphicsRelatedStuff(); REG_DISPCNT = 0x1080; REG_BG0CNT = 4; diff --git a/src/rom_1068C.c b/src/rom_1068C.c index 4a5e619..35307ec 100644 --- a/src/rom_1068C.c +++ b/src/rom_1068C.c @@ -96,7 +96,7 @@ void sub_10860(void (*func)(void)) #ifdef NONMATCHING // Like sub_C24, it matches except for that damn 'push {lr}/pop {lr}' -void sub_1090C(void) +void ClearSomeArray(void) { int i; @@ -105,7 +105,7 @@ void sub_1090C(void) } #else NAKED -void sub_1090C(void) +void ClearSomeArray(void) { asm_unified("\n\ ldr r1, _08010920 @ =gUnknown_0201A500\n\ diff --git a/src/rom_528AC.c b/src/rom_528AC.c index 6f33318..3b42c4a 100644 --- a/src/rom_528AC.c +++ b/src/rom_528AC.c @@ -96,7 +96,7 @@ static void sub_52940(u16 a, s8 b, s8 c, u8 d, int unused) } } -void sub_52A18(void) +void SaveFile_LoadGameData(void) { SetSramFastFunc(); gMain.unkC = 0; diff --git a/src/rom_850.c b/src/rom_850.c index 56a4914..cd820e9 100755 --- a/src/rom_850.c +++ b/src/rom_850.c @@ -1,57 +1,53 @@ #include "global.h" #include "main.h" -u16 sub_850(void) +u16 IsInVblank(void) { - if (REG_IME & INTR_FLAG_VBLANK - && REG_DISPSTAT & DISPSTAT_VBLANK_INTR - && REG_IE & INTR_FLAG_VBLANK - && !(REG_DISPCNT & DISPCNT_FORCED_BLANK)) - { - return 1; - } + if ((REG_IME & 1) // Interrupts enabled + && (REG_DISPSTAT & DISPSTAT_VBLANK_INTR) // In VBLANK + && (REG_IE & INTR_FLAG_VBLANK) // VBlank interrupt enabled + && !(REG_DISPCNT & DISPCNT_FORCED_BLANK)) // Ignore VBlank interrupts during forced blank + return TRUE; else - { - return 0; - } + return FALSE; } -void sub_898(void (*func)(void)) +void SetMainCallback(void (*func)(void)) { gUnknown_02017BD4 = func; - if (!sub_850()) - gUnknown_0200FB9C = func; + if (!IsInVblank()) + gMainCallback = func; } -void sub_8BC(void) +void ResetMainCallback(void) { - gUnknown_0200FB9C = sub_DC4; - gUnknown_02017BD4 = sub_DC4; + gMainCallback = DefaultMainCallback; + gUnknown_02017BD4 = DefaultMainCallback; } -void sub_8D4(void (*func)(void)) +void SetVBlankIntrFunc(void (*func)(void)) { gUnknown_02017BD0 = func; - if (!sub_850()) - *gUnknown_0200FB98 = func; + if (!IsInVblank()) + *gVBlankIntrFuncPtr = func; } -void sub_8FC(void) +void ResetVBlankIntrFunc(void) { - *gUnknown_0200FB98 = HBlankIntr; - gUnknown_02017BD0 = HBlankIntr; + *gVBlankIntrFuncPtr = VBlankIntr; + gUnknown_02017BD0 = VBlankIntr; } -void sub_918(void (*func)(void)) +void SetVCountIntrFunc(void (*func)(void)) { gUnknown_0200FBA0 = func; - if (!sub_850()) - *gUnknown_02019BE0 = func; + if (!IsInVblank()) + *gVCountIntrFuncPtr = func; } -void sub_940(void) +void ResetVCountIntrFunc(void) { - *gUnknown_02019BE0 = VCountIntr; + *gVCountIntrFuncPtr = VCountIntr; gUnknown_0200FBA0 = VCountIntr; } diff --git a/src/titlescreen.c b/src/titlescreen.c index 8e19997..583ca5f 100755 --- a/src/titlescreen.c +++ b/src/titlescreen.c @@ -31,7 +31,7 @@ void LoadTitlescreenGraphics(void) { int autoDisplayMenu; - sub_438(); + ResetSomeGraphicsRelatedStuff(); REG_DISPCNT = DISPCNT_OBJ_ON| DISPCNT_FORCED_BLANK; REG_BG1CNT = BGCNT_256COLOR | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(0); REG_DISPCNT |= DISPCNT_BG1_ON; @@ -92,13 +92,13 @@ s16 LoadSpriteSets(const struct SpriteSet *const *spriteSets, u16 numSpriteSets, return loadedCount; } -void sub_438(void) +void ResetSomeGraphicsRelatedStuff(void) { gMain.unk16 |= DISPCNT_FORCED_BLANK; REG_DISPCNT |= DISPCNT_FORCED_BLANK; ClearGraphicsMemory(); sub_518(); - sub_578(); + ClearSprites(); gMain.unkF = 0; gMain.unk10 = 0; gMain.unk50 = 0; @@ -146,7 +146,7 @@ void sub_518(void) } } -void sub_578(void) +void ClearSprites(void) { u16 i, j; diff --git a/sym_ewram.txt b/sym_ewram.txt index f89b3d5..be12d52 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -228,9 +228,9 @@ gUnknown_0200EBC8: @ 0x0200EBC8 .space 0x2E0 gUnknown_0200EEA8: @ 0x0200EEA8 .space 0xCF0 -gUnknown_0200FB98: @ 0x200FB98 +gVBlankIntrFuncPtr: @ 0x200FB98 .space 0x4 -gUnknown_0200FB9C: @ 0x200FB9C +gMainCallback: @ 0x200FB9C .space 0x4 gUnknown_0200FBA0: @ 0x200FBA0 .space 0x10 @@ -242,7 +242,7 @@ gUnknown_02017BD4: @ 0x2017BD4 .space 0xC gUnknown_02017BE0: @ 0x2017BE0 .space 0x2000 -gUnknown_02019BE0: @ 0x2019BE0 +gVCountIntrFuncPtr: @ 0x2019BE0 .space 0x4 gUnknown_02019BE4: @ 0x2019BE4 .space 0x4 |