summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_2.c86
-rw-r--r--src/debug/kagaya_debug_menu.c6
-rw-r--r--src/debug/nohara_debug_menu.c4
-rw-r--r--src/debug/start_menu_debug.c10
-rw-r--r--src/debug/taya_debug_window.c6
-rw-r--r--src/debug/unk_debug_menu_3.c10
-rw-r--r--src/debug/watanabe_debug_menu.c4
-rw-r--r--src/engine/mystery_event_menu.c24
-rw-r--r--src/engine/reset_rtc_screen.c20
-rw-r--r--src/engine/save.c4
-rw-r--r--src/field/berry_tag_screen.c2
-rw-r--r--src/field/choose_party.c2
-rw-r--r--src/field/field_weather.c10
-rw-r--r--src/field/item_menu.c28
-rw-r--r--src/field/mauville_man.c10
-rw-r--r--src/field/region_map.c14
-rw-r--r--src/field/slot_machine.c16
-rw-r--r--src/field/start_menu.c2
-rw-r--r--src/pokemon/pokedex.c4
19 files changed, 131 insertions, 131 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 454b47e08..7a819a8ef 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -340,13 +340,13 @@ void InitBattle(void)
" .word 0x5006000\n"
" .word 0x400004c\n"
" .word 0x5051\n"
- " .word gUnknown_030042C4\n"
+ " .word gBattle_WIN0H\n"
" .word gUnknown_03004240\n"
- " .word gUnknown_03004DE0\n"
+ " .word gScanlineEffectRegBuffers\n"
" .word gUnknown_081F9674\n"
" .word 0xff10\n"
- " .word gWindowConfig_81E6C58\n"
- " .word gUnknown_030042A4\n"
+ " .word gWindowTemplate_81E6C58\n"
+ " .word gBattle_BG0_X\n"
" .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
" .word gBattle_BG1_Y\n"
@@ -358,9 +358,9 @@ void InitBattle(void)
" .word gBattleTerrain\n"
" .word gUnknown_03004210\n"
" .word gUnknown_030041D0\n"
- " .word gWindowConfig_81E71D0\n"
+ " .word gWindowTemplate_81E71D0\n"
" .word gUnknown_03004250\n"
- " .word gWindowConfig_81E71EC\n"
+ " .word gWindowTemplate_81E71EC\n"
" .word gReservedSpritePaletteCount\n"
" .word sub_800FCFC+1\n"
" .word gBattleTypeFlags\n"
@@ -1068,7 +1068,7 @@ void sub_800EC9C()
" .word gPreBattleCallback1\n"
" .word gMain\n"
" .word debug_sub_80139E4+1\n"
- " .word sub_800F808+1\n"
+ " .word BattleMainCB2+1\n"
" .word gBattleTypeFlags\n"
" .word gTrainerBattleOpponent\n"
"\n"
@@ -2313,7 +2313,7 @@ void sub_800F298()
" .word gPreBattleCallback1\n"
" .word gMain\n"
" .word debug_sub_80139E4+1\n"
- " .word sub_800F808+1\n"
+ " .word BattleMainCB2+1\n"
" .word gBattleTypeFlags\n"
" .word gTrainerBattleOpponent\n"
"\n"
@@ -3332,7 +3332,7 @@ void debug_sub_80108B8()
" .word 0x40000d4\n"
" .word 0x85006000\n"
" .word 0x4000200\n"
- " .word gUnknown_030042A4\n"
+ " .word gBattle_BG0_X\n"
" .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
" .word gBattle_BG1_Y\n"
@@ -3350,7 +3350,7 @@ void debug_sub_80108B8()
" .word 0x50001e0\n"
" .word debug_sub_8011D40+1\n"
" .word debug_sub_8010CAC+1\n"
- " .word gWindowConfig_81E6C3C\n"
+ " .word gWindowTemplate_81E6C3C\n"
" .word gUnknown_Debug_03004370\n"
" .word gUnknown_Debug_03004360\n"
" .word gUnknown_Debug_030043A0\n"
@@ -5837,7 +5837,7 @@ void debug_sub_8011D40()
" .word +0x2000000\n"
" .word 0x6004000\n"
" .word 0x80000800\n"
- " .word gUnknown_030042A4\n"
+ " .word gBattle_BG0_X\n"
" .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
" .word gBattle_BG1_Y\n"
@@ -5910,7 +5910,7 @@ void debug_sub_8011DD4()
"._776:\n"
" .word 0x4000008\n"
" .word 0x9803\n"
- " .word gUnknown_030042A4\n"
+ " .word gBattle_BG0_X\n"
" .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
" .word gBattle_BG1_Y\n"
@@ -6063,7 +6063,7 @@ void debug_sub_8011EA0()
" mov r3, r8\n"
" bl Text_InitWindow\n"
" ldr r0, ._823 + 8\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" ldr r1, ._823 + 12\n"
" mov sl, r1\n"
" lsl r4, r7, #0x1\n"
@@ -6092,7 +6092,7 @@ void debug_sub_8011EA0()
" add r1, r6, #0\n"
" bl Text_InitWindow\n"
" ldr r0, ._823 + 8\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" mov r0, #0xff\n"
" strb r0, [r6]\n"
" ldrb r0, [r5]\n"
@@ -6115,7 +6115,7 @@ void debug_sub_8011EA0()
" mov r3, r8\n"
" bl Text_InitWindow\n"
" ldr r0, ._823 + 8\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" b ._848\n"
"._824:\n"
" .align 2, 0\n"
@@ -6173,7 +6173,7 @@ void debug_sub_8011EA0()
" mov r1, sl\n"
" bl Text_InitWindow\n"
" add r0, r6, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" lsl r4, r7, #0x1\n"
" ldr r5, ._830 + 12\n"
" ldrb r0, [r5]\n"
@@ -6201,7 +6201,7 @@ void debug_sub_8011EA0()
" mov r1, sl\n"
" bl Text_InitWindow\n"
" add r0, r6, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" mov r0, #0xff\n"
" mov r1, sl\n"
" strb r0, [r1]\n"
@@ -6252,7 +6252,7 @@ void debug_sub_8011EA0()
" add r0, r6, #0\n"
" bl Text_InitWindow\n"
" add r0, r6, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" b ._848\n"
"._834:\n"
" .align 2, 0\n"
@@ -6284,7 +6284,7 @@ void debug_sub_8011EA0()
" add r1, r6, #0\n"
" bl Text_InitWindow\n"
" add r0, r5, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" mov r4, #0x0\n"
" ldr r3, ._839 + 12\n"
" lsl r1, r7, #0x1\n"
@@ -6366,7 +6366,7 @@ void debug_sub_8011EA0()
" add r1, r6, #0\n"
" bl Text_InitWindow\n"
" add r0, r5, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" b ._848\n"
"._850:\n"
" .align 2, 0\n"
@@ -6408,7 +6408,7 @@ void debug_sub_8011EA0()
" add r1, r6, #0\n"
" bl Text_InitWindow\n"
" add r0, r5, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
"._848:\n"
" add sp, sp, #0xc\n"
" pop {r3, r4, r5}\n"
@@ -6478,7 +6478,7 @@ void debug_sub_8012294()
" mov r1, r9\n"
" bl Text_InitWindow\n"
" mov r0, sl\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" ldrb r4, [r7]\n"
" lsl r4, r4, #0x1\n"
" add r0, r5, #0\n"
@@ -6515,7 +6515,7 @@ void debug_sub_8012294()
" mov r1, r9\n"
" bl Text_InitWindow\n"
" mov r0, sl\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" mov r0, #0xff\n"
" mov r1, r9\n"
" strb r0, [r1]\n"
@@ -6555,7 +6555,7 @@ void debug_sub_8012294()
" mov r1, r9\n"
" bl Text_InitWindow\n"
" mov r0, sl\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
"._853:\n"
" add sp, sp, #0x4\n"
" pop {r3, r4, r5}\n"
@@ -6616,7 +6616,7 @@ void debug_sub_80123D8()
" add r3, r7, #0\n"
" bl Text_InitWindow\n"
" add r0, r4, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" lsl r5, r5, #0x1\n"
" ldr r1, ._858 + 12\n"
" ldrb r0, [r1]\n"
@@ -6648,7 +6648,7 @@ void debug_sub_80123D8()
" add r3, r7, #0\n"
" bl Text_InitWindow\n"
" add r0, r4, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" mov r0, #0x0\n"
" mov r1, #0x12\n"
" bl debug_sub_8010A7C\n"
@@ -6663,7 +6663,7 @@ void debug_sub_80123D8()
" mov r3, sl\n"
" bl Text_InitWindow\n"
" add r0, r4, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" ldr r1, ._858 + 12\n"
" ldrb r0, [r1]\n"
" mov r2, #0x46\n"
@@ -6693,7 +6693,7 @@ void debug_sub_80123D8()
" mov r3, sl\n"
" bl Text_InitWindow\n"
" add r0, r4, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" b ._857\n"
"._859:\n"
" .align 2, 0\n"
@@ -6720,7 +6720,7 @@ void debug_sub_80123D8()
" add r1, r6, #0\n"
" bl Text_InitWindow\n"
" add r0, r5, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" ldrh r2, [r4, #0x6]\n"
" ldrb r3, [r4, #0x8]\n"
" ldrb r0, [r4, #0xa]\n"
@@ -6729,7 +6729,7 @@ void debug_sub_80123D8()
" add r1, r6, #0\n"
" bl Text_InitWindow\n"
" add r0, r5, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
"._857:\n"
" add sp, sp, #0x4\n"
" pop {r3, r4, r5}\n"
@@ -6783,7 +6783,7 @@ void debug_sub_8012540()
" add r1, r5, #0\n"
" bl Text_InitWindow\n"
" add r0, r4, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" add sp, sp, #0x4\n"
" pop {r4, r5, r6}\n"
" pop {r0}\n"
@@ -7130,8 +7130,8 @@ void debug_sub_8012688()
" .word 0x40000d4\n"
" .word 0x85006000\n"
" .word 0x400004c\n"
- " .word gWindowConfig_81E6C58\n"
- " .word gUnknown_030042A4\n"
+ " .word gWindowTemplate_81E6C58\n"
+ " .word gBattle_BG0_X\n"
" .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
" .word gBattle_BG1_Y\n"
@@ -7213,7 +7213,7 @@ void debug_sub_80128B4()
" mov r3, #0x2\n"
" bl Text_InitWindow\n"
" add r0, r5, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" ldr r6, ._878 + 8\n"
" ldrh r1, [r6]\n"
" add r0, r4, #0\n"
@@ -7239,7 +7239,7 @@ void debug_sub_80128B4()
" mov r3, #0x2\n"
" bl Text_InitWindow\n"
" add r0, r5, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" add sp, sp, #0x4\n"
" pop {r3}\n"
" mov r8, r3\n"
@@ -7284,7 +7284,7 @@ void debug_sub_8012938()
" mov r3, #0x2\n"
" bl Text_InitWindow\n"
" add r0, r6, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" ldr r1, ._880 + 8\n"
" add r0, r4, #0\n"
" bl StringCopy\n"
@@ -7308,7 +7308,7 @@ void debug_sub_8012938()
" mov r3, #0x2\n"
" bl Text_InitWindow\n"
" add r0, r6, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" ldr r2, ._880 + 20\n"
" ldr r1, ._880 + 24\n"
" lsl r0, r5, #0x2\n"
@@ -7624,7 +7624,7 @@ void debug_sub_8012B70()
" mov r3, #0x1a\n"
" bl Text_InitWindow\n"
" add r0, r5, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" strh r6, [r4, #0xe]\n"
" mov r0, #0x0\n"
" bl debug_sub_8012B2C\n"
@@ -7670,7 +7670,7 @@ void debug_sub_8012C08()
" mov r3, #0x2\n"
" bl Text_InitWindow\n"
" add r0, r7, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" mov r0, #0x0\n"
" mov r1, #0x7\n"
" bl debug_sub_8010A7C\n"
@@ -7682,7 +7682,7 @@ void debug_sub_8012C08()
" mov r3, #0x2\n"
" bl Text_InitWindow\n"
" add r0, r7, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x18\n"
@@ -7733,7 +7733,7 @@ void debug_sub_8012C08()
" add r5, r4, #0\n"
" ldr r4, ._907 + 8\n"
" add r0, r4, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" ldr r1, ._907 + 12\n"
" mov r2, #0xa4\n"
" lsl r2, r2, #0x2\n"
@@ -7743,7 +7743,7 @@ void debug_sub_8012C08()
" mov r3, #0x1a\n"
" bl Text_InitWindow\n"
" add r0, r4, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" ldr r1, ._907\n"
" add r0, r5, r6\n"
" lsl r0, r0, #0x3\n"
@@ -7818,7 +7818,7 @@ void debug_sub_8012D10()
" mov r3, #0x13\n"
" bl Text_InitWindow\n"
" add r0, r4, #0\n"
- " bl sub_8002F44\n"
+ " bl Text_PrintWindow8002F44\n"
" ldr r1, ._920 + 8\n"
" lsl r0, r5, #0x2\n"
" add r0, r0, r5\n"
diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c
index 8ece4ebec..321627a10 100644
--- a/src/debug/kagaya_debug_menu.c
+++ b/src/debug/kagaya_debug_menu.c
@@ -319,7 +319,7 @@ void debug_sub_80B0770()
" .align 2, 0\n"
"._30:\n"
" .word gPlayerAvatar\n"
- " .word gUnknown_0202FF84\n"
+ " .word gFieldEffectArguments\n"
"._27:\n"
" bl CloseMenu\n"
"._29:\n"
@@ -382,7 +382,7 @@ void debug_sub_80B07DC()
"._37:\n"
" .align 2, 0\n"
"._36:\n"
- " .word sub_80FC074+1\n"
+ " .word CB2_InitFlyRegionMap+1\n"
"\n"
);
}
@@ -412,7 +412,7 @@ void debug_sub_80B0800()
"._40:\n"
" .align 2, 0\n"
"._39:\n"
- " .word gUnknown_0202FF84\n"
+ " .word gFieldEffectArguments\n"
"\n"
);
}
diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c
index 766137871..53c6394ba 100644
--- a/src/debug/nohara_debug_menu.c
+++ b/src/debug/nohara_debug_menu.c
@@ -419,7 +419,7 @@ void debug_sub_808F648()
" bl debug_sub_808F6BC\n"
" b ._40\n"
"._32:\n"
- " bl ProcessMenuInputNoWrap_\n"
+ " bl Menu_ProcessInputNoWrap_\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x1\n"
@@ -998,7 +998,7 @@ void debug_sub_808FA88()
" cmp r1, #0x21\n"
" bls ._87 @cond_branch\n"
" add r0, r7, #0\n"
- " bl sub_80BFB54\n"
+ " bl GetTVChannelByShowType\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" add r1, r0, #0\n"
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index e4ae404e2..321bbb951 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -949,7 +949,7 @@ void DebugMenu_807706C()
"._114:\n"
" .align 2, 0\n"
"._113:\n"
- " .word gWindowConfig_81E6CE4\n"
+ " .word gWindowTemplate_81E6CE4\n"
" .word gCallback_03004AE8\n"
" .word DebugMenu_807709C+1\n"
"\n"
@@ -1893,7 +1893,7 @@ void DebugMenu_Teleport()
{
asm(
" push {lr}\n"
- " bl sub_8053570\n"
+ " bl Overworld_SetWarpDestToLastHealLoc\n"
" bl sub_8080E88\n"
" bl ScriptContext2_Enable\n"
" bl CloseMenu\n"
@@ -2384,7 +2384,7 @@ void DebugMenu_8077974()
" asr r1, r1, #0x18\n"
" lsl r1, r1, #0x10\n"
" lsr r1, r1, #0x10\n"
- " bl sub_8082C0C\n"
+ " bl DoesSomeoneWantRematchIn\n"
" cmp r0, #0\n"
" beq ._228 @cond_branch\n"
" ldr r0, ._230 + 12\n"
@@ -5977,7 +5977,7 @@ void DebugMenu_8079058()
"._618:\n"
" .word gDebug0x839C60C\n"
"._612:\n"
- " bl ProcessMenuInputNoWrap_\n"
+ " bl Menu_ProcessInputNoWrap_\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -6082,7 +6082,7 @@ void DebugMenu_8079110()
"._639:\n"
" .word gDebug0x839C60C+0xe\n"
"._635:\n"
- " bl MenuUpdateWindowText\n"
+ " bl Menu_UpdateWindowText\n"
" lsl r0, r0, #0x18\n"
" cmp r0, #0\n"
" beq ._642 @cond_branch\n"
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c
index ce1cc47ee..842837b18 100644
--- a/src/debug/taya_debug_window.c
+++ b/src/debug/taya_debug_window.c
@@ -41,7 +41,7 @@ void TayaDebugMenu_Trend()
" strb r1, [r0]\n"
" ldrh r1, [r5, #0x4]\n"
" add r0, r6, #0\n"
- " bl sub_80EB3FC\n"
+ " bl EasyChat_GetWordText\n"
" mov r0, sl\n"
" add r1, r6, #0\n"
" mov r2, #0x0\n"
@@ -50,7 +50,7 @@ void TayaDebugMenu_Trend()
" add r4, r0, #0\n"
" ldrh r1, [r5, #0x6]\n"
" add r0, r6, #0\n"
- " bl sub_80EB3FC\n"
+ " bl EasyChat_GetWordText\n"
" add r0, r4, #0\n"
" add r1, r6, #0\n"
" mov r2, #0x0\n"
@@ -1995,7 +1995,7 @@ void debug_sub_80915BC()
"._173:\n"
" .align 2, 0\n"
"._172:\n"
- " .word gWindowConfig_81E7224\n"
+ " .word gWindowTemplate_81E7224\n"
" .word gUnknown_Debug_083C517C\n"
" .word +0x2000000\n"
" .word debug_sub_8091320+1\n"
diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c
index a217a0258..dfb92feb9 100644
--- a/src/debug/unk_debug_menu_3.c
+++ b/src/debug/unk_debug_menu_3.c
@@ -356,7 +356,7 @@ void debug_sub_813C5B4()
" .word gOtherText_DataCannotUseVersion+0x331\n"
" .word gOtherText_DataCannotUseVersion+0x30d\n"
" .word gOtherText_DataCannotUseVersion+0x861\n"
- " .word gFlashSectors+0x8\n"
+ " .word sUnusedFlashSectors+0x8\n"
" .word 0xfff\n"
" .word 0x52f\n"
"\n"
@@ -417,8 +417,8 @@ void debug_sub_813C638()
" .align 2, 0\n"
"._25:\n"
" .word 0x270f\n"
- " .word gFlashSectors+0xc\n"
- " .word gFlashSectors+0x14\n"
+ " .word sUnusedFlashSectors+0xc\n"
+ " .word sUnusedFlashSectors+0x14\n"
"\n"
);
}
@@ -588,7 +588,7 @@ void debug_sub_813C740()
" .word gOtherText_DataCannotUseVersion+0x99e\n"
" .word gOtherText_DataCannotUseVersion+0xa4a\n"
" .word gEnemyParty\n"
- " .word gFlashSectors+0x4\n"
+ " .word sUnusedFlashSectors+0x4\n"
" .word gOtherText_DataCannotUseVersion+0x9c2\n"
" .word gOtherText_DataCannotUseVersion+0xa26\n"
"\n"
@@ -788,7 +788,7 @@ void debug_sub_813C93C()
"._37:\n"
" .word gOtherText_DataCannotUseVersion+0xa4a\n"
" .word gOtherText_DataCannotUseVersion+0xb61\n"
- " .word gFlashSectors+0x24\n"
+ " .word sUnusedFlashSectors+0x24\n"
" .word 0x270f\n"
" .word gOtherText_DataCannotUseVersion+0xa61\n"
"\n"
diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c
index 731e58986..7288f602e 100644
--- a/src/debug/watanabe_debug_menu.c
+++ b/src/debug/watanabe_debug_menu.c
@@ -142,8 +142,8 @@ void debug_80C35DC()
" .word 0x81000800\n"
" .word stru_83F8828\n"
" .word stru_83F8838\n"
- " .word gWindowConfig_81E6C3C\n"
- " .word gWindowConfig_81E6CE4\n"
+ " .word gWindowTemplate_81E6C3C\n"
+ " .word gWindowTemplate_81E6CE4\n"
"\n"
);
}
diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c
index 522a185c8..8f280dc18 100644
--- a/src/engine/mystery_event_menu.c
+++ b/src/engine/mystery_event_menu.c
@@ -363,7 +363,7 @@ void debug_sub_815D04C()
" mov r1, #0x4\n"
" mov r2, #0xd\n"
" mov r3, #0x7\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r1, ._125 + 4\n"
" mov r2, #0xa\n"
" ldsh r0, [r4, r2]\n"
@@ -372,7 +372,7 @@ void debug_sub_815D04C()
" ldr r0, [r0]\n"
" mov r1, #0x5\n"
" mov r2, #0x5\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldrh r0, [r4, #0x8]\n"
" add r0, r0, #0x1\n"
" strh r0, [r4, #0x8]\n"
@@ -397,9 +397,9 @@ void debug_sub_815D04C()
" .align 2, 0\n"
"._125:\n"
" .word gTasks\n"
- " .word gFlashSectors+0x9c\n"
+ " .word sUnusedFlashSectors+0x9c\n"
" .word gMain\n"
- " .word gFlashSectors+0x11c\n"
+ " .word sUnusedFlashSectors+0x11c\n"
"._123:\n"
" sub r0, r1, #1\n"
"._124:\n"
@@ -435,7 +435,7 @@ void debug_sub_815D04C()
" .align 2, 0\n"
"._130:\n"
" .word gTasks\n"
- " .word gFlashSectors+0x11c\n"
+ " .word sUnusedFlashSectors+0x11c\n"
"._128:\n"
" ldrh r0, [r4, #0xa]\n"
" add r0, r0, #0x1\n"
@@ -481,7 +481,7 @@ void debug_sub_815D04C()
" .align 2, 0\n"
"._133:\n"
" .word gTasks\n"
- " .word gFlashSectors+0x9c\n"
+ " .word sUnusedFlashSectors+0x9c\n"
" .word +0x2004000\n"
" .word 0x43c\n"
"\n"
@@ -554,7 +554,7 @@ void debug_sub_815D1D8()
" mov r1, #0xe\n"
" mov r2, #0x1b\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" mov r0, #0x1\n"
" neg r0, r0\n"
" mov r1, #0x0\n"
@@ -606,7 +606,7 @@ void debug_sub_815D1D8()
" .word gUnknown_0841192C+0x14\n"
" .word 0x43c\n"
"._144:\n"
- " bl MenuUpdateWindowText\n"
+ " bl Menu_UpdateWindowText\n"
" lsl r0, r0, #0x18\n"
" cmp r0, #0\n"
" bne ._163 @cond_branch\n"
@@ -655,7 +655,7 @@ void debug_sub_815D1D8()
" .word 0x43c\n"
" .word gUnknown_0841192C+0x28\n"
"._146:\n"
- " bl MenuUpdateWindowText\n"
+ " bl Menu_UpdateWindowText\n"
" lsl r0, r0, #0x18\n"
" cmp r0, #0\n"
" bne ._173 @cond_branch\n"
@@ -696,7 +696,7 @@ void debug_sub_815D1D8()
" .word gMain\n"
" .word 0x43c\n"
"._149:\n"
- " bl MenuUpdateWindowText\n"
+ " bl Menu_UpdateWindowText\n"
" bl sub_8007ECC\n"
" lsl r0, r0, #0x18\n"
" cmp r0, #0\n"
@@ -730,11 +730,11 @@ void debug_sub_815D1D8()
" mov r1, #0xf\n"
" mov r2, #0x1a\n"
" mov r3, #0x12\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r0, ._190 + 4\n"
" mov r1, #0x4\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r1, ._190 + 8\n"
" ldr r2, ._190 + 12\n"
" add r1, r1, r2\n"
diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c
index a11e1b3e3..df4ab4f76 100644
--- a/src/engine/reset_rtc_screen.c
+++ b/src/engine/reset_rtc_screen.c
@@ -789,7 +789,7 @@ void debug_sub_806F9E4()
mov r1, #0x9\n\
mov r2, #0x1d\n\
mov r3, #0x13\n\
- bl MenuDrawTextWindow\n\
+ bl Menu_DrawStdWindowFrame\n\
add r4, r6, #0\n\
add r4, r4, #0x50\n\
bl RtcGetErrorStatus\n\
@@ -803,23 +803,23 @@ void debug_sub_806F9E4()
add r0, r4, #0\n\
mov r1, #0x2\n\
mov r2, #0xa\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
ldr r0, ._158\n\
mov r1, #0xc\n\
mov r2, #0xc\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
ldr r0, ._158 + 4\n\
mov r1, #0x14\n\
mov r2, #0xc\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
ldr r0, ._158 + 8\n\
mov r1, #0x1\n\
mov r2, #0xe\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
ldr r0, ._158 + 12\n\
mov r1, #0x1\n\
mov r2, #0x10\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
._151:\n\
ldrh r0, [r5]\n\
add r0, r0, #0x1\n\
@@ -868,19 +868,19 @@ void debug_sub_806F9E4()
add r0, r6, #0\n\
mov r1, #0x14\n\
mov r2, #0xe\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
mov r0, r9\n\
mov r1, #0xc\n\
mov r2, #0xe\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
mov r0, sl\n\
mov r1, #0x14\n\
mov r2, #0x10\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
mov r0, r8\n\
mov r1, #0xc\n\
mov r2, #0x10\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
._160:\n\
ldrh r1, [r5, #0x2]\n\
mov r2, #0x2\n\
diff --git a/src/engine/save.c b/src/engine/save.c
index e1fb47dcc..1245d0a62 100644
--- a/src/engine/save.c
+++ b/src/engine/save.c
@@ -731,7 +731,7 @@ void sub_813B79C()
" .align 2, 0\n"
"._163:\n"
" .word +0x2000000\n"
- " .word gSaveSectionLocations\n"
+ " .word sSaveBlockChunks\n"
" .word 0xff4\n"
" .word 0xff6\n"
" .word gHallOfFameSaveSectionLocations\n"
@@ -892,7 +892,7 @@ u8 Save_LoadGameData(u8 saveType)
return result;
}
-static const u8 sUnusedFlashSectors[] = { 30, 31 };
+const u8 sUnusedFlashSectors[] = { 30, 31 };
bool8 unref_sub_8125F4C(struct UnkSaveSection *a1)
{
diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index a05d9bf87..56d578464 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -42,7 +42,7 @@ extern u8 gBerryCheck_Pal[];
extern u8 gUnknown_08E788E4[];
extern u8 gUnknown_08E78A84[];
-static const u8 *const gUnknown_0841192C[] =
+const u8 *const gUnknown_0841192C[] =
{
ContestStatsText_VerySoft,
ContestStatsText_Soft,
diff --git a/src/field/choose_party.c b/src/field/choose_party.c
index 8a54b0ad0..b108ede5a 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -601,7 +601,7 @@ void debug_sub_81381B4()
" add r2, r4, #0\n"
" bl GetMonData\n"
" add r0, r4, #0\n"
- " bl StripExtCtrlCodes\n"
+ " bl Text_StripExtCtrlCodes\n"
" add r0, r5, #0\n"
" mov r1, #0x3\n"
" bl GetMonData\n"
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index 97eba16e0..1a4985892 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -1256,7 +1256,7 @@ u8 debug_sub_8085564(void)
mov r1, #0x1\n\
mov r2, #0x1c\n\
mov r3, #0x2\n\
- bl MenuFillWindowRectWithBlankTile\n\
+ bl Menu_BlankWindowRect\n\
ldr r1, ._380\n\
ldr r0, ._380 + 4\n\
ldrb r0, [r0]\n\
@@ -1265,7 +1265,7 @@ u8 debug_sub_8085564(void)
ldr r0, [r0]\n\
mov r1, #0x17\n\
mov r2, #0x1\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
._377:\n\
ldr r0, ._380 + 8\n\
ldrh r1, [r0, #0x2e]\n\
@@ -1313,7 +1313,7 @@ u8 debug_sub_808560C(void)
mov r1, #0x1\n\
mov r2, #0x1c\n\
mov r3, #0x2\n\
- bl MenuFillWindowRectWithBlankTile\n\
+ bl Menu_BlankWindowRect\n\
ldr r1, ._384 + 8\n\
ldrb r0, [r4]\n\
lsl r0, r0, #0x2\n\
@@ -1321,7 +1321,7 @@ u8 debug_sub_808560C(void)
ldr r0, [r0]\n\
mov r1, #0x17\n\
mov r2, #0x1\n\
- bl MenuPrint\n\
+ bl Menu_PrintText\n\
ldr r1, ._384 + 12\n\
ldr r0, ._384 + 16\n\
str r0, [r1]\n\
@@ -1333,7 +1333,7 @@ u8 debug_sub_808560C(void)
.align 2, 0\n\
._384:\n\
.word gUnknown_0202FF58+0x2\n\
- .word gUnknown_0202F7E8\n\
+ .word gWeather\n\
.word gDebugText_Weather\n\
.word gCallback_03004AE8\n\
.word debug_sub_8085564+1");
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index 125edfef2..ce1f18cdb 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -483,7 +483,7 @@ static bool8 SetupBagMultistep(void)
bl ResetSpriteData\n\
b ._61\n\
._14:\n\
- bl sub_80A3520\n\
+ bl LoadBagGraphicsMultistep\n\
lsl r0, r0, #0x18\n\
cmp r0, #0\n\
bne ._37 @cond_branch\n\
@@ -500,12 +500,12 @@ static bool8 SetupBagMultistep(void)
.word 0x43c\n\
._15:\n\
ldr r0, ._43\n\
- bl SetUpWindowConfig\n\
+ bl Text_LoadWindowTemplate\n\
b ._61\n\
._44:\n\
.align 2, 0\n\
._43:\n\
- .word gWindowConfig_81E6DFC\n\
+ .word gWindowTemplate_81E6DFC\n\
._16:\n\
ldr r0, ._46\n\
bl MultistepInitMenuWindowBegin\n\
@@ -516,7 +516,7 @@ static bool8 SetupBagMultistep(void)
._47:\n\
.align 2, 0\n\
._46:\n\
- .word gWindowConfig_81E6DFC\n\
+ .word gWindowTemplate_81E6DFC\n\
.word gMain\n\
.word 0x43c\n\
._17:\n\
@@ -578,7 +578,7 @@ static bool8 SetupBagMultistep(void)
._54:\n\
.align 2, 0\n\
._53:\n\
- .word gUnknown_03000701\n\
+ .word sReturnLocation\n\
.word gMain\n\
.word 0x43c\n\
._19:\n\
@@ -595,15 +595,15 @@ static bool8 SetupBagMultistep(void)
bl sub_80A39B8\n\
ldrb r1, [r5]\n\
add r0, r4, #0\n\
- bl sub_80A3AC0\n\
- bl sub_80A3D08\n\
+ bl DrawPocketIndicatorDots\n\
+ bl UpdateAllBagPockets\n\
ldr r4, ._56 + 12\n\
ldr r0, [r4, #0x10]\n\
ldr r1, [r4, #0x14]\n\
- bl sub_80A3C34\n\
+ bl SortItemSlots\n\
ldr r0, [r4, #0x18]\n\
ldr r1, [r4, #0x1c]\n\
- bl sub_80A3C34\n\
+ bl SortItemSlots\n\
bl sub_80A3D40\n\
ldr r1, ._56 + 16\n\
mov r0, #0x0\n\
@@ -619,9 +619,9 @@ static bool8 SetupBagMultistep(void)
._56:\n\
.word gUnknown_0203855A\n\
.word gBGTilemapBuffers+0x1000\n\
- .word gUnknown_02038559\n\
+ .word sCurrentBagPocket\n\
.word gBagPockets\n\
- .word gUnknown_03005D24\n\
+ .word gCurrentBagPocketItemSlots\n\
._20:\n\
ldr r0, ._59\n\
mov r1, #0x0\n\
@@ -659,9 +659,9 @@ static bool8 SetupBagMultistep(void)
.align 2, 0\n\
._59:\n\
.word 0xffff\n\
- .word gUnknown_03005D10\n\
- .word gUnknown_02038559\n\
- .word gUnknown_03005D24\n\
+ .word gBagPocketScrollStates\n\
+ .word sCurrentBagPocket\n\
+ .word gCurrentBagPocketItemSlots\n\
.word gUnknown_0203855B\n\
.word gUnknown_0203855C\n\
.word gMain\n\
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index 1bce9bc3f..91165a2ee 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -293,7 +293,7 @@ void debug_sub_810B32C()
" lsr r2, r0, #0x18\n"
" cmp r2, #0x7\n"
" bls ._31 @cond_branch\n"
- " bl sub_80F7A6C\n"
+ " bl SetupHipster\n"
" mov r2, #0x0\n"
" ldr r3, ._34\n"
"._32:\n"
@@ -313,13 +313,13 @@ void debug_sub_810B32C()
"._34:\n"
" .word gSaveBlock1+0x2d8c\n"
"._27:\n"
- " bl sub_80F7A98\n"
+ " bl SetupTrader\n"
" b ._37\n"
"._28:\n"
- " bl sub_80F7A7C\n"
+ " bl SetupStoryteller\n"
" b ._37\n"
"._29:\n"
- " bl sub_80F7A88\n"
+ " bl SetupGiddy\n"
"._37:\n"
" bl sub_80F83D0\n"
" add sp, sp, #0x8\n"
@@ -1313,7 +1313,7 @@ static void PrintStoryList(void)
Menu_PrintText(gPCText_Cancel, 1, 2 + i * 2);
}
-static u8 gUnknown_03000748;
+u8 gUnknown_03000748;
static void Task_StoryListMenu(u8 taskId)
{
diff --git a/src/field/region_map.c b/src/field/region_map.c
index 3bd64a8a0..d6ebf0b9f 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -289,7 +289,7 @@ static void SpriteCB_PlayerIconZoomedIn(struct Sprite *);
const u8 *GetMapSectionName(u8 *, u16, u16);
static void VBlankCB_FlyRegionMap(void);
static void CB2_FlyRegionMap(void);
-static void sub_80FC244(void (*func)(void));
+void sub_80FC244(void (*func)(void));
static void PrintFlyTargetName(void);
static void CreateFlyTargetGraphics(void);
static void CreateCityTownFlyTargetIcons(void);
@@ -297,7 +297,7 @@ static void CreateSpecialAreaFlyTargetIcons(void);
static void SpriteCB_FlyTargetIcons(struct Sprite *);
static void sub_80FC5B4(void);
static void sub_80FC600(void);
-static void sub_80FC69C(void);
+void sub_80FC69C(void);
void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed)
{
@@ -1420,7 +1420,7 @@ struct UnknownStruct4
static const u8 *const sEverGrandeCityAreaNames[] = {OtherText_PokeLeague, OtherText_PokeCenter};
-static const struct UnknownStruct4 sUnknown_083E79C0[1] =
+const struct UnknownStruct4 gUnknown_083E79C0[1] =
{
{sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, FLAG_SYS_POKEMON_LEAGUE_FLY},
};
@@ -1598,7 +1598,7 @@ static void CB2_FlyRegionMap(void)
BuildOamBuffer();
}
-static void sub_80FC244(void (*func)(void))
+void sub_80FC244(void (*func)(void))
{
ewram0_3.unk0 = func;
ewram0_3.unk4 = 0;
@@ -1611,9 +1611,9 @@ static void PrintFlyTargetName(void)
u16 i = 0;
int zero;
- for (i = 0; i < ARRAY_COUNT(sUnknown_083E79C0); i++)
+ for (i = 0; i < ARRAY_COUNT(gUnknown_083E79C0); i++)
{
- const struct UnknownStruct4 *r4 = &sUnknown_083E79C0[i];
+ const struct UnknownStruct4 *r4 = &gUnknown_083E79C0[i];
if (ewram0_3.regionMap.mapSectionId == r4->mapSectionId)
{
@@ -1796,7 +1796,7 @@ static void sub_80FC600(void)
}
}
-static void sub_80FC69C(void)
+void sub_80FC69C(void)
{
switch (ewram0_3.unk4)
{
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index d84a6e592..c4a4128b3 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -64,7 +64,7 @@ static bool8 sub_8102008(struct Task *task);
static bool8 sub_8102034(struct Task *task);
static bool8 sub_8102058(struct Task *task);
static bool8 sub_8102090(struct Task *task);
-static bool8 sub_81020C8(struct Task *task);
+bool8 sub_81020C8(struct Task *task);
static bool8 sub_81021E0(struct Task *task);
static bool8 sub_81021FC(struct Task *task);
static bool8 sub_8102264(struct Task *task);
@@ -244,7 +244,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb)
ldr r3, ._1\n\
mov r2, #0x0\n\
strb r2, [r3]\n\
- bl sub_81019B0\n\
+ bl PlaySlotMachine_Internal\n\
ldr r0, ._1 + 4\n\
bl SetMainCallback2\n\
pop {r0}\n\
@@ -253,7 +253,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb)
.align 2, 0\n\
._1:\n\
.word unk_debug_bss_1+0x1\n\
- .word sub_81018B8+1");
+ .word CB2_SlotMachineSetup+1");
}
#else
void PlaySlotMachine(u8 arg0, MainCallback cb)
@@ -274,7 +274,7 @@ void debug_sub_811609C()
ldr r3, ._3\n\
mov r2, #0x1\n\
strb r2, [r3]\n\
- bl sub_81019B0\n\
+ bl PlaySlotMachine_Internal\n\
ldr r0, ._3 + 4\n\
bl SetMainCallback2\n\
pop {r0}\n\
@@ -283,7 +283,7 @@ void debug_sub_811609C()
.align 2, 0\n\
._3:\n\
.word unk_debug_bss_1+0x1\n\
- .word sub_81018B8+1");
+ .word CB2_SlotMachineSetup+1");
}
#endif
@@ -1412,7 +1412,7 @@ static bool8 sub_8102090(struct Task *task)
#if DEBUG
__attribute__((naked))
-static bool8 sub_81020C8(struct Task *task)
+bool8 sub_81020C8(struct Task *task)
{
asm("\
push {r4, lr}\n\
@@ -1421,7 +1421,7 @@ static bool8 sub_81020C8(struct Task *task)
mov r0, #0xc0\n\
and r0, r0, r1\n\
strb r0, [r4, #0x4]\n\
- bl sub_81027A0\n\
+ bl CheckMatch\n\
ldrb r0, [r4, #0xa]\n\
cmp r0, #0\n\
beq ._163 @cond_branch\n\
@@ -1570,7 +1570,7 @@ static bool8 sub_81020C8(struct Task *task)
.word 0x270f");
}
#else
-static bool8 sub_81020C8(struct Task *task)
+bool8 sub_81020C8(struct Task *task)
{
eSlotMachine->unk04 &= 0xc0;
CheckMatch();
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 1e4eace87..17aeb8242 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -255,7 +255,7 @@ void debug_sub_8075C40()
" .word 0x4000108\n"
" .word 0xc34f\n"
" .word 0x40000b0\n"
- " .word gUnknown_03004DE0\n"
+ " .word gScanlineEffectRegBuffers\n"
" .word 0xc5ff\n"
" .word 0x7fff\n"
" .word 0x4000040\n"
diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c
index 4fb6a4920..4f656a910 100644
--- a/src/pokemon/pokedex.c
+++ b/src/pokemon/pokedex.c
@@ -1273,7 +1273,7 @@ static u8 sub_8091260(u16 num, u8, u8, u8);
static void sub_8091304(const u8 *name, u8, u8);
static void sub_8091458(u16 height, u8 i, u8 i1);
static void sub_8091564(u16 weight, u8 i, u8 i1);
-static void sub_8091738(u16, u16, u16);
+void sub_8091738(u16, u16, u16);
static void sub_80917CC(u16 i, u16 i1);
static u16 sub_8091818(u8, u16, u16, u16);
u16 sub_80918EC(u16 a, s16 b, s16 c, u16 d);
@@ -4457,7 +4457,7 @@ static void sub_8091564(u16 arg0, u8 left, u8 top)
}
#endif
-static void sub_8091738(u16 num, u16 b, u16 c)
+void sub_8091738(u16 num, u16 b, u16 c)
{
u8 arr[0x80];
u16 i;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 04:31:50 +0000