summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_2.c140
-rw-r--r--src/battle/battle_ai.c2
-rw-r--r--src/battle/battle_interface.c6
-rw-r--r--src/debug/nakamura_debug_menu.c6
-rw-r--r--src/debug/nohara_debug_menu.c4
-rw-r--r--src/debug/start_menu_debug.c32
-rw-r--r--src/debug/tomomichi_debug_menu.c14
-rw-r--r--src/debug/unk_debug_menu_3.c38
-rw-r--r--src/engine/save.c4
-rw-r--r--src/field/choose_party.c2
-rw-r--r--src/field/field_player_avatar.c99
-rw-r--r--src/field/field_weather.c181
-rw-r--r--src/field/fldeff_secretpower.c96
-rw-r--r--src/field/mauville_man.c2
-rw-r--r--src/field/party_menu.c17
-rw-r--r--src/field/region_map.c4
-rw-r--r--src/field/slot_machine.c1863
-rw-r--r--src/pokemon/mail.c75
-rw-r--r--src/pokemon/pokemon_1.c12
-rw-r--r--src/pokemon/pokemon_storage_system.c3
20 files changed, 2150 insertions, 450 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 78fc35ba5..454b47e08 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -220,7 +220,7 @@ void InitBattle(void)
" lsl r1, r1, #0x13\n"
" ldr r2, ._10\n"
" mov r0, sp\n"
- " bl gScriptFuncs_End+0x3cb4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n"
" ldr r0, ._10 + 4\n"
" strh r4, [r0]\n"
" sub r0, r0, #0xc\n"
@@ -347,13 +347,13 @@ void InitBattle(void)
" .word 0xff10\n"
" .word gWindowConfig_81E6C58\n"
" .word gUnknown_030042A4\n"
- " .word gUnknown_030042A0\n"
+ " .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
- " .word gUnknown_030041B4\n"
- " .word gUnknown_03004288\n"
- " .word gUnknown_03004280\n"
- " .word gUnknown_030041B0\n"
- " .word gUnknown_030041B8\n"
+ " .word gBattle_BG1_Y\n"
+ " .word gBattle_BG2_X\n"
+ " .word gBattle_BG2_Y\n"
+ " .word gBattle_BG3_X\n"
+ " .word gBattle_BG3_Y\n"
" .word gUnknown_02023A14+0x50\n"
" .word gBattleTerrain\n"
" .word gUnknown_03004210\n"
@@ -907,7 +907,7 @@ void sub_800EC9C()
" ldr r2, ._116 + 4\n"
" add r1, r1, r2\n"
" mov r2, #0xc8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" b ._129\n"
"._117:\n"
" .align 2, 0\n"
@@ -946,7 +946,7 @@ void sub_800EC9C()
" ldr r2, ._126 + 4\n"
" add r1, r1, r2\n"
" mov r2, #0xc8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" b ._129\n"
"._127:\n"
" .align 2, 0\n"
@@ -982,7 +982,7 @@ void sub_800EC9C()
" add r1, r1, r0\n"
" add r0, r4, #0\n"
" mov r2, #0xc8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" ldr r1, ._134 + 8\n"
" add r0, r4, r1\n"
" bl shedinja_something\n"
@@ -1407,7 +1407,7 @@ void sub_800F104()
" add r1, r1, r0\n"
" ldr r0, ._177 + 4\n"
" mov r2, #0x60\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
"._174:\n"
" add r7, r7, #0x1c\n"
" add r4, r4, #0x1\n"
@@ -1781,7 +1781,7 @@ void sub_800F298()
" ldr r1, ._239 + 4\n"
" mov r2, #0x96\n"
" lsl r2, r2, #0x1\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" ldr r0, ._239 + 8\n"
" mov r1, #0x0\n"
" bl CreateTask\n"
@@ -2018,7 +2018,7 @@ void sub_800F298()
"._283:\n"
" add r1, r5, #0\n"
" mov r2, #0xc8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" b ._291\n"
"._293:\n"
" .align 2, 0\n"
@@ -2028,7 +2028,7 @@ void sub_800F298()
" ldr r0, ._296\n"
" add r1, r5, #0\n"
" mov r2, #0xc8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
"._291:\n"
" mov r0, #0x80\n"
" lsl r0, r0, #0x1\n"
@@ -2185,7 +2185,7 @@ void sub_800F298()
"._333:\n"
" add r1, r5, #0\n"
" mov r2, #0x64\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" b ._341\n"
"._343:\n"
" .align 2, 0\n"
@@ -2195,7 +2195,7 @@ void sub_800F298()
" ldr r0, ._346\n"
" add r1, r5, #0\n"
" mov r2, #0x64\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
"._341:\n"
" mov r0, #0x80\n"
" lsl r0, r0, #0x1\n"
@@ -2627,7 +2627,7 @@ void BattleMainCB2(void)
" str r0, [r4]\n"
" bl ZeroEnemyPartyMons\n"
" mov r0, #0x5a\n"
- " bl gScriptFuncs_End+0x148c\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x148c\n"
" ldr r0, ._358 + 24\n"
" ldrh r1, [r0]\n"
" mov r0, #0x2\n"
@@ -3197,7 +3197,7 @@ void debug_sub_80108B8()
asm(
" push {r4, r5, lr}\n"
" add sp, sp, #0xfffffffc\n"
- " bl gScriptFuncs_End+0x19f4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x19f4\n"
" mov r0, #0x0\n"
" bl SetHBlankCallback\n"
" mov r0, #0x0\n"
@@ -3264,7 +3264,7 @@ void debug_sub_80108B8()
" ldr r1, ._507 + 72\n"
" add r0, r4, #0\n"
" bl LZDecompressVram\n"
- " bl gScriptFuncs_End+0x1a70\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x1a70\n"
" ldr r0, ._507 + 76\n"
" bl SetVBlankCallback\n"
" ldr r0, ._507 + 80\n"
@@ -3333,13 +3333,13 @@ void debug_sub_80108B8()
" .word 0x85006000\n"
" .word 0x4000200\n"
" .word gUnknown_030042A4\n"
- " .word gUnknown_030042A0\n"
+ " .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
- " .word gUnknown_030041B4\n"
- " .word gUnknown_03004288\n"
- " .word gUnknown_03004280\n"
- " .word gUnknown_030041B0\n"
- " .word gUnknown_030041B8\n"
+ " .word gBattle_BG1_Y\n"
+ " .word gBattle_BG2_X\n"
+ " .word gBattle_BG2_Y\n"
+ " .word gBattle_BG3_X\n"
+ " .word gBattle_BG3_Y\n"
" .word 0x1f09\n"
" .word 0x4801\n"
" .word 0x4000050\n"
@@ -3860,7 +3860,7 @@ void debug_sub_8010CAC()
" strb r0, [r3, #0x15]\n"
" lsl r0, r0, #0x1f\n"
" lsr r0, r0, #0x1f\n"
- " bl gScriptFuncs_End+0x2aa0\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2aa0\n"
" bl debug_nullsub_3\n"
"._559:\n"
" ldr r4, ._565 + 12\n"
@@ -4774,7 +4774,7 @@ void debug_sub_8011498()
" lsl r4, r4, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -4830,7 +4830,7 @@ void debug_sub_8011498()
" lsl r4, r4, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -4886,7 +4886,7 @@ void debug_sub_8011498()
" lsl r4, r4, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -4929,7 +4929,7 @@ void debug_sub_8011498()
" lsl r4, r5, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -4965,7 +4965,7 @@ void debug_sub_8011498()
" lsl r4, r4, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -5002,7 +5002,7 @@ void debug_sub_8011498()
" lsl r4, r5, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -5200,7 +5200,7 @@ void debug_sub_801174C()
"._713:\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r3, #0x64\n"
" mul r0, r0, r3\n"
" ldr r1, ._719\n"
@@ -5223,7 +5223,7 @@ void debug_sub_801174C()
"._699:\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r2, #0x64\n"
" add r1, r0, #0\n"
" mul r1, r1, r2\n"
@@ -5282,7 +5282,7 @@ void debug_sub_801174C()
" str r0, [sp, #0xc]\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r3, #0x64\n"
" mul r0, r0, r3\n"
" ldr r1, ._726\n"
@@ -5355,7 +5355,7 @@ void debug_sub_801174C()
"._735:\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r2, #0x64\n"
" mul r0, r0, r2\n"
" ldr r1, ._741\n"
@@ -5382,7 +5382,7 @@ void debug_sub_801174C()
"._721:\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r2, #0x64\n"
" add r1, r0, #0\n"
" mul r1, r1, r2\n"
@@ -5441,7 +5441,7 @@ void debug_sub_801174C()
" str r0, [sp, #0xc]\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r2, #0x64\n"
" mul r0, r0, r2\n"
" ldr r1, ._750\n"
@@ -5460,7 +5460,7 @@ void debug_sub_801174C()
" ble ._743 @cond_branch\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r3, #0x64\n"
" mul r0, r0, r3\n"
" ldr r1, ._750\n"
@@ -5838,13 +5838,13 @@ void debug_sub_8011D40()
" .word 0x6004000\n"
" .word 0x80000800\n"
" .word gUnknown_030042A4\n"
- " .word gUnknown_030042A0\n"
+ " .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
- " .word gUnknown_030041B4\n"
- " .word gUnknown_03004288\n"
- " .word gUnknown_03004280\n"
- " .word gUnknown_030041B0\n"
- " .word gUnknown_030041B8\n"
+ " .word gBattle_BG1_Y\n"
+ " .word gBattle_BG2_X\n"
+ " .word gBattle_BG2_Y\n"
+ " .word gBattle_BG3_X\n"
+ " .word gBattle_BG3_Y\n"
"\n"
);
}
@@ -5911,13 +5911,13 @@ void debug_sub_8011DD4()
" .word 0x4000008\n"
" .word 0x9803\n"
" .word gUnknown_030042A4\n"
- " .word gUnknown_030042A0\n"
+ " .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
- " .word gUnknown_030041B4\n"
- " .word gUnknown_03004288\n"
- " .word gUnknown_03004280\n"
- " .word gUnknown_030041B0\n"
- " .word gUnknown_030041B8\n"
+ " .word gBattle_BG1_Y\n"
+ " .word gBattle_BG2_X\n"
+ " .word gBattle_BG2_Y\n"
+ " .word gBattle_BG3_X\n"
+ " .word gBattle_BG3_Y\n"
"\n"
);
}
@@ -6483,7 +6483,7 @@ void debug_sub_8012294()
" lsl r4, r4, #0x1\n"
" add r0, r5, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" add r5, r0, #0\n"
" lsl r5, r5, #0x18\n"
" lsr r5, r5, #0x15\n"
@@ -7102,7 +7102,7 @@ void debug_sub_8012688()
" bl SetHBlankCallback\n"
" ldr r0, ._873 + 100\n"
" bl SetVBlankCallback\n"
- " bl gScriptFuncs_End+0x14f4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x14f4\n"
" ldr r0, ._873 + 104\n"
" mov r1, #0x0\n"
" bl CreateTask\n"
@@ -7132,13 +7132,13 @@ void debug_sub_8012688()
" .word 0x400004c\n"
" .word gWindowConfig_81E6C58\n"
" .word gUnknown_030042A4\n"
- " .word gUnknown_030042A0\n"
+ " .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
- " .word gUnknown_030041B4\n"
- " .word gUnknown_03004288\n"
- " .word gUnknown_03004280\n"
- " .word gUnknown_030041B0\n"
- " .word gUnknown_030041B8\n"
+ " .word gBattle_BG1_Y\n"
+ " .word gBattle_BG2_X\n"
+ " .word gBattle_BG2_Y\n"
+ " .word gBattle_BG3_X\n"
+ " .word gBattle_BG3_Y\n"
" .word gBattleTerrain\n"
" .word gReservedSpritePaletteCount\n"
" .word gCurrentMove\n"
@@ -7764,7 +7764,7 @@ void debug_sub_8012C08()
" .word gTasks\n"
" .word UnkDebug0+0x432\n"
" .word gUnknown_03004210\n"
- " .word gUnknown_08400D7A\n"
+ " .word BattleText_YesNo\n"
"\n"
);
}
@@ -8484,7 +8484,7 @@ void debug_sub_8013240()
{
asm(
" push {lr}\n"
- " bl gScriptFuncs_End+0x2fec\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2fec\n"
" lsl r0, r0, #0x10\n"
" cmp r0, #0\n"
" beq ._1068 @cond_branch\n"
@@ -8519,7 +8519,7 @@ void debug_sub_8013258()
" lsr r4, r0, #0x10\n"
" add r0, r4, #0\n"
" add r1, r6, #0\n"
- " bl gScriptFuncs_End+0x2f60\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2f60\n"
" cmp r0, #0\n"
" bne ._1071 @cond_branch\n"
" mov r0, #0x80\n"
@@ -8555,13 +8555,13 @@ void debug_sub_8013294()
" lsl r0, r0, #0x18\n"
" cmp r0, #0\n"
" bne ._1076 @cond_branch\n"
- " bl gScriptFuncs_End+0x19f4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x19f4\n"
" add r0, r4, #0\n"
" add r1, r5, #0\n"
" add r2, r6, #0\n"
" bl debug_sub_8013258\n"
" add r4, r0, #0\n"
- " bl gScriptFuncs_End+0x1a70\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x1a70\n"
" add r0, r4, #0\n"
" b ._1077\n"
"._1076:\n"
@@ -8591,7 +8591,7 @@ void debug_sub_80132C8()
" mov r1, #0x0\n"
" add r2, r5, #0\n"
" add r3, r6, #0\n"
- " bl gScriptFuncs_End+0x2d64\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2d64\n"
"._1078:\n"
" pop {r4, r5, r6}\n"
" pop {r0}\n"
@@ -9066,7 +9066,7 @@ void debug_sub_80139E4()
"._1193:\n"
" ldr r0, ._1198 + 12\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" ldr r1, ._1198 + 4\n"
" mov r0, #0x0\n"
" strb r0, [r1]\n"
@@ -9081,7 +9081,7 @@ void debug_sub_80139E4()
" lsl r0, r0, #0x2\n"
" add r0, r0, r5\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" ldrb r0, [r4]\n"
" add r0, r0, #0x1\n"
" strb r0, [r4]\n"
@@ -9103,7 +9103,7 @@ void debug_sub_80139E4()
"._1192:\n"
" ldr r0, ._1202\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" ldr r1, ._1202 + 4\n"
" strb r4, [r1]\n"
" ldr r0, ._1202 + 8\n"
@@ -9117,7 +9117,7 @@ void debug_sub_80139E4()
" lsl r0, r0, #0x2\n"
" add r0, r0, r5\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" ldrb r0, [r4]\n"
" add r0, r0, #0x1\n"
" strb r0, [r4]\n"
@@ -9349,7 +9349,7 @@ void sub_8010874()
" mov r0, #0x64\n"
" mul r0, r0, r1\n"
" ldr r1, ._1215 + 160\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" ldr r2, ._1215 + 164\n"
" add r1, r4, r2\n"
" strb r0, [r1]\n"
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index 938d0fde1..ffc9281e4 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -318,7 +318,7 @@ void BattleAI_SetupAIData()
" ldrb r0, [r3]\n"
" mov r1, #0x0\n"
" mov r2, #0xff\n"
- " bl sub_8015A98\n"
+ " bl CheckMoveLimitations\n"
" lsl r0, r0, #0x18\n"
" lsr r7, r0, #0x18\n"
" mov r4, #0x0\n"
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index b19547d52..1b6240159 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -1405,7 +1405,7 @@ void sub_804454C()
" add r1, r1, r0\n"
" mov r0, sp\n"
" ldr r2, ._150 + 36\n"
- " bl gScriptFuncs_End+0x3cb4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n"
" ldrb r4, [r5]\n"
" ldrh r0, [r7]\n"
" mov r1, sl\n"
@@ -1467,7 +1467,7 @@ void sub_804454C()
" ldr r2, ._153 + 4\n"
" add r1, r1, r2\n"
" ldr r2, ._153 + 8\n"
- " bl gScriptFuncs_End+0x3cb4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n"
" b ._163\n"
"._154:\n"
" .align 2, 0\n"
@@ -1521,7 +1521,7 @@ void sub_804454C()
" add r1, r1, r6\n"
" mov r0, sp\n"
" ldr r2, ._161 + 4\n"
- " bl gScriptFuncs_End+0x3cb4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n"
" ldrb r4, [r5]\n"
" ldrh r0, [r7]\n"
" mov r1, sl\n"
diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c
index 1d36d528f..b86fa0abf 100644
--- a/src/debug/nakamura_debug_menu.c
+++ b/src/debug/nakamura_debug_menu.c
@@ -2237,7 +2237,7 @@ void debug_sub_815FFDC()
" mov r0, #0xf\n"
" mov r1, #0x1\n"
" mov r2, #0xff\n"
- " bl unref_sub_80F924C\n"
+ " bl PrintTriangleCursorWithPalette\n"
" ldr r1, ._217 + 4\n"
" ldr r0, ._217 + 8\n"
" str r0, [r1]\n"
@@ -2831,7 +2831,7 @@ void debug_sub_81603B8()
" lsl r1, r1, #0x18\n"
" lsr r1, r1, #0x18\n"
" mov r2, #0xff\n"
- " bl unref_sub_80F924C\n"
+ " bl PrintTriangleCursorWithPalette\n"
" pop {r4, r5, r6, r7}\n"
" pop {r0}\n"
" bx r0\n"
@@ -3206,7 +3206,7 @@ void debug_sub_8160714()
" lsr r1, r1, #0x18\n"
" mov r0, r9\n"
" str r2, [sp, #0xc]\n"
- " bl sub_810CA9C\n"
+ " bl GetPokeblockData\n"
" add r1, r0, #0\n"
" lsl r0, r5, #0x1\n"
" add r0, r0, sp\n"
diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c
index f929170fd..766137871 100644
--- a/src/debug/nohara_debug_menu.c
+++ b/src/debug/nohara_debug_menu.c
@@ -2177,7 +2177,7 @@ void NoharaDebugMenu_SootopolisCity()
" mov r0, #0x71\n"
" bl FlagSet\n"
" ldr r0, ._227\n"
- " bl FlagReset\n"
+ " bl FlagClear\n"
" bl CloseMenu\n"
" mov r0, #0x1\n"
" pop {r1}\n"
@@ -2196,7 +2196,7 @@ void NoharaDebugMenu_Embark()
asm(
" push {lr}\n"
" ldr r0, ._229\n"
- " bl FlagReset\n"
+ " bl FlagClear\n"
" ldr r0, ._229 + 4\n"
" mov r1, #0x1\n"
" bl VarSet\n"
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index 6f9f0d02c..e4ae404e2 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -170,7 +170,7 @@ void debug_sub_8076BB4()
" add r2, r2, #0x4\n"
" add r0, r0, r2\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" b ._24\n"
"._14:\n"
" .align 2, 0\n"
@@ -886,7 +886,7 @@ void DebugMenu_8077020()
" lsr r4, r0, #0x18\n"
" ldr r0, ._109\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" cmp r0, #0x1\n"
@@ -1058,7 +1058,7 @@ void DebugMenu_807709C()
" add r1, r1, #0x4\n"
" add r0, r0, r1\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" b ._132\n"
@@ -1185,18 +1185,18 @@ void DebugMenu_8077238()
" ldr r1, ._139\n"
" mov r0, sp\n"
" mov r2, #0x2\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, sp, #0x4\n"
" mov r9, r0\n"
" ldr r1, ._139 + 4\n"
" mov r2, #0x3\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r1, sp, #0x8\n"
" mov sl, r1\n"
" ldr r1, ._139 + 8\n"
" mov r0, sl\n"
" mov r2, #0x3\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" mov r2, #0x0\n"
" str r2, [sp, #0x14]\n"
" add r4, sp, #0x10\n"
@@ -1930,7 +1930,7 @@ void DebugMenu_80776B4()
" ldr r1, ._183\n"
" mov r0, sp\n"
" mov r2, #0x7\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" lsl r3, r4, #0x1\n"
" lsl r5, r4, #0x19\n"
" lsr r5, r5, #0x18\n"
@@ -1973,7 +1973,7 @@ void DebugMenu_8077704()
" ldr r1, ._185\n"
" mov r0, sp\n"
" mov r2, #0x11\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" mov r0, #0x13\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
@@ -2172,7 +2172,7 @@ void DebugMenu_807786C()
" ldr r1, ._205\n"
" mov r0, sp\n"
" mov r2, #0x7\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" mov r0, #0x19\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
@@ -2871,7 +2871,7 @@ void DebugMenu_8077C3C()
" add r0, r2, #0\n"
" mov r1, #0xa\n"
" str r3, [sp]\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" add r2, r0, #0\n"
" ldr r3, [sp]\n"
" cmp r4, r6\n"
@@ -3983,7 +3983,7 @@ void DebugMenu_80783C8()
" .word 0x804\n"
"._381:\n"
" add r0, r4, #0\n"
- " bl FlagReset\n"
+ " bl FlagClear\n"
" mov r0, #0x1\n"
" bl DebugMenu_807786C\n"
"._382:\n"
@@ -4075,7 +4075,7 @@ void DebugMenu_8078464()
" b ._401\n"
"._392:\n"
" add r0, r4, #0\n"
- " bl FlagReset\n"
+ " bl FlagClear\n"
" b ._401\n"
"._398:\n"
" add r0, r4, #0\n"
@@ -5578,7 +5578,7 @@ void DebugMenu_8078E04()
" lsr r4, r0, #0x10\n"
" add r0, r4, #0\n"
" add r1, r6, #0\n"
- " bl gScriptFuncs_End+0x2f60\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2f60\n"
" cmp r0, #0\n"
" bne ._576 @cond_branch\n"
" mov r0, #0x80\n"
@@ -5611,13 +5611,13 @@ void DebugMenu_8078E40()
" add r6, r2, #0\n"
" lsl r4, r4, #0x18\n"
" lsr r4, r4, #0x18\n"
- " bl gScriptFuncs_End+0x19f4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x19f4\n"
" add r0, r4, #0\n"
" add r1, r5, #0\n"
" add r2, r6, #0\n"
" bl DebugMenu_8078E04\n"
" add r4, r0, #0\n"
- " bl gScriptFuncs_End+0x1a70\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x1a70\n"
" add r0, r4, #0\n"
" pop {r4, r5, r6}\n"
" pop {r1}\n"
@@ -5637,7 +5637,7 @@ void DebugMenu_8078E68()
" lsr r0, r0, #0x18\n"
" mov r1, #0x0\n"
" add r2, r4, #0\n"
- " bl gScriptFuncs_End+0x2d64\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2d64\n"
" pop {r4}\n"
" pop {r0}\n"
" bx r0\n"
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index cc2bdd80e..2d9074d19 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -2197,7 +2197,7 @@ void debug_sub_808C714()
" .word gUnknown_Debug_083C31DC+0xa\n"
"._189:\n"
" add r0, r4, #0\n"
- " bl FlagReset\n"
+ " bl FlagClear\n"
"._190:\n"
" pop {r4}\n"
" pop {r0}\n"
@@ -2857,7 +2857,7 @@ void debug_sub_808CBC0()
" .word gUnknown_Debug_083C2710+0xa\n"
"._229:\n"
" add r0, r4, #0\n"
- " bl FlagReset\n"
+ " bl FlagClear\n"
"._230:\n"
" pop {r4}\n"
" pop {r0}\n"
@@ -3235,7 +3235,7 @@ void debug_sub_808CE5C()
" .word gUnknown_Debug_083C1C34+0x4\n"
"._257:\n"
" add r0, r4, #0\n"
- " bl FlagReset\n"
+ " bl FlagClear\n"
"._258:\n"
" pop {r4}\n"
" pop {r0}\n"
@@ -3895,7 +3895,7 @@ void debug_sub_808D308()
" .word gUnknown_Debug_083C19C6\n"
"._297:\n"
" add r0, r4, #0\n"
- " bl FlagReset\n"
+ " bl FlagClear\n"
"._298:\n"
" pop {r4}\n"
" pop {r0}\n"
@@ -4226,7 +4226,7 @@ void debug_sub_808D54C()
" .word gUnknown_Debug_083C1194+0x2\n"
"._323:\n"
" add r0, r4, #0\n"
- " bl FlagReset\n"
+ " bl FlagClear\n"
"._324:\n"
" pop {r4}\n"
" pop {r0}\n"
@@ -4557,7 +4557,7 @@ void debug_sub_808D790()
" .word gUnknown_Debug_083C12D0+0x2\n"
"._349:\n"
" add r0, r4, #0\n"
- " bl FlagReset\n"
+ " bl FlagClear\n"
"._350:\n"
" pop {r4}\n"
" pop {r0}\n"
@@ -4840,7 +4840,7 @@ void debug_sub_808D97C()
" .word gUnknown_Debug_083C1AAC+0x2\n"
"._373:\n"
" add r0, r4, #0\n"
- " bl FlagReset\n"
+ " bl FlagClear\n"
"._374:\n"
" pop {r4}\n"
" pop {r0}\n"
diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c
index 70e194907..a217a0258 100644
--- a/src/debug/unk_debug_menu_3.c
+++ b/src/debug/unk_debug_menu_3.c
@@ -9,7 +9,7 @@ void debug_sub_813C404()
" sub r5, r5, r4\n"
" add r1, r4, #0\n"
" add r2, r5, #0\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r6, #0\n"
" add r1, r4, #0\n"
" bl unref_sub_812620C\n"
@@ -37,7 +37,7 @@ void debug_sub_813C430()
" sub r5, r5, r4\n"
" add r1, r4, #0\n"
" add r2, r5, #0\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r6, #0\n"
" add r1, r4, #0\n"
" bl unref_sub_812620C\n"
@@ -65,7 +65,7 @@ void debug_sub_813C45C()
" sub r5, r5, r4\n"
" add r1, r4, #0\n"
" add r2, r5, #0\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r6, #0\n"
" add r1, r4, #0\n"
" bl unref_sub_812620C\n"
@@ -93,7 +93,7 @@ void debug_sub_813C488()
" sub r5, r5, r4\n"
" add r1, r4, #0\n"
" add r2, r5, #0\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r6, #0\n"
" add r1, r4, #0\n"
" bl unref_sub_812620C\n"
@@ -119,7 +119,7 @@ void debug_sub_813C4B4()
" ldr r1, ._9 + 4\n"
" sub r4, r4, r1\n"
" add r2, r4, #0\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r4, #0\n"
" pop {r4}\n"
" pop {r1}\n"
@@ -144,7 +144,7 @@ void debug_sub_813C4D4()
" sub r5, r5, r4\n"
" add r1, r4, #0\n"
" add r2, r5, #0\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r6, #0\n"
" add r1, r4, #0\n"
" bl unref_sub_81261B4\n"
@@ -172,7 +172,7 @@ void debug_sub_813C500()
" sub r5, r5, r4\n"
" add r1, r4, #0\n"
" add r2, r5, #0\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r6, #0\n"
" add r1, r4, #0\n"
" bl unref_sub_812620C\n"
@@ -207,7 +207,7 @@ void debug_sub_813C52C()
" mov r0, r8\n"
" add r1, r4, #0\n"
" add r2, r6, #0\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" ldr r0, ._15 + 8\n"
" sub r0, r0, r4\n"
" add r0, r0, r8\n"
@@ -517,7 +517,7 @@ void debug_sub_813C740()
" add r0, r6, #0\n"
" mov r1, r8\n"
" mov r2, r9\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r5, #0\n"
" mov r1, #0x19\n"
" mov r2, #0x5\n"
@@ -564,7 +564,7 @@ void debug_sub_813C740()
" sub r0, r0, r1\n"
" add r1, r5, #0\n"
" mov r2, #0x64\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" ldr r0, ._29 + 20\n"
" add r6, r6, r0\n"
" mov r0, r8\n"
@@ -572,7 +572,7 @@ void debug_sub_813C740()
" add r0, r6, #0\n"
" mov r1, sp\n"
" mov r2, #0x24\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" mov r0, r9\n"
" add sp, sp, #0x30\n"
" pop {r3, r4, r5}\n"
@@ -612,7 +612,7 @@ void debug_sub_813C810()
" add r0, r6, #0\n"
" add r1, r5, #0\n"
" mov r2, r8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r4, #0\n"
" mov r1, #0xc9\n"
" mov r2, #0x15\n"
@@ -626,13 +626,13 @@ void debug_sub_813C810()
" sub r0, r0, r5\n"
" add r1, r4, #0\n"
" mov r2, #0x64\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" ldr r0, ._31 + 16\n"
" add r0, r6, r0\n"
" sub r0, r0, r5\n"
" mov r1, sp\n"
" mov r2, #0x24\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r6, #0\n"
" add r1, r5, #0\n"
" bl unref_sub_812620C\n"
@@ -672,7 +672,7 @@ void debug_sub_813C888()
" add r0, r6, #0\n"
" add r1, r5, #0\n"
" mov r2, r8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r4, #0\n"
" mov r1, #0xc9\n"
" mov r2, #0x15\n"
@@ -688,13 +688,13 @@ void debug_sub_813C888()
" sub r0, r0, r5\n"
" add r1, r4, #0\n"
" mov r2, #0x64\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" ldr r0, ._33 + 16\n"
" add r0, r6, r0\n"
" sub r0, r0, r5\n"
" mov r1, sp\n"
" mov r2, #0x24\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r6, #0\n"
" add r1, r5, #0\n"
" bl unref_sub_812620C\n"
@@ -763,7 +763,7 @@ void debug_sub_813C93C()
" sub r5, r5, r6\n"
" add r1, r6, #0\n"
" add r2, r5, #0\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" bl SavePlayerParty\n"
" bl debug_sub_813C904\n"
" ldr r1, ._37 + 8\n"
@@ -777,7 +777,7 @@ void debug_sub_813C93C()
" add r0, r4, #0\n"
" mov r1, sp\n"
" mov r2, #0xbc\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" add r0, r5, #0\n"
" add sp, sp, #0xbc\n"
" pop {r4, r5, r6}\n"
diff --git a/src/engine/save.c b/src/engine/save.c
index 5564a6ce3..e1fb47dcc 100644
--- a/src/engine/save.c
+++ b/src/engine/save.c
@@ -690,7 +690,7 @@ void sub_813B79C()
" strh r0, [r1]\n"
" add r0, r5, #0\n"
" add r1, r4, #0\n"
- " bl gScriptFuncs_End+0x2f60\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2f60\n"
" add r0, r5, #1\n"
" lsl r0, r0, #0x10\n"
" lsr r5, r0, #0x10\n"
@@ -718,7 +718,7 @@ void sub_813B79C()
" lsr r4, r4, #0x10\n"
" add r0, r4, #0\n"
" add r1, r6, #0\n"
- " bl gScriptFuncs_End+0x2f60\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2f60\n"
" add r0, r5, #1\n"
" lsl r0, r0, #0x10\n"
" lsr r5, r0, #0x10\n"
diff --git a/src/field/choose_party.c b/src/field/choose_party.c
index 545c19dfa..8a54b0ad0 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -540,7 +540,7 @@ void debug_sub_81381B4()
" add r0, r4, #0\n"
" mov r1, #0x0\n"
" mov r2, #0x60\n"
- " bl gScriptFuncs_End+0x5c24\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5c24\n"
" mov r7, #0x0\n"
" mov r8, r4\n"
" mov r0, #0x4\n"
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index 747edf816..db674e52f 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -291,7 +291,7 @@ u8 TryDoMetatileBehaviorForcedMovement()
" lsr r0, r0, #0x16\n"
" add r0, r0, r4\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
"._26:\n"
@@ -513,7 +513,7 @@ void MovePlayerNotOnBike(u8 u81, u16 u161)
" ldr r2, [r0]\n"
" add r0, r5, #0\n"
" add r1, r6, #0\n"
- " bl gScriptFuncs_End+0x3cfc\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cfc\n"
"._83:\n"
" pop {r4, r5, r6}\n"
" pop {r0}\n"
@@ -1855,3 +1855,98 @@ static void sub_805A954(void)
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 1, playerSprite->pos2.y);
}
+
+#if DEBUG
+__attribute__((naked))
+void debug_sub_805F2B0()
+{
+ asm(
+ " push {lr}\n"
+ " lsl r0, r0, #0x18\n"
+ " lsr r2, r0, #0x18\n"
+ " ldr r0, ._422\n"
+ " ldrh r1, [r0, #0x2c]\n"
+ " mov r0, #0x80\n"
+ " lsl r0, r0, #0x1\n"
+ " and r0, r0, r1\n"
+ " cmp r0, #0\n"
+ " bne ._420 @cond_branch\n"
+ " mov r0, #0x0\n"
+ " b ._421\n"
+ "._423:\n"
+ " .align 2, 0\n"
+ "._422:\n"
+ " .word gMain\n"
+ "._420:\n"
+ " add r0, r2, #0\n"
+ " bl debug_sub_805F2DC\n"
+ " lsl r0, r0, #0x18\n"
+ " lsr r0, r0, #0x18\n"
+ "._421:\n"
+ " pop {r1}\n"
+ " bx r1\n"
+ "\n"
+ );
+}
+
+__attribute__((naked))
+void debug_sub_805F2DC()
+{
+ asm(
+ " push {r4, lr}\n"
+ " lsl r0, r0, #0x18\n"
+ " lsr r4, r0, #0x18\n"
+ " cmp r4, #0\n"
+ " bne ._424 @cond_branch\n"
+ " ldr r2, ._426\n"
+ " ldr r0, ._426 + 4\n"
+ " ldrb r1, [r0, #0x5]\n"
+ " lsl r0, r1, #0x3\n"
+ " add r0, r0, r1\n"
+ " lsl r0, r0, #0x2\n"
+ " add r0, r0, r2\n"
+ " ldrb r0, [r0, #0x18]\n"
+ " lsr r0, r0, #0x4\n"
+ " bl PlayerFaceDirection\n"
+ " b ._430\n"
+ "._427:\n"
+ " .align 2, 0\n"
+ "._426:\n"
+ " .word gMapObjects\n"
+ " .word gPlayerAvatar\n"
+ "._424:\n"
+ " ldr r2, ._431\n"
+ " ldr r0, ._431 + 4\n"
+ " ldrb r1, [r0, #0x5]\n"
+ " lsl r0, r1, #0x3\n"
+ " add r0, r0, r1\n"
+ " lsl r0, r0, #0x2\n"
+ " add r0, r0, r2\n"
+ " ldrb r0, [r0, #0x1]\n"
+ " lsr r0, r0, #0x7\n"
+ " cmp r0, #0\n"
+ " beq ._429 @cond_branch\n"
+ " add r0, r4, #0\n"
+ " bl CanCameraMoveInDirection\n"
+ " cmp r0, #0\n"
+ " bne ._429 @cond_branch\n"
+ " add r0, r4, #0\n"
+ " bl PlayerOnBikeCollide\n"
+ " b ._430\n"
+ "._432:\n"
+ " .align 2, 0\n"
+ "._431:\n"
+ " .word gMapObjects\n"
+ " .word gPlayerAvatar\n"
+ "._429:\n"
+ " add r0, r4, #0\n"
+ " bl sub_80593F4\n"
+ "._430:\n"
+ " mov r0, #0x1\n"
+ " pop {r4}\n"
+ " pop {r1}\n"
+ " bx r1\n"
+ "\n"
+ );
+}
+#endif
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index b6475d8ff..97eba16e0 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -188,6 +188,45 @@ const u8 gUnknown_083970C8[] =
1,
};
+#if DEBUG
+
+const u8 gDebugText_Weather_0[] = _("なし　　　");
+const u8 gDebugText_Weather_1[] = _("はれ　　　");
+const u8 gDebugText_Weather_2[] = _("はれ2　　");
+const u8 gDebugText_Weather_3[] = _("あめ　　　");
+const u8 gDebugText_Weather_4[] = _("ゆき　　　");
+const u8 gDebugText_Weather_5[] = _("かみなり　");
+const u8 gDebugText_Weather_6[] = _("きり　　　");
+const u8 gDebugText_Weather_7[] = _("かざんばい");
+const u8 gDebugText_Weather_8[] = _("すなあらし");
+const u8 gDebugText_Weather_9[] = _("きり2　　");
+const u8 gDebugText_Weather_10[] = _("かいてい　");
+const u8 gDebugText_Weather_11[] = _("くもり　　");
+const u8 gDebugText_Weather_12[] = _("はれ3　　");
+const u8 gDebugText_Weather_13[] = _("おおあめ");
+const u8 gDebugText_Weather_14[] = _("かいてい2");
+
+const u8 *const gDebugText_Weather[] =
+{
+ gDebugText_Weather_0,
+ gDebugText_Weather_1,
+ gDebugText_Weather_2,
+ gDebugText_Weather_3,
+ gDebugText_Weather_4,
+ gDebugText_Weather_5,
+ gDebugText_Weather_6,
+ gDebugText_Weather_7,
+ gDebugText_Weather_8,
+ gDebugText_Weather_9,
+ gDebugText_Weather_10,
+ gDebugText_Weather_11,
+ gDebugText_Weather_12,
+ gDebugText_Weather_13,
+ gDebugText_Weather_14,
+};
+
+#endif
+
const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal");
void StartWeather(void)
@@ -1159,3 +1198,145 @@ void sub_807DE68(void)
{
gUnknown_030006DC = gUnknown_083970C8;
}
+
+#if DEBUG
+
+__attribute__((naked))
+u8 debug_sub_8085564(void)
+{
+ asm("\
+ push {lr}\n\
+ mov r2, #0x0\n\
+ ldr r0, ._375\n\
+ ldrh r1, [r0, #0x2e]\n\
+ mov r0, #0x80\n\
+ lsl r0, r0, #0x1\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._370 @cond_branch\n\
+ ldr r1, ._375 + 4\n\
+ ldrb r0, [r1]\n\
+ add r0, r0, #0x1\n\
+ strb r0, [r1]\n\
+ lsl r0, r0, #0x18\n\
+ lsr r0, r0, #0x18\n\
+ cmp r0, #0xf\n\
+ bne ._371 @cond_branch\n\
+ strb r2, [r1]\n\
+._371:\n\
+ mov r2, #0x1\n\
+._370:\n\
+ ldr r0, ._375\n\
+ ldrh r1, [r0, #0x2e]\n\
+ mov r0, #0x80\n\
+ lsl r0, r0, #0x2\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._372 @cond_branch\n\
+ ldr r1, ._375 + 4\n\
+ ldrb r0, [r1]\n\
+ cmp r0, #0\n\
+ beq ._373 @cond_branch\n\
+ sub r0, r0, #0x1\n\
+ b ._374\n\
+._376:\n\
+ .align 2, 0\n\
+._375:\n\
+ .word gMain\n\
+ .word gUnknown_0202FF58+0x2\n\
+._373:\n\
+ mov r0, #0xe\n\
+._374:\n\
+ strb r0, [r1]\n\
+ mov r2, #0x1\n\
+._372:\n\
+ cmp r2, #0\n\
+ beq ._377 @cond_branch\n\
+ mov r0, #0x16\n\
+ mov r1, #0x1\n\
+ mov r2, #0x1c\n\
+ mov r3, #0x2\n\
+ bl MenuFillWindowRectWithBlankTile\n\
+ ldr r1, ._380\n\
+ ldr r0, ._380 + 4\n\
+ ldrb r0, [r0]\n\
+ lsl r0, r0, #0x2\n\
+ add r0, r0, r1\n\
+ ldr r0, [r0]\n\
+ mov r1, #0x17\n\
+ mov r2, #0x1\n\
+ bl MenuPrint\n\
+._377:\n\
+ ldr r0, ._380 + 8\n\
+ ldrh r1, [r0, #0x2e]\n\
+ mov r0, #0x1\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ bne ._378 @cond_branch\n\
+ mov r0, #0x0\n\
+ b ._379\n\
+._381:\n\
+ .align 2, 0\n\
+._380:\n\
+ .word gDebugText_Weather\n\
+ .word gUnknown_0202FF58+0x2\n\
+ .word gMain\n\
+._378:\n\
+ ldr r0, ._382\n\
+ ldrb r0, [r0]\n\
+ bl DoWeatherEffect\n\
+ bl CloseMenu\n\
+ mov r0, #0x1\n\
+._379:\n\
+ pop {r1}\n\
+ bx r1\n\
+._383:\n\
+ .align 2, 0\n\
+._382:\n\
+ .word gUnknown_0202FF58+0x2");
+}
+
+__attribute__((naked))
+u8 debug_sub_808560C(void)
+{
+ asm("\
+ push {r4, lr}\n\
+ ldr r4, ._384\n\
+ ldr r0, ._384 + 4\n\
+ mov r1, #0xda\n\
+ lsl r1, r1, #0x3\n\
+ add r0, r0, r1\n\
+ ldrb r0, [r0]\n\
+ strb r0, [r4]\n\
+ bl MenuZeroFillScreen\n\
+ mov r0, #0x16\n\
+ mov r1, #0x1\n\
+ mov r2, #0x1c\n\
+ mov r3, #0x2\n\
+ bl MenuFillWindowRectWithBlankTile\n\
+ ldr r1, ._384 + 8\n\
+ ldrb r0, [r4]\n\
+ lsl r0, r0, #0x2\n\
+ add r0, r0, r1\n\
+ ldr r0, [r0]\n\
+ mov r1, #0x17\n\
+ mov r2, #0x1\n\
+ bl MenuPrint\n\
+ ldr r1, ._384 + 12\n\
+ ldr r0, ._384 + 16\n\
+ str r0, [r1]\n\
+ mov r0, #0x0\n\
+ pop {r4}\n\
+ pop {r1}\n\
+ bx r1\n\
+._385:\n\
+ .align 2, 0\n\
+._384:\n\
+ .word gUnknown_0202FF58+0x2\n\
+ .word gUnknown_0202F7E8\n\
+ .word gDebugText_Weather\n\
+ .word gCallback_03004AE8\n\
+ .word debug_sub_8085564+1");
+}
+
+#endif
diff --git a/src/field/fldeff_secretpower.c b/src/field/fldeff_secretpower.c
index bf8e98403..c200ce2f5 100644
--- a/src/field/fldeff_secretpower.c
+++ b/src/field/fldeff_secretpower.c
@@ -243,6 +243,102 @@ void sub_80C6280(void)
}
}
+#if DEBUG
+
+__attribute__((naked))
+void debug_sub_80D93F4()
+{
+ asm("\
+ push {r4, lr}\n\
+ bl sub_80BB63C\n\
+ ldr r0, ._98\n\
+ ldrh r0, [r0]\n\
+ cmp r0, #0x1\n\
+ beq ._95 @cond_branch\n\
+ bl player_get_direction_lower_nybble\n\
+ lsl r0, r0, #0x18\n\
+ lsr r0, r0, #0x18\n\
+ cmp r0, #0x2\n\
+ beq ._96 @cond_branch\n\
+._95:\n\
+ bl ScriptContext2_Disable\n\
+ b ._109\n\
+._99:\n\
+ .align 2, 0\n\
+._98:\n\
+ .word gScriptResult\n\
+._96:\n\
+ ldr r4, ._102\n\
+ add r1, r4, #2\n\
+ add r0, r4, #0\n\
+ bl GetXYCoordsOneStepInFrontOfPlayer\n\
+ mov r1, #0x0\n\
+ ldsh r0, [r4, r1]\n\
+ mov r2, #0x2\n\
+ ldsh r1, [r4, r2]\n\
+ bl MapGridGetMetatileBehaviorAt\n\
+ lsl r0, r0, #0x18\n\
+ lsr r4, r0, #0x18\n\
+ add r0, r4, #0\n\
+ bl MetatileBehavior_IsSecretBaseCave\n\
+ lsl r0, r0, #0x18\n\
+ lsr r0, r0, #0x18\n\
+ cmp r0, #0x1\n\
+ bne ._100 @cond_branch\n\
+ bl sub_80C6264\n\
+ ldr r1, ._102 + 4\n\
+ mov r0, #0x0\n\
+ strb r0, [r1]\n\
+ bl sub_80C639C\n\
+ b ._109\n\
+._103:\n\
+ .align 2, 0\n\
+._102:\n\
+ .word gUnknown_0203923C\n\
+ .word gLastFieldPokeMenuOpened\n\
+._100:\n\
+ add r0, r4, #0\n\
+ bl MetatileBehavior_IsSecretBaseTree\n\
+ lsl r0, r0, #0x18\n\
+ lsr r0, r0, #0x18\n\
+ cmp r0, #0x1\n\
+ bne ._104 @cond_branch\n\
+ bl sub_80C6264\n\
+ ldr r1, ._106\n\
+ mov r0, #0x0\n\
+ strb r0, [r1]\n\
+ bl sub_80C64A8\n\
+ b ._109\n\
+._107:\n\
+ .align 2, 0\n\
+._106:\n\
+ .word gLastFieldPokeMenuOpened\n\
+._104:\n\
+ add r0, r4, #0\n\
+ bl MetatileBehavior_IsSecretBaseShrub\n\
+ lsl r0, r0, #0x18\n\
+ lsr r0, r0, #0x18\n\
+ cmp r0, #0x1\n\
+ bne ._108 @cond_branch\n\
+ bl sub_80C6264\n\
+ ldr r1, ._110\n\
+ mov r0, #0x0\n\
+ strb r0, [r1]\n\
+ bl sub_80C660C\n\
+ b ._109\n\
+._111:\n\
+ .align 2, 0\n\
+._110:\n\
+ .word gLastFieldPokeMenuOpened\n\
+._108:\n\
+ bl ScriptContext2_Disable\n\
+._109:\n\
+ pop {r4}\n\
+ pop {r0}\n\
+ bx r0");
+}
+#endif
+
bool8 SetUpFieldMove_SecretPower(void)
{
u8 behavior;
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index 00368c2f5..1bce9bc3f 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -277,7 +277,7 @@ void debug_sub_810B32C()
" .word ._28\n"
" .word ._29\n"
"._25:\n"
- " bl sub_80F7A34\n"
+ " bl SetupBard\n"
" b ._37\n"
"._26:\n"
" mov r2, #0x0\n"
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index 7994dd60c..75c0cba78 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -4777,7 +4777,8 @@ void DoPPUpItemEffect(u8 taskId, u16 b, TaskFunc c)
gMain.newKeys = 0;
}
-static const u8 *const StatNames[] = {
+static const u8 *const StatNames[] =
+{
gOtherText_HP,
gOtherText_Attack,
gOtherText_Defense,
@@ -4786,7 +4787,8 @@ static const u8 *const StatNames[] = {
gOtherText_Speed,
};
-static const u8 StatDataTypes[] = {
+static const u8 StatDataTypes[] =
+{
MON_DATA_MAX_HP,
MON_DATA_ATK,
MON_DATA_DEF,
@@ -4794,6 +4796,17 @@ static const u8 StatDataTypes[] = {
MON_DATA_SPDEF,
MON_DATA_SPEED,
};
+
+#if DEBUG
+
+const u8 gUnknown_Debug_839B6CE[] = {0x40, 0, 0, 0, 0x44, 0, 0xFF, 0, 0, 0};
+
+const u8 gUnknown_Debug_839B6D8[] = _(
+ "{STR_VAR_1}かい　じっこう\n"
+ "{STR_VAR_2}たんいじかん　しょうひ");
+
+#endif
+
void DoRareCandyItemEffect(u8 taskId, u16 b, TaskFunc c)
{
u8 i;
diff --git a/src/field/region_map.c b/src/field/region_map.c
index a098eb73d..3bd64a8a0 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -280,7 +280,7 @@ static u16 sub_80FB9C0(u16);
static void sub_80FBA18(void);
static bool8 sub_80FBAA0(u16);
void CreateRegionMapCursor(u16, u16);
-static void sub_80FBCA0(void);
+void sub_80FBCA0(void);
static void sub_80FBDF8(void);
static void sub_80FBE24(void);
static void SpriteCB_PlayerIconZoomedOut(struct Sprite *);
@@ -1127,7 +1127,7 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
}
}
-static void sub_80FBCA0(void)
+void sub_80FBCA0(void)
{
if (gRegionMap->cursorSprite != NULL)
{
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 3aefa80de..d84a6e592 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -30,6 +30,8 @@ struct UnkStruct1
#define SLOTMACHINE_GFX_TILES 236
#endif
+// TODO: figure out which functions are static and which are not.
+#define static
static void CB2_SlotMachineSetup(void);
static void CB2_SlotMachineLoop(void);
@@ -77,6 +79,7 @@ static bool8 sub_81023E0(struct Task *task);
static bool8 sub_81023FC(struct Task *task);
static bool8 sub_8102424(struct Task *task);
static bool8 sub_8102460(struct Task *task);
+static bool8 debug_sub_8116E74(struct Task *);
static void sub_8102484(void);
static void sub_81024F0(void);
static bool8 sub_8102540(void);
@@ -230,11 +233,59 @@ static const u8 gUnknown_083ECE3A[];
static const u16 gUnknown_083ECE42[];
static const u16 gUnknown_083ECE48[];
+#if DEBUG
+__attribute__((naked))
+void PlaySlotMachine(u8 arg0, MainCallback cb)
+{
+ asm("\
+ push {lr}\n\
+ lsl r0, r0, #0x18\n\
+ lsr r0, r0, #0x18\n\
+ ldr r3, ._1\n\
+ mov r2, #0x0\n\
+ strb r2, [r3]\n\
+ bl sub_81019B0\n\
+ ldr r0, ._1 + 4\n\
+ bl SetMainCallback2\n\
+ pop {r0}\n\
+ bx r0\n\
+._2:\n\
+ .align 2, 0\n\
+._1:\n\
+ .word unk_debug_bss_1+0x1\n\
+ .word sub_81018B8+1");
+}
+#else
void PlaySlotMachine(u8 arg0, MainCallback cb)
{
PlaySlotMachine_Internal(arg0, cb);
SetMainCallback2(CB2_SlotMachineSetup);
}
+#endif
+
+#if DEBUG
+__attribute__((naked))
+void debug_sub_811609C()
+{
+ asm("\
+ push {lr}\n\
+ lsl r0, r0, #0x18\n\
+ lsr r0, r0, #0x18\n\
+ ldr r3, ._3\n\
+ mov r2, #0x1\n\
+ strb r2, [r3]\n\
+ bl sub_81019B0\n\
+ ldr r0, ._3 + 4\n\
+ bl SetMainCallback2\n\
+ pop {r0}\n\
+ bx r0\n\
+._4:\n\
+ .align 2, 0\n\
+._3:\n\
+ .word unk_debug_bss_1+0x1\n\
+ .word sub_81018B8+1");
+}
+#endif
static void CB2_SlotMachineSetup(void)
{
@@ -367,6 +418,135 @@ static void SlotMachineSetup_2_1(void)
static const s16 gUnknown_083ECCF8[][2];
+#if DEBUG
+__attribute__((naked))
+static void SlotMachineSetup_0_1(void)
+{
+ asm("\
+ push {r4, r5, r6, r7, lr}\n\
+ mov r7, sl\n\
+ mov r6, r9\n\
+ mov r5, r8\n\
+ push {r5, r6, r7}\n\
+ bl sub_81019EC\n\
+ ldr r5, ._43\n\
+ mov r4, #0x0\n\
+ strb r4, [r5]\n\
+ strb r4, [r5, #0x2]\n\
+ bl Random\n\
+ mov r1, #0x1\n\
+ and r1, r1, r0\n\
+ strb r1, [r5, #0x3]\n\
+ strb r4, [r5, #0x4]\n\
+ mov r0, #0x0\n\
+ strh r4, [r5, #0x8]\n\
+ strb r0, [r5, #0xa]\n\
+ strb r0, [r5, #0xb]\n\
+ ldr r0, ._43 + 4\n\
+ ldr r1, ._43 + 8\n\
+ add r0, r0, r1\n\
+ ldrh r0, [r0]\n\
+ strh r0, [r5, #0xc]\n\
+ strh r4, [r5, #0xe]\n\
+ strh r4, [r5, #0x10]\n\
+ strh r4, [r5, #0x12]\n\
+ strh r4, [r5, #0x18]\n\
+ mov r0, #0x8\n\
+ strh r0, [r5, #0x1a]\n\
+ add r1, r5, #0\n\
+ add r1, r1, #0x58\n\
+ mov r0, #0xf0\n\
+ strh r0, [r1]\n\
+ add r1, r1, #0x2\n\
+ mov r0, #0xa0\n\
+ strh r0, [r1]\n\
+ add r0, r5, #0\n\
+ add r0, r0, #0x5c\n\
+ mov r1, #0x3f\n\
+ strh r1, [r0]\n\
+ add r0, r0, #0x2\n\
+ strh r1, [r0]\n\
+ bl GetCurrentMapMusic\n\
+ add r1, r5, #0\n\
+ add r1, r1, #0x60\n\
+ strh r0, [r1]\n\
+ mov r7, #0x0\n\
+ add r6, r5, #0\n\
+ ldr r2, ._43 + 12\n\
+ mov sl, r2\n\
+ mov r0, #0x1c\n\
+ add r0, r0, r6\n\
+ mov r9, r0\n\
+._41:\n\
+ lsl r5, r7, #0x1\n\
+ mov r1, #0x22\n\
+ add r1, r1, r6\n\
+ mov r8, r1\n\
+ add r1, r5, r1\n\
+ mov r0, #0x0\n\
+ strh r0, [r1]\n\
+ add r4, r6, #0\n\
+ add r4, r4, #0x28\n\
+ add r4, r5, r4\n\
+ ldrb r0, [r6, #0x3]\n\
+ lsl r0, r0, #0x1\n\
+ lsl r1, r7, #0x2\n\
+ add r0, r0, r1\n\
+ add r0, r0, sl\n\
+ mov r2, #0x0\n\
+ ldsh r0, [r0, r2]\n\
+ mov r1, #0x15\n\
+ bl __modsi3\n\
+ strh r0, [r4]\n\
+ add r5, r5, r9\n\
+ mov r1, #0x0\n\
+ ldsh r0, [r4, r1]\n\
+ lsl r1, r0, #0x1\n\
+ add r1, r1, r0\n\
+ lsl r1, r1, #0x3\n\
+ mov r2, #0xfc\n\
+ lsl r2, r2, #0x1\n\
+ add r0, r2, #0\n\
+ sub r0, r0, r1\n\
+ strh r0, [r5]\n\
+ mov r1, #0x0\n\
+ ldsh r0, [r5, r1]\n\
+ add r1, r2, #0\n\
+ bl __modsi3\n\
+ strh r0, [r5]\n\
+ add r0, r7, #1\n\
+ lsl r0, r0, #0x18\n\
+ lsr r7, r0, #0x18\n\
+ cmp r7, #0x2\n\
+ bls ._41 @cond_branch\n\
+ bl debug_sub_811B5D0\n\
+ ldr r0, ._43 + 16\n\
+ ldrb r0, [r0]\n\
+ cmp r0, #0\n\
+ beq ._42 @cond_branch\n\
+ mov r1, r8\n\
+ sub r1, r1, #0x22\n\
+ mov r0, #0xfa\n\
+ lsl r0, r0, #0x2\n\
+ strh r0, [r1, #0xc]\n\
+._42:\n\
+ pop {r3, r4, r5}\n\
+ mov r8, r3\n\
+ mov r9, r4\n\
+ mov sl, r5\n\
+ pop {r4, r5, r6, r7}\n\
+ pop {r0}\n\
+ bx r0\n\
+._44:\n\
+ .align 2, 0\n\
+._43:\n\
+ .word +0x2000000\n\
+ .word gSaveBlock1\n\
+ .word 0x494\n\
+ .word gUnknown_083ECCF8\n\
+ .word unk_debug_bss_1+0x1");
+}
+#else
static void SlotMachineSetup_0_1(void)
{
u8 i;
@@ -398,6 +578,7 @@ static void SlotMachineSetup_0_1(void)
eSlotMachine->unk1C[i] %= 0x1f8;
}
}
+#endif
static void SlotMachineSetup_3_0(void)
{
@@ -442,7 +623,8 @@ static void sub_8101D04(void)
sub_8101D24(CreateTask(sub_8101D24, 0));
}
-static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = {
+static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) =
+{
sub_8101D5C,
sub_8101D8C,
sub_8101DB0,
@@ -471,7 +653,10 @@ static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = {
sub_81023E0,
sub_81023FC,
sub_8102424,
- sub_8102460
+ sub_8102460,
+#if DEBUG
+ debug_sub_8116E74,
+#endif
};
static void sub_8101D24(u8 taskId)
@@ -524,6 +709,46 @@ static bool8 sub_8101DF4(struct Task *task)
return FALSE;
}
+#if DEBUG
+__attribute__((naked))
+static bool8 sub_8101E10(struct Task *task)
+{
+ asm("\
+ push {lr}\n\
+ mov r0, #0x0\n\
+ bl sub_8104CAC\n\
+ ldr r2, ._70\n\
+ mov r0, #0x5\n\
+ strb r0, [r2]\n\
+ ldr r0, ._70 + 4\n\
+ ldrb r0, [r0]\n\
+ cmp r0, #0\n\
+ beq ._67 @cond_branch\n\
+ ldr r0, ._70 + 8\n\
+ ldrb r0, [r0]\n\
+ cmp r0, #0\n\
+ bne ._69 @cond_branch\n\
+._67:\n\
+ mov r0, #0xc\n\
+ ldsh r1, [r2, r0]\n\
+ ldr r0, ._70 + 12\n\
+ cmp r1, r0\n\
+ ble ._69 @cond_branch\n\
+ mov r0, #0x17\n\
+ strb r0, [r2]\n\
+._69:\n\
+ mov r0, #0x1\n\
+ pop {r1}\n\
+ bx r1\n\
+._71:\n\
+ .align 2, 0\n\
+._70:\n\
+ .word +0x2000000\n\
+ .word unk_debug_bss_1+0x1\n\
+ .word unk_debug_bss_1+0x4\n\
+ .word 0x270e");
+}
+#else
static bool8 sub_8101E10(struct Task *task)
{
sub_8104CAC(0);
@@ -534,7 +759,205 @@ static bool8 sub_8101E10(struct Task *task)
}
return TRUE;
}
+#endif
+#if DEBUG
+__attribute__((naked))
+static bool8 sub_8101E3C(struct Task *task)
+{
+ asm("\
+ push {r4, r5, lr}\n\
+ ldr r0, ._77\n\
+ ldrb r1, [r0]\n\
+ add r3, r0, #0\n\
+ ldr r5, ._77 + 4\n\
+ cmp r1, #0\n\
+ beq ._76 @cond_branch\n\
+ ldr r2, ._77 + 8\n\
+ ldrb r0, [r2]\n\
+ cmp r0, #0\n\
+ beq ._76 @cond_branch\n\
+ ldr r4, ._77 + 12\n\
+ mov r1, #0xc\n\
+ ldsh r0, [r4, r1]\n\
+ cmp r0, #0x3\n\
+ ble ._74 @cond_branch\n\
+ ldrh r1, [r5, #0x2c]\n\
+ mov r0, #0x2\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._75 @cond_branch\n\
+._74:\n\
+ mov r0, #0x0\n\
+ strb r0, [r2]\n\
+ b ._76\n\
+._78:\n\
+ .align 2, 0\n\
+._77:\n\
+ .word unk_debug_bss_1+0x1\n\
+ .word gMain\n\
+ .word unk_debug_bss_1+0x4\n\
+ .word +0x2000000\n\
+._75:\n\
+ mov r0, #0x0\n\
+ bl sub_8103D50\n\
+ mov r0, #0x1\n\
+ bl sub_8103D50\n\
+ mov r0, #0x2\n\
+ bl sub_8103D50\n\
+ ldrh r0, [r4, #0xc]\n\
+ sub r0, r0, #0x3\n\
+ strh r0, [r4, #0xc]\n\
+ mov r0, #0x3\n\
+ strh r0, [r4, #0x12]\n\
+ mov r0, #0x9\n\
+ strb r0, [r4]\n\
+ b ._102\n\
+._76:\n\
+ ldrb r0, [r3]\n\
+ cmp r0, #0\n\
+ beq ._81 @cond_branch\n\
+ ldrh r1, [r5, #0x2e]\n\
+ mov r0, #0x8\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._81 @cond_branch\n\
+ bl debug_sub_811B620\n\
+ ldr r1, ._83\n\
+ mov r0, #0x1d\n\
+ strb r0, [r1]\n\
+ b ._102\n\
+._84:\n\
+ .align 2, 0\n\
+._83:\n\
+ .word +0x2000000\n\
+._81:\n\
+ ldrh r1, [r5, #0x2e]\n\
+ mov r0, #0x4\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._85 @cond_branch\n\
+ mov r0, #0x0\n\
+ bl sub_8104AB8\n\
+ ldr r1, ._87\n\
+ mov r0, #0x8\n\
+ strb r0, [r1]\n\
+ b ._102\n\
+._88:\n\
+ .align 2, 0\n\
+._87:\n\
+ .word +0x2000000\n\
+._85:\n\
+ mov r0, #0x80\n\
+ lsl r0, r0, #0x1\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._89 @cond_branch\n\
+ ldr r2, ._94\n\
+ mov r3, #0xc\n\
+ ldsh r0, [r2, r3]\n\
+ sub r0, r0, #0x3\n\
+ mov r3, #0x12\n\
+ ldsh r1, [r2, r3]\n\
+ add r0, r0, r1\n\
+ cmp r0, #0\n\
+ blt ._90 @cond_branch\n\
+ ldrh r4, [r2, #0x12]\n\
+ add r0, r1, #0\n\
+ cmp r0, #0x2\n\
+ bgt ._91 @cond_branch\n\
+._92:\n\
+ lsl r0, r4, #0x18\n\
+ lsr r0, r0, #0x18\n\
+ bl sub_8103D50\n\
+ lsl r0, r4, #0x10\n\
+ mov r2, #0x80\n\
+ lsl r2, r2, #0x9\n\
+ add r0, r0, r2\n\
+ lsr r4, r0, #0x10\n\
+ asr r0, r0, #0x10\n\
+ cmp r0, #0x2\n\
+ ble ._92 @cond_branch\n\
+._91:\n\
+ ldr r1, ._94\n\
+ ldrh r0, [r1, #0xc]\n\
+ sub r0, r0, #0x3\n\
+ ldrh r3, [r1, #0x12]\n\
+ add r0, r0, r3\n\
+ strh r0, [r1, #0xc]\n\
+ mov r0, #0x3\n\
+ strh r0, [r1, #0x12]\n\
+ mov r0, #0x9\n\
+ strb r0, [r1]\n\
+ mov r0, #0x5f\n\
+ bl PlaySE\n\
+ b ._102\n\
+._95:\n\
+ .align 2, 0\n\
+._94:\n\
+ .word +0x2000000\n\
+._90:\n\
+ mov r0, #0x6\n\
+ b ._96\n\
+._89:\n\
+ mov r0, #0x80\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._98 @cond_branch\n\
+ ldr r4, ._103\n\
+ mov r1, #0xc\n\
+ ldsh r0, [r4, r1]\n\
+ cmp r0, #0\n\
+ beq ._98 @cond_branch\n\
+ mov r0, #0x5f\n\
+ bl PlaySE\n\
+ ldrb r0, [r4, #0x12]\n\
+ bl sub_8103D50\n\
+ ldrh r0, [r4, #0xc]\n\
+ sub r0, r0, #0x1\n\
+ strh r0, [r4, #0xc]\n\
+ ldrh r0, [r4, #0x12]\n\
+ add r0, r0, #0x1\n\
+ strh r0, [r4, #0x12]\n\
+._98:\n\
+ ldr r0, ._103\n\
+ mov r2, #0x12\n\
+ ldsh r1, [r0, r2]\n\
+ add r2, r0, #0\n\
+ ldr r5, ._103 + 4\n\
+ cmp r1, #0x2\n\
+ bgt ._99 @cond_branch\n\
+ cmp r1, #0\n\
+ beq ._101 @cond_branch\n\
+ ldrh r1, [r5, #0x2e]\n\
+ mov r0, #0x1\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._101 @cond_branch\n\
+._99:\n\
+ mov r0, #0x9\n\
+ strb r0, [r2]\n\
+._101:\n\
+ ldrh r1, [r5, #0x2e]\n\
+ mov r0, #0x2\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._102 @cond_branch\n\
+ mov r0, #0x15\n\
+._96:\n\
+ strb r0, [r2]\n\
+._102:\n\
+ mov r0, #0x0\n\
+ pop {r4, r5}\n\
+ pop {r1}\n\
+ bx r1\n\
+._104:\n\
+ .align 2, 0\n\
+._103:\n\
+ .word +0x2000000\n\
+ .word gMain");
+}
+#else
static bool8 sub_8101E3C(struct Task *task)
{
s16 i;
@@ -582,6 +1005,7 @@ static bool8 sub_8101E3C(struct Task *task)
}
return FALSE;
}
+#endif
static void sub_8101F2C(const u8 *str)
{
@@ -615,6 +1039,71 @@ static bool8 sub_8101F88(struct Task *task)
return FALSE;
}
+#if DEBUG
+__attribute__((naked))
+static bool8 sub_8101FA4(struct Task *task)
+{
+ asm("\
+ push {r4, lr}\n\
+ add r4, r0, #0\n\
+ bl sub_8102484\n\
+ bl sub_8104DA4\n\
+ mov r0, #0x0\n\
+ bl sub_8102DEC\n\
+ mov r0, #0x1\n\
+ bl sub_8102DEC\n\
+ mov r0, #0x2\n\
+ bl sub_8102DEC\n\
+ mov r0, #0x0\n\
+ strh r0, [r4, #0x8]\n\
+ ldr r4, ._115\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x20\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._113 @cond_branch\n\
+ bl sub_810430C\n\
+ mov r0, #0xa\n\
+ b ._114\n\
+._116:\n\
+ .align 2, 0\n\
+._115:\n\
+ .word +0x2000000\n\
+._113:\n\
+ mov r0, #0x1\n\
+ bl sub_8104CAC\n\
+ mov r0, #0xb\n\
+._114:\n\
+ strb r0, [r4]\n\
+ ldr r4, ._119\n\
+ mov r0, #0x8\n\
+ strh r0, [r4, #0x1a]\n\
+ ldrb r0, [r4, #0xa]\n\
+ cmp r0, #0\n\
+ beq ._117 @cond_branch\n\
+ bl dp15_jump_random_unknown\n\
+ strh r0, [r4, #0x1a]\n\
+._117:\n\
+ ldr r0, ._119 + 4\n\
+ ldrb r0, [r0]\n\
+ cmp r0, #0\n\
+ beq ._118 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x68\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._118:\n\
+ mov r0, #0x0\n\
+ pop {r4}\n\
+ pop {r1}\n\
+ bx r1\n\
+._120:\n\
+ .align 2, 0\n\
+._119:\n\
+ .word +0x2000000\n\
+ .word unk_debug_bss_1+0x1");
+}
+#else
static bool8 sub_8101FA4(struct Task *task)
{
sub_8102484();
@@ -640,6 +1129,7 @@ static bool8 sub_8101FA4(struct Task *task)
}
return FALSE;
}
+#endif
static bool8 sub_8102008(struct Task *task)
{
@@ -652,6 +1142,52 @@ static bool8 sub_8102008(struct Task *task)
return FALSE;
}
+#if DEBUG
+__attribute__((naked))
+static bool8 sub_8102034(struct Task *task)
+{
+ asm("\
+ push {r4, lr}\n\
+ ldrh r1, [r0, #0x8]\n\
+ add r1, r1, #0x1\n\
+ strh r1, [r0, #0x8]\n\
+ lsl r1, r1, #0x10\n\
+ asr r1, r1, #0x10\n\
+ cmp r1, #0x1d\n\
+ ble ._124 @cond_branch\n\
+ ldr r0, ._127\n\
+ ldrb r0, [r0]\n\
+ cmp r0, #0\n\
+ beq ._126 @cond_branch\n\
+ ldr r0, ._127 + 4\n\
+ ldrb r0, [r0]\n\
+ cmp r0, #0\n\
+ beq ._126 @cond_branch\n\
+ ldr r4, ._127 + 8\n\
+ bl Random\n\
+ mov r1, #0x1f\n\
+ and r1, r1, r0\n\
+ add r1, r1, #0x1\n\
+ str r1, [r4]\n\
+._126:\n\
+ bl sub_81024F0\n\
+ ldr r1, ._127 + 12\n\
+ mov r0, #0xc\n\
+ strb r0, [r1]\n\
+._124:\n\
+ mov r0, #0x0\n\
+ pop {r4}\n\
+ pop {r1}\n\
+ bx r1\n\
+._128:\n\
+ .align 2, 0\n\
+._127:\n\
+ .word unk_debug_bss_1+0x1\n\
+ .word unk_debug_bss_1+0x4\n\
+ .word unk_debug_bss_1+0x8\n\
+ .word +0x2000000");
+}
+#else
static bool8 sub_8102034(struct Task *task)
{
if (++task->data[0] >= 30)
@@ -661,7 +1197,77 @@ static bool8 sub_8102034(struct Task *task)
}
return FALSE;
}
+#endif
+#if DEBUG
+__attribute__((naked))
+static bool8 sub_8102058(struct Task *task)
+{
+ asm("\
+ push {r4, r5, lr}\n\
+ ldr r0, ._133\n\
+ ldrb r0, [r0]\n\
+ cmp r0, #0\n\
+ beq ._130 @cond_branch\n\
+ ldr r0, ._133 + 4\n\
+ ldrb r0, [r0]\n\
+ cmp r0, #0\n\
+ beq ._130 @cond_branch\n\
+ ldr r5, ._133 + 8\n\
+ ldr r0, [r5]\n\
+ sub r0, r0, #0x1\n\
+ str r0, [r5]\n\
+ cmp r0, #0\n\
+ bne ._135 @cond_branch\n\
+ mov r0, #0x18\n\
+ bl PlaySE\n\
+ ldr r4, ._133 + 12\n\
+ ldrb r0, [r4, #0x18]\n\
+ bl sub_8102E1C\n\
+ ldrb r0, [r4, #0x18]\n\
+ bl sub_8103C14\n\
+ bl Random\n\
+ mov r1, #0x1f\n\
+ and r1, r1, r0\n\
+ add r1, r1, #0x1\n\
+ str r1, [r5]\n\
+ b ._132\n\
+._134:\n\
+ .align 2, 0\n\
+._133:\n\
+ .word unk_debug_bss_1+0x1\n\
+ .word unk_debug_bss_1+0x4\n\
+ .word unk_debug_bss_1+0x8\n\
+ .word +0x2000000\n\
+._130:\n\
+ ldr r0, ._136\n\
+ ldrh r1, [r0, #0x2e]\n\
+ mov r0, #0x1\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._135 @cond_branch\n\
+ mov r0, #0x18\n\
+ bl PlaySE\n\
+ ldr r4, ._136 + 4\n\
+ ldrb r0, [r4, #0x18]\n\
+ bl sub_8102E1C\n\
+ ldrb r0, [r4, #0x18]\n\
+ bl sub_8103C14\n\
+._132:\n\
+ mov r0, #0xd\n\
+ strb r0, [r4]\n\
+._135:\n\
+ mov r0, #0x0\n\
+ pop {r4, r5}\n\
+ pop {r1}\n\
+ bx r1\n\
+._137:\n\
+ .align 2, 0\n\
+._136:\n\
+ .word gMain\n\
+ .word +0x2000000");
+}
+#else
static bool8 sub_8102058(struct Task *task)
{
if (gMain.newKeys & A_BUTTON)
@@ -673,7 +1279,121 @@ static bool8 sub_8102058(struct Task *task)
}
return FALSE;
}
+#endif
+#if DEBUG
+__attribute__((naked))
+static bool8 sub_8102090(struct Task *task)
+{
+ asm("\
+ push {r4, lr}\n\
+ ldr r4, ._146\n\
+ ldrb r0, [r4, #0x18]\n\
+ bl sub_8102E40\n\
+ lsl r0, r0, #0x18\n\
+ lsr r2, r0, #0x18\n\
+ cmp r2, #0\n\
+ bne ._138 @cond_branch\n\
+ ldrh r0, [r4, #0x18]\n\
+ add r0, r0, #0x1\n\
+ strh r0, [r4, #0x18]\n\
+ mov r1, #0xc\n\
+ strb r1, [r4]\n\
+ lsl r0, r0, #0x10\n\
+ asr r0, r0, #0x10\n\
+ cmp r0, #0x2\n\
+ ble ._161 @cond_branch\n\
+ mov r0, #0xe\n\
+ strb r0, [r4]\n\
+ ldr r0, ._146 + 4\n\
+ ldrb r0, [r0]\n\
+ cmp r0, #0x8\n\
+ beq ._140 @cond_branch\n\
+ cmp r0, #0x8\n\
+ bgt ._141 @cond_branch\n\
+ cmp r0, #0x2\n\
+ beq ._142 @cond_branch\n\
+ cmp r0, #0x2\n\
+ bgt ._143 @cond_branch\n\
+ cmp r0, #0x1\n\
+ beq ._144 @cond_branch\n\
+ b ._161\n\
+._147:\n\
+ .align 2, 0\n\
+._146:\n\
+ .word +0x2000000\n\
+ .word unk_debug_bss_1\n\
+._143:\n\
+ cmp r0, #0x4\n\
+ beq ._148 @cond_branch\n\
+ b ._161\n\
+._141:\n\
+ cmp r0, #0x40\n\
+ beq ._150 @cond_branch\n\
+ cmp r0, #0x40\n\
+ bgt ._151 @cond_branch\n\
+ cmp r0, #0x10\n\
+ beq ._152 @cond_branch\n\
+ b ._161\n\
+._151:\n\
+ cmp r0, #0x80\n\
+ beq ._154 @cond_branch\n\
+ b ._161\n\
+._142:\n\
+ mov r0, #0x14\n\
+ strh r0, [r4, #0x28]\n\
+ strh r0, [r4, #0x2a]\n\
+ mov r0, #0x12\n\
+ b ._160\n\
+._144:\n\
+ mov r0, #0x14\n\
+ strh r0, [r4, #0x28]\n\
+ strh r0, [r4, #0x2a]\n\
+ mov r0, #0x12\n\
+ b ._160\n\
+._148:\n\
+ mov r0, #0x3\n\
+ strh r0, [r4, #0x28]\n\
+ mov r0, #0x1\n\
+ strh r0, [r4, #0x2a]\n\
+ mov r0, #0x2\n\
+ b ._160\n\
+._140:\n\
+ strh r2, [r4, #0x28]\n\
+ mov r0, #0x2\n\
+ strh r0, [r4, #0x2a]\n\
+ mov r0, #0x3\n\
+ b ._160\n\
+._152:\n\
+ mov r0, #0x2\n\
+ strh r0, [r4, #0x28]\n\
+ mov r0, #0x5\n\
+ strh r0, [r4, #0x2a]\n\
+ mov r0, #0x14\n\
+ b ._160\n\
+._150:\n\
+ mov r0, #0x13\n\
+ strh r0, [r4, #0x28]\n\
+ strh r0, [r4, #0x2a]\n\
+ strh r2, [r4, #0x2c]\n\
+ b ._161\n\
+._154:\n\
+ mov r0, #0x13\n\
+ strh r0, [r4, #0x28]\n\
+ strh r0, [r4, #0x2a]\n\
+._160:\n\
+ strh r0, [r4, #0x2c]\n\
+._161:\n\
+ mov r0, #0x1\n\
+ b ._162\n\
+._138:\n\
+ mov r0, #0x0\n\
+._162:\n\
+ pop {r4}\n\
+ pop {r1}\n\
+ bx r1");
+}
+#else
static bool8 sub_8102090(struct Task *task)
{
if (!sub_8102E40(eSlotMachine->unk18))
@@ -688,7 +1408,168 @@ static bool8 sub_8102090(struct Task *task)
}
return FALSE;
}
+#endif
+#if DEBUG
+__attribute__((naked))
+static bool8 sub_81020C8(struct Task *task)
+{
+ asm("\
+ push {r4, lr}\n\
+ ldr r4, ._165\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0xc0\n\
+ and r0, r0, r1\n\
+ strb r0, [r4, #0x4]\n\
+ bl sub_81027A0\n\
+ ldrb r0, [r4, #0xa]\n\
+ cmp r0, #0\n\
+ beq ._163 @cond_branch\n\
+ sub r0, r0, #0x1\n\
+ strb r0, [r4, #0xa]\n\
+ ldrb r0, [r4, #0xb]\n\
+ add r0, r0, #0x1\n\
+ strb r0, [r4, #0xb]\n\
+ b ._164\n\
+._166:\n\
+ .align 2, 0\n\
+._165:\n\
+ .word +0x2000000\n\
+._163:\n\
+ bl debug_sub_811B894\n\
+._164:\n\
+ ldr r4, ._171\n\
+ ldrh r0, [r4, #0x8]\n\
+ cmp r0, #0\n\
+ beq ._167 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x6c\n\
+ mov r2, #0xe\n\
+ ldsh r1, [r4, r2]\n\
+ bl debug_sub_811B5B4\n\
+ mov r0, #0xf\n\
+ strb r0, [r4]\n\
+ bl sub_8102A24\n\
+ bl sub_8103F70\n\
+ ldrh r0, [r4, #0x10]\n\
+ ldrh r1, [r4, #0xe]\n\
+ sub r0, r0, r1\n\
+ strh r0, [r4, #0x10]\n\
+ lsl r0, r0, #0x10\n\
+ cmp r0, #0\n\
+ bge ._168 @cond_branch\n\
+ mov r0, #0x0\n\
+ strh r0, [r4, #0x10]\n\
+._168:\n\
+ ldrh r1, [r4, #0x8]\n\
+ mov r0, #0xc0\n\
+ lsl r0, r0, #0x1\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._169 @cond_branch\n\
+ ldr r0, ._171 + 4\n\
+ bl PlayFanfare\n\
+ mov r0, #0x6\n\
+ bl sub_8104CAC\n\
+ b ._174\n\
+._172:\n\
+ .align 2, 0\n\
+._171:\n\
+ .word +0x2000000\n\
+ .word 0x185\n\
+._169:\n\
+ mov r0, #0x40\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._173 @cond_branch\n\
+ ldr r0, ._175\n\
+ bl PlayFanfare\n\
+ mov r0, #0x5\n\
+ bl sub_8104CAC\n\
+ b ._174\n\
+._176:\n\
+ .align 2, 0\n\
+._175:\n\
+ .word 0x185\n\
+._173:\n\
+ mov r0, #0xc3\n\
+ lsl r0, r0, #0x1\n\
+ bl PlayFanfare\n\
+ mov r0, #0x2\n\
+ bl sub_8104CAC\n\
+._174:\n\
+ ldr r1, ._183\n\
+ ldrh r3, [r1, #0x8]\n\
+ mov r0, #0xe0\n\
+ lsl r0, r0, #0x1\n\
+ and r0, r0, r3\n\
+ add r2, r1, #0\n\
+ cmp r0, #0\n\
+ beq ._179 @cond_branch\n\
+ ldrb r1, [r2, #0x4]\n\
+ mov r0, #0x3f\n\
+ and r0, r0, r1\n\
+ mov r1, #0x0\n\
+ strb r0, [r2, #0x4]\n\
+ mov r0, #0xc0\n\
+ lsl r0, r0, #0x1\n\
+ and r0, r0, r3\n\
+ cmp r0, #0\n\
+ beq ._179 @cond_branch\n\
+ strb r1, [r2, #0xa]\n\
+ strb r1, [r2, #0xb]\n\
+ strb r1, [r2, #0x3]\n\
+ mov r0, #0x80\n\
+ lsl r0, r0, #0x1\n\
+ and r0, r0, r3\n\
+ cmp r0, #0\n\
+ beq ._179 @cond_branch\n\
+ mov r0, #0x1\n\
+ strb r0, [r2, #0x3]\n\
+._179:\n\
+ ldrh r1, [r2, #0x8]\n\
+ mov r0, #0x20\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._185 @cond_branch\n\
+ ldrb r0, [r2, #0x2]\n\
+ cmp r0, #0xf\n\
+ bhi ._185 @cond_branch\n\
+ add r0, r0, #0x1\n\
+ strb r0, [r2, #0x2]\n\
+ ldrb r0, [r2, #0x2]\n\
+ bl sub_8104064\n\
+ b ._185\n\
+._184:\n\
+ .align 2, 0\n\
+._183:\n\
+ .word +0x2000000\n\
+._167:\n\
+ mov r0, #0x3\n\
+ bl sub_8104CAC\n\
+ mov r0, #0x14\n\
+ strb r0, [r4]\n\
+ ldrh r0, [r4, #0x12]\n\
+ ldrh r1, [r4, #0x10]\n\
+ add r0, r0, r1\n\
+ strh r0, [r4, #0x10]\n\
+ lsl r0, r0, #0x10\n\
+ asr r0, r0, #0x10\n\
+ ldr r1, ._186\n\
+ cmp r0, r1\n\
+ ble ._185 @cond_branch\n\
+ strh r1, [r4, #0x10]\n\
+._185:\n\
+ mov r0, #0x0\n\
+ pop {r4}\n\
+ pop {r1}\n\
+ bx r1\n\
+._187:\n\
+ .align 2, 0\n\
+._186:\n\
+ .word 0x270f");
+}
+#else
static bool8 sub_81020C8(struct Task *task)
{
eSlotMachine->unk04 &= 0xc0;
@@ -753,6 +1634,7 @@ static bool8 sub_81020C8(struct Task *task)
}
return FALSE;
}
+#endif
static bool8 sub_81021E0(struct Task *task)
{
@@ -903,6 +1785,48 @@ static bool8 sub_81023FC(struct Task *task)
return FALSE;
}
+#if DEBUG
+__attribute__((naked))
+static bool8 sub_8102424(struct Task *task)
+{
+ asm("\
+ push {lr}\n\
+ add sp, sp, #0xfffffffc\n\
+ ldr r0, ._234\n\
+ ldrb r0, [r0]\n\
+ cmp r0, #0\n\
+ bne ._233 @cond_branch\n\
+ ldr r0, ._234 + 4\n\
+ ldr r1, ._234 + 8\n\
+ ldrh r1, [r1, #0xc]\n\
+ ldr r2, ._234 + 12\n\
+ add r0, r0, r2\n\
+ strh r1, [r0]\n\
+._233:\n\
+ mov r0, #0x1\n\
+ neg r0, r0\n\
+ mov r1, #0x0\n\
+ str r1, [sp]\n\
+ mov r2, #0x0\n\
+ mov r3, #0x10\n\
+ bl BeginNormalPaletteFade\n\
+ ldr r1, ._234 + 8\n\
+ ldrb r0, [r1]\n\
+ add r0, r0, #0x1\n\
+ strb r0, [r1]\n\
+ mov r0, #0x0\n\
+ add sp, sp, #0x4\n\
+ pop {r1}\n\
+ bx r1\n\
+._235:\n\
+ .align 2, 0\n\
+._234:\n\
+ .word unk_debug_bss_1+0x1\n\
+ .word gSaveBlock1\n\
+ .word +0x2000000\n\
+ .word 0x494");
+}
+#else
static bool8 sub_8102424(struct Task *task)
{
gSaveBlock1.coins = eSlotMachine->coins;
@@ -910,6 +1834,7 @@ static bool8 sub_8102424(struct Task *task)
eSlotMachine->state++;
return FALSE;
}
+#endif
static bool8 sub_8102460(struct Task *task)
{
@@ -920,6 +1845,272 @@ static bool8 sub_8102460(struct Task *task)
return FALSE;
}
+#if DEBUG
+__attribute__((naked))
+static bool8 debug_sub_8116E74(struct Task *task)
+{
+ asm("\
+ push {lr}\n\
+ bl debug_sub_811B634\n\
+ lsl r0, r0, #0x18\n\
+ cmp r0, #0\n\
+ beq ._239 @cond_branch\n\
+ ldr r1, ._240\n\
+ mov r0, #0x5\n\
+ strb r0, [r1]\n\
+._239:\n\
+ mov r0, #0x0\n\
+ pop {r1}\n\
+ bx r1\n\
+._241:\n\
+ .align 2, 0\n\
+._240:\n\
+ .word +0x2000000");
+}
+#endif
+
+#if DEBUG
+__attribute__((naked))
+static void sub_8102484(void)
+{
+ asm("\
+ push {r4, r5, r6, lr}\n\
+ ldr r0, ._256\n\
+ ldrb r2, [r0, #0xa]\n\
+ add r4, r0, #0\n\
+ cmp r2, #0\n\
+ beq ._242 @cond_branch\n\
+ b ._270\n\
+._242:\n\
+ ldr r0, ._256 + 4\n\
+ ldrb r0, [r0]\n\
+ cmp r0, #0\n\
+ beq ._245 @cond_branch\n\
+ ldr r3, ._256 + 8\n\
+ ldrb r0, [r3]\n\
+ cmp r0, #0\n\
+ beq ._245 @cond_branch\n\
+ ldr r0, ._256 + 12\n\
+ ldrb r1, [r0]\n\
+ strb r1, [r4, #0x4]\n\
+ strb r2, [r3]\n\
+ strb r2, [r0]\n\
+ mov r0, #0x80\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._246 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x88\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._246:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x40\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._247 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x84\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._247:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x20\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._248 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x8c\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._248:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x10\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._249 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x80\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._249:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x8\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._250 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x7c\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._250:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x4\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._251 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x78\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._251:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x1\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._252 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x74\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._252:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x2\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ bne ._253 @cond_branch\n\
+ b ._270\n\
+._253:\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x70\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+ b ._270\n\
+._257:\n\
+ .align 2, 0\n\
+._256:\n\
+ .word +0x2000000\n\
+ .word unk_debug_bss_1+0x1\n\
+ .word unk_debug_bss_1+0x2\n\
+ .word unk_debug_bss_1+0x3\n\
+._245:\n\
+ add r5, r4, #0\n\
+ ldrb r1, [r5, #0x4]\n\
+ mov r0, #0xc0\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ bne ._270 @cond_branch\n\
+ bl sub_8102540\n\
+ lsl r0, r0, #0x18\n\
+ cmp r0, #0\n\
+ beq ._260 @cond_branch\n\
+ bl sub_8102578\n\
+ lsl r0, r0, #0x18\n\
+ lsr r6, r0, #0x18\n\
+ cmp r6, #0x3\n\
+ beq ._260 @cond_branch\n\
+ ldr r1, ._271\n\
+ lsl r0, r6, #0x1\n\
+ add r0, r0, r1\n\
+ ldrb r1, [r0]\n\
+ ldrb r0, [r5, #0x4]\n\
+ orr r0, r0, r1\n\
+ strb r0, [r5, #0x4]\n\
+ mov r1, #0x80\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._261 @cond_branch\n\
+ add r0, r5, #0\n\
+ add r0, r0, #0x88\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._261:\n\
+ ldrb r1, [r5, #0x4]\n\
+ mov r0, #0x40\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._262 @cond_branch\n\
+ add r0, r5, #0\n\
+ add r0, r0, #0x84\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._262:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x20\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._263 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x8c\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._263:\n\
+ cmp r6, #0x1\n\
+ bne ._270 @cond_branch\n\
+._260:\n\
+ bl sub_81025BC\n\
+ lsl r0, r0, #0x18\n\
+ lsr r6, r0, #0x18\n\
+ cmp r6, #0x5\n\
+ beq ._270 @cond_branch\n\
+ ldr r4, ._271 + 4\n\
+ ldr r1, ._271 + 8\n\
+ lsl r0, r6, #0x1\n\
+ add r0, r0, r1\n\
+ ldrb r1, [r0]\n\
+ ldrb r0, [r4, #0x4]\n\
+ orr r0, r0, r1\n\
+ strb r0, [r4, #0x4]\n\
+ mov r1, #0x10\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._266 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x80\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._266:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x8\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._267 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x7c\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._267:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x4\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._268 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x78\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._268:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x1\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._269 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x74\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._269:\n\
+ ldrb r1, [r4, #0x4]\n\
+ mov r0, #0x2\n\
+ and r0, r0, r1\n\
+ cmp r0, #0\n\
+ beq ._270 @cond_branch\n\
+ add r0, r4, #0\n\
+ add r0, r0, #0x70\n\
+ mov r1, #0x1\n\
+ bl debug_sub_811B5B4\n\
+._270:\n\
+ pop {r4, r5, r6}\n\
+ pop {r0}\n\
+ bx r0\n\
+._272:\n\
+ .align 2, 0\n\
+._271:\n\
+ .word gUnknown_083ECE42\n\
+ .word +0x2000000\n\
+ .word gUnknown_083ECE48");
+}
+#else
static void sub_8102484(void)
{
u8 r3;
@@ -945,6 +2136,7 @@ static void sub_8102484(void)
}
}
}
+#endif
static void sub_81024F0(void)
{
@@ -3993,12 +5185,12 @@ __attribute__((naked))
void debug_sub_811B1C4()
{
asm(
- " ldr r1, ._1\n"
+ " ldr r1, .__1_\n"
" ldrb r0, [r1]\n"
" mov r3, #0x2\n"
" orr r0, r0, r3\n"
" strb r0, [r1]\n"
- " ldr r2, ._1 + 4\n"
+ " ldr r2, .__1_ + 4\n"
" ldrb r1, [r2]\n"
" mov r0, #0x2\n"
" eor r1, r1, r0\n"
@@ -4008,9 +5200,9 @@ void debug_sub_811B1C4()
" and r0, r0, r3\n"
" strb r0, [r2]\n"
" bx lr\n"
- "._2:\n"
+ ".__2_:\n"
" .align 2, 0\n"
- "._1:\n"
+ ".__1_:\n"
" .word unk_debug_bss_1+0x3\n"
" .word unk_debug_bss_1\n"
"\n"
@@ -4021,12 +5213,12 @@ __attribute__((naked))
void debug_sub_811B1EC()
{
asm(
- " ldr r2, ._3\n"
+ " ldr r2, .__3\n"
" ldrb r0, [r2]\n"
" mov r1, #0x1\n"
" orr r0, r0, r1\n"
" strb r0, [r2]\n"
- " ldr r2, ._3 + 4\n"
+ " ldr r2, .__3 + 4\n"
" ldrb r0, [r2]\n"
" mov r1, #0x1\n"
" eor r0, r0, r1\n"
@@ -4034,9 +5226,9 @@ void debug_sub_811B1EC()
" lsr r0, r0, #0x1f\n"
" strb r0, [r2]\n"
" bx lr\n"
- "._4:\n"
+ ".__4:\n"
" .align 2, 0\n"
- "._3:\n"
+ ".__3:\n"
" .word unk_debug_bss_1+0x3\n"
" .word unk_debug_bss_1\n"
"\n"
@@ -4047,12 +5239,12 @@ __attribute__((naked))
void debug_sub_811B210()
{
asm(
- " ldr r1, ._5\n"
+ " ldr r1, .__5\n"
" ldrb r0, [r1]\n"
" mov r3, #0x4\n"
" orr r0, r0, r3\n"
" strb r0, [r1]\n"
- " ldr r2, ._5 + 4\n"
+ " ldr r2, .__5 + 4\n"
" ldrb r1, [r2]\n"
" mov r0, #0x4\n"
" eor r1, r1, r0\n"
@@ -4062,9 +5254,9 @@ void debug_sub_811B210()
" and r0, r0, r3\n"
" strb r0, [r2]\n"
" bx lr\n"
- "._6:\n"
+ ".__6:\n"
" .align 2, 0\n"
- "._5:\n"
+ ".__5:\n"
" .word unk_debug_bss_1+0x3\n"
" .word unk_debug_bss_1\n"
"\n"
@@ -4075,12 +5267,12 @@ __attribute__((naked))
void debug_sub_811B238()
{
asm(
- " ldr r1, ._7\n"
+ " ldr r1, .__7\n"
" ldrb r0, [r1]\n"
" mov r3, #0x8\n"
" orr r0, r0, r3\n"
" strb r0, [r1]\n"
- " ldr r2, ._7 + 4\n"
+ " ldr r2, .__7 + 4\n"
" ldrb r1, [r2]\n"
" mov r0, #0x8\n"
" eor r1, r1, r0\n"
@@ -4090,9 +5282,9 @@ void debug_sub_811B238()
" and r0, r0, r3\n"
" strb r0, [r2]\n"
" bx lr\n"
- "._8:\n"
+ ".__8:\n"
" .align 2, 0\n"
- "._7:\n"
+ ".__7:\n"
" .word unk_debug_bss_1+0x3\n"
" .word unk_debug_bss_1\n"
"\n"
@@ -4103,12 +5295,12 @@ __attribute__((naked))
void debug_sub_811B260()
{
asm(
- " ldr r1, ._9\n"
+ " ldr r1, .__9\n"
" ldrb r0, [r1]\n"
" mov r3, #0x10\n"
" orr r0, r0, r3\n"
" strb r0, [r1]\n"
- " ldr r2, ._9 + 4\n"
+ " ldr r2, .__9 + 4\n"
" ldrb r1, [r2]\n"
" mov r0, #0x10\n"
" eor r1, r1, r0\n"
@@ -4118,9 +5310,9 @@ void debug_sub_811B260()
" and r0, r0, r3\n"
" strb r0, [r2]\n"
" bx lr\n"
- "._10:\n"
+ ".__10:\n"
" .align 2, 0\n"
- "._9:\n"
+ ".__9:\n"
" .word unk_debug_bss_1+0x3\n"
" .word unk_debug_bss_1\n"
"\n"
@@ -4131,12 +5323,12 @@ __attribute__((naked))
void debug_sub_811B288()
{
asm(
- " ldr r1, ._11\n"
+ " ldr r1, .__11\n"
" ldrb r0, [r1]\n"
" mov r3, #0x40\n"
" orr r0, r0, r3\n"
" strb r0, [r1]\n"
- " ldr r2, ._11 + 4\n"
+ " ldr r2, .__11 + 4\n"
" ldrb r1, [r2]\n"
" mov r0, #0x40\n"
" eor r1, r1, r0\n"
@@ -4146,9 +5338,9 @@ void debug_sub_811B288()
" and r0, r0, r3\n"
" strb r0, [r2]\n"
" bx lr\n"
- "._12:\n"
+ ".__12:\n"
" .align 2, 0\n"
- "._11:\n"
+ ".__11:\n"
" .word unk_debug_bss_1+0x3\n"
" .word unk_debug_bss_1\n"
"\n"
@@ -4159,12 +5351,12 @@ __attribute__((naked))
void debug_sub_811B2B0()
{
asm(
- " ldr r1, ._13\n"
+ " ldr r1, .__13\n"
" ldrb r0, [r1]\n"
" mov r3, #0x80\n"
" orr r0, r0, r3\n"
" strb r0, [r1]\n"
- " ldr r2, ._13 + 4\n"
+ " ldr r2, .__13 + 4\n"
" ldrb r1, [r2]\n"
" mov r0, #0x80\n"
" eor r1, r1, r0\n"
@@ -4174,9 +5366,9 @@ void debug_sub_811B2B0()
" and r0, r0, r3\n"
" strb r0, [r2]\n"
" bx lr\n"
- "._14:\n"
+ ".__14:\n"
" .align 2, 0\n"
- "._13:\n"
+ ".__13:\n"
" .word unk_debug_bss_1+0x3\n"
" .word unk_debug_bss_1\n"
"\n"
@@ -4187,15 +5379,15 @@ __attribute__((naked))
void debug_sub_811B2D8()
{
asm(
- " ldr r0, ._15\n"
+ " ldr r0, .__15\n"
" ldrb r1, [r0]\n"
" mov r2, #0x20\n"
" orr r1, r1, r2\n"
" strb r1, [r0]\n"
" bx lr\n"
- "._16:\n"
+ ".__16:\n"
" .align 2, 0\n"
- "._15:\n"
+ ".__15:\n"
" .word unk_debug_bss_1+0x3\n"
"\n"
);
@@ -4207,7 +5399,7 @@ void debug_sub_811B2E8()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffffc\n"
- " ldr r0, ._17\n"
+ " ldr r0, .__17\n"
" ldrb r1, [r0, #0x1]\n"
" add r1, r1, #0x1\n"
" mov r0, sp\n"
@@ -4221,9 +5413,9 @@ void debug_sub_811B2E8()
" add sp, sp, #0x4\n"
" pop {r0}\n"
" bx r0\n"
- "._18:\n"
+ ".__18:\n"
" .align 2, 0\n"
- "._17:\n"
+ ".__17:\n"
" .word +0x2000000\n"
"\n"
);
@@ -4235,90 +5427,90 @@ void debug_sub_811B310()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " ldr r0, ._21\n"
+ " ldr r0, .__21\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 4\n"
+ " ldr r0, .__21 + 4\n"
" mov r1, #0x1\n"
" mov r2, #0x3\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 8\n"
+ " ldr r0, .__21 + 8\n"
" mov r1, #0x1\n"
" mov r2, #0x5\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 12\n"
+ " ldr r0, .__21 + 12\n"
" mov r1, #0x1\n"
" mov r2, #0x7\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 16\n"
+ " ldr r0, .__21 + 16\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 20\n"
+ " ldr r0, .__21 + 20\n"
" mov r1, #0x1\n"
" mov r2, #0xb\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 24\n"
+ " ldr r0, .__21 + 24\n"
" mov r1, #0x1\n"
" mov r2, #0xd\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 28\n"
+ " ldr r0, .__21 + 28\n"
" mov r1, #0x1\n"
" mov r2, #0xf\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 32\n"
+ " ldr r0, .__21 + 32\n"
" mov r1, #0x1\n"
" mov r2, #0x11\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 36\n"
+ " ldr r0, .__21 + 36\n"
" mov r1, #0xf\n"
" mov r2, #0x1\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 40\n"
+ " ldr r0, .__21 + 40\n"
" mov r1, #0xf\n"
" mov r2, #0x3\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 44\n"
+ " ldr r0, .__21 + 44\n"
" mov r1, #0xf\n"
" mov r2, #0x5\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 48\n"
+ " ldr r0, .__21 + 48\n"
" mov r1, #0xf\n"
" mov r2, #0x7\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 52\n"
+ " ldr r0, .__21 + 52\n"
" mov r1, #0xf\n"
" mov r2, #0x9\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 56\n"
+ " ldr r0, .__21 + 56\n"
" mov r1, #0xf\n"
" mov r2, #0xb\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 60\n"
+ " ldr r0, .__21 + 60\n"
" mov r1, #0xf\n"
" mov r2, #0xd\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 64\n"
+ " ldr r0, .__21 + 64\n"
" mov r1, #0xf\n"
" mov r2, #0xf\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 68\n"
+ " ldr r0, .__21 + 68\n"
" mov r1, #0xf\n"
" mov r2, #0x11\n"
" bl Menu_PrintText\n"
- " ldr r0, ._21 + 72\n"
+ " ldr r0, .__21 + 72\n"
" ldrb r0, [r0, #0x3]\n"
" cmp r0, #0\n"
- " bne ._19 @cond_branch\n"
- " ldr r0, ._21 + 76\n"
+ " bne .__19 @cond_branch\n"
+ " ldr r0, .__21 + 76\n"
" mov r1, #0xa\n"
" mov r2, #0x9\n"
" bl Menu_PrintText\n"
- " b ._20\n"
- "._22:\n"
+ " b .__20\n"
+ ".__22:\n"
" .align 2, 0\n"
- "._21:\n"
+ ".__21:\n"
" .word Str_841B1C4\n"
" .word Str_841B1CB\n"
" .word Str_841B1D4\n"
@@ -4339,13 +5531,13 @@ void debug_sub_811B310()
" .word Str_841B243\n"
" .word +0x2000000\n"
" .word Str_841B246\n"
- "._19:\n"
- " ldr r0, ._30\n"
+ ".__19:\n"
+ " ldr r0, .__30\n"
" mov r1, #0xa\n"
" mov r2, #0x9\n"
" bl Menu_PrintText\n"
- "._20:\n"
- " ldr r4, ._30 + 4\n"
+ ".__20:\n"
+ " ldr r4, .__30 + 4\n"
" ldr r1, [r4, #0x68]\n"
" mov r0, sp\n"
" mov r2, #0x2\n"
@@ -4454,77 +5646,77 @@ void debug_sub_811B310()
" mov r1, #0x14\n"
" mov r2, #0x11\n"
" bl Menu_PrintText\n"
- " ldr r1, ._30 + 8\n"
+ " ldr r1, .__30 + 8\n"
" ldrb r0, [r1]\n"
" cmp r0, #0\n"
- " beq ._23 @cond_branch\n"
+ " beq .__23 @cond_branch\n"
" mov r2, #0x0\n"
" cmp r0, #0x8\n"
- " beq ._24 @cond_branch\n"
+ " beq .__24 @cond_branch\n"
" cmp r0, #0x8\n"
- " bgt ._25 @cond_branch\n"
+ " bgt .__25 @cond_branch\n"
" cmp r0, #0x2\n"
- " beq ._26 @cond_branch\n"
+ " beq .__26 @cond_branch\n"
" cmp r0, #0x2\n"
- " bgt ._27 @cond_branch\n"
+ " bgt .__27 @cond_branch\n"
" cmp r0, #0x1\n"
- " beq ._28 @cond_branch\n"
- " b ._45\n"
- "._31:\n"
+ " beq .__28 @cond_branch\n"
+ " b .__45\n"
+ ".__31:\n"
" .align 2, 0\n"
- "._30:\n"
+ ".__30:\n"
" .word Str_841B249\n"
" .word +0x2000000\n"
" .word unk_debug_bss_1\n"
- "._27:\n"
+ ".__27:\n"
" cmp r0, #0x4\n"
- " beq ._32 @cond_branch\n"
- " b ._45\n"
- "._25:\n"
+ " beq .__32 @cond_branch\n"
+ " b .__45\n"
+ ".__25:\n"
" cmp r0, #0x40\n"
- " beq ._34 @cond_branch\n"
+ " beq .__34 @cond_branch\n"
" cmp r0, #0x40\n"
- " bgt ._35 @cond_branch\n"
+ " bgt .__35 @cond_branch\n"
" cmp r0, #0x10\n"
- " beq ._36 @cond_branch\n"
- " b ._45\n"
- "._35:\n"
+ " beq .__36 @cond_branch\n"
+ " b .__45\n"
+ ".__35:\n"
" cmp r0, #0x80\n"
- " beq ._38 @cond_branch\n"
- " b ._45\n"
- "._26:\n"
+ " beq .__38 @cond_branch\n"
+ " b .__45\n"
+ ".__26:\n"
" mov r2, #0x3\n"
- " b ._45\n"
- "._28:\n"
+ " b .__45\n"
+ ".__28:\n"
" mov r2, #0x5\n"
- " b ._45\n"
- "._32:\n"
+ " b .__45\n"
+ ".__32:\n"
" mov r2, #0x7\n"
- " b ._45\n"
- "._24:\n"
+ " b .__45\n"
+ ".__24:\n"
" mov r2, #0x9\n"
- " b ._45\n"
- "._36:\n"
+ " b .__45\n"
+ ".__36:\n"
" mov r2, #0xb\n"
- " b ._45\n"
- "._34:\n"
+ " b .__45\n"
+ ".__34:\n"
" mov r2, #0xd\n"
- " b ._45\n"
- "._38:\n"
+ " b .__45\n"
+ ".__38:\n"
" mov r2, #0xf\n"
- "._45:\n"
- " ldr r0, ._46\n"
+ ".__45:\n"
+ " ldr r0, .__46\n"
" mov r1, #0x17\n"
" bl Menu_PrintText\n"
- "._23:\n"
+ ".__23:\n"
" bl debug_sub_811B2E8\n"
" add sp, sp, #0x8\n"
" pop {r4}\n"
" pop {r0}\n"
" bx r0\n"
- "._47:\n"
+ ".__47:\n"
" .align 2, 0\n"
- "._46:\n"
+ ".__46:\n"
" .word Str_841B26D\n"
"\n"
);
@@ -4539,16 +5731,16 @@ void debug_sub_811B5B4()
" ldr r0, [r2]\n"
" add r0, r0, r1\n"
" str r0, [r2]\n"
- " ldr r1, ._49\n"
+ " ldr r1, .__49\n"
" cmp r0, r1\n"
- " ble ._48 @cond_branch\n"
+ " ble .__48 @cond_branch\n"
" str r1, [r2]\n"
- "._48:\n"
+ ".__48:\n"
" pop {r0}\n"
" bx r0\n"
- "._50:\n"
+ ".__50:\n"
" .align 2, 0\n"
- "._49:\n"
+ ".__49:\n"
" .word 0x270f\n"
"\n"
);
@@ -4558,16 +5750,16 @@ __attribute__((naked))
void debug_sub_811B5D0()
{
asm(
- " ldr r0, ._51\n"
+ " ldr r0, .__51\n"
" mov r1, #0x0\n"
" strb r1, [r0]\n"
- " ldr r0, ._51 + 4\n"
+ " ldr r0, .__51 + 4\n"
" strb r1, [r0]\n"
- " ldr r0, ._51 + 8\n"
+ " ldr r0, .__51 + 8\n"
" strb r1, [r0]\n"
- " ldr r0, ._51 + 12\n"
+ " ldr r0, .__51 + 12\n"
" strb r1, [r0]\n"
- " ldr r2, ._51 + 16\n"
+ " ldr r2, .__51 + 16\n"
" mov r0, #0x0\n"
" str r0, [r2, #0x68]\n"
" str r0, [r2, #0x6c]\n"
@@ -4587,9 +5779,9 @@ void debug_sub_811B5D0()
" add r1, r1, #0x4\n"
" str r0, [r1]\n"
" bx lr\n"
- "._52:\n"
+ ".__52:\n"
" .align 2, 0\n"
- "._51:\n"
+ ".__51:\n"
" .word unk_debug_bss_1\n"
" .word unk_debug_bss_1+0x2\n"
" .word unk_debug_bss_1+0x3\n"
@@ -4604,14 +5796,14 @@ void debug_sub_811B620()
{
asm(
" push {lr}\n"
- " ldr r0, ._53\n"
+ " ldr r0, .__53\n"
" mov r1, #0x0\n"
" bl CreateTask\n"
" pop {r0}\n"
" bx r0\n"
- "._54:\n"
+ ".__54:\n"
" .align 2, 0\n"
- "._53:\n"
+ ".__53:\n"
" .word debug_sub_811B654+1\n"
"\n"
);
@@ -4622,21 +5814,21 @@ void debug_sub_811B634()
{
asm(
" push {lr}\n"
- " ldr r0, ._57\n"
+ " ldr r0, .__57\n"
" bl FindTaskIdByFunc\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" cmp r0, #0xff\n"
- " beq ._55 @cond_branch\n"
+ " beq .__55 @cond_branch\n"
" mov r0, #0x0\n"
- " b ._56\n"
- "._58:\n"
+ " b .__56\n"
+ ".__58:\n"
" .align 2, 0\n"
- "._57:\n"
+ ".__57:\n"
" .word debug_sub_811B654+1\n"
- "._55:\n"
+ ".__55:\n"
" mov r0, #0x1\n"
- "._56:\n"
+ ".__56:\n"
" pop {r1}\n"
" bx r1\n"
"\n"
@@ -4654,32 +5846,32 @@ void debug_sub_811B654()
" lsl r0, r6, #0x2\n"
" add r0, r0, r6\n"
" lsl r0, r0, #0x3\n"
- " ldr r1, ._63\n"
+ " ldr r1, .__63\n"
" add r5, r0, r1\n"
" mov r0, #0x8\n"
" ldsh r1, [r5, r0]\n"
" cmp r1, #0x1\n"
- " beq ._59 @cond_branch\n"
+ " beq .__59 @cond_branch\n"
" cmp r1, #0x1\n"
- " bgt ._60 @cond_branch\n"
+ " bgt .__60 @cond_branch\n"
" cmp r1, #0\n"
- " beq ._61 @cond_branch\n"
- " b ._116\n"
- "._64:\n"
+ " beq .__61 @cond_branch\n"
+ " b .__116\n"
+ ".__64:\n"
" .align 2, 0\n"
- "._63:\n"
+ ".__63:\n"
" .word gTasks\n"
- "._60:\n"
+ ".__60:\n"
" cmp r1, #0x2\n"
- " bne ._65 @cond_branch\n"
- " b ._66\n"
- "._65:\n"
+ " bne .__65 @cond_branch\n"
+ " b .__66\n"
+ ".__65:\n"
" cmp r1, #0x3\n"
- " bne ._67 @cond_branch\n"
- " b ._68\n"
- "._67:\n"
- " b ._116\n"
- "._61:\n"
+ " bne .__67 @cond_branch\n"
+ " b .__68\n"
+ ".__67:\n"
+ " b .__116\n"
+ ".__61:\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x18\n"
@@ -4689,64 +5881,64 @@ void debug_sub_811B654()
" ldrh r0, [r5, #0x8]\n"
" add r0, r0, #0x1\n"
" strh r0, [r5, #0x8]\n"
- " b ._116\n"
- "._59:\n"
- " ldr r7, ._76\n"
+ " b .__116\n"
+ ".__59:\n"
+ " ldr r7, .__76\n"
" ldrh r2, [r7, #0x2e]\n"
" mov r0, #0x2\n"
" and r0, r0, r2\n"
" cmp r0, #0\n"
- " beq ._71 @cond_branch\n"
- " b ._94\n"
- "._71:\n"
+ " beq .__71 @cond_branch\n"
+ " b .__94\n"
+ ".__71:\n"
" mov r0, #0x20\n"
" and r0, r0, r2\n"
" lsl r0, r0, #0x10\n"
" lsr r3, r0, #0x10\n"
" cmp r3, #0\n"
- " beq ._73 @cond_branch\n"
- " ldr r1, ._76 + 4\n"
+ " beq .__73 @cond_branch\n"
+ " ldr r1, .__76 + 4\n"
" ldrb r0, [r1, #0x1]\n"
" sub r0, r0, #0x1\n"
" strb r0, [r1, #0x1]\n"
" lsl r0, r0, #0x18\n"
" cmp r0, #0\n"
- " bge ._79 @cond_branch\n"
+ " bge .__79 @cond_branch\n"
" mov r0, #0x5\n"
" strb r0, [r1, #0x1]\n"
- " b ._79\n"
- "._77:\n"
+ " b .__79\n"
+ ".__77:\n"
" .align 2, 0\n"
- "._76:\n"
+ ".__76:\n"
" .word gMain\n"
" .word +0x2000000\n"
- "._73:\n"
+ ".__73:\n"
" mov r0, #0x10\n"
" and r0, r0, r2\n"
" cmp r0, #0\n"
- " beq ._78 @cond_branch\n"
- " ldr r1, ._81\n"
+ " beq .__78 @cond_branch\n"
+ " ldr r1, .__81\n"
" ldrb r0, [r1, #0x1]\n"
" add r0, r0, #0x1\n"
" strb r0, [r1, #0x1]\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" cmp r0, #0x5\n"
- " bls ._79 @cond_branch\n"
+ " bls .__79 @cond_branch\n"
" strb r3, [r1, #0x1]\n"
- "._79:\n"
+ ".__79:\n"
" bl debug_sub_811B2E8\n"
- " b ._116\n"
- "._82:\n"
+ " b .__116\n"
+ ".__82:\n"
" .align 2, 0\n"
- "._81:\n"
+ ".__81:\n"
" .word +0x2000000\n"
- "._78:\n"
+ ".__78:\n"
" and r1, r1, r2\n"
" lsl r0, r1, #0x10\n"
" lsr r4, r0, #0x10\n"
" cmp r4, #0\n"
- " beq ._83 @cond_branch\n"
+ " beq .__83 @cond_branch\n"
" mov r0, #0x3\n"
" strh r0, [r5, #0x8]\n"
" bl Menu_EraseScreen\n"
@@ -4755,28 +5947,28 @@ void debug_sub_811B654()
" mov r2, #0x9\n"
" mov r3, #0x5\n"
" bl Menu_DrawStdWindowFrame\n"
- " ldr r0, ._85\n"
+ " ldr r0, .__85\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
" bl Menu_PrintText\n"
- " ldr r0, ._85 + 4\n"
+ " ldr r0, .__85 + 4\n"
" mov r1, #0x1\n"
" mov r2, #0x3\n"
" bl Menu_PrintText\n"
- " b ._116\n"
- "._86:\n"
+ " b .__116\n"
+ ".__86:\n"
" .align 2, 0\n"
- "._85:\n"
+ ".__85:\n"
" .word Str_841B25C\n"
" .word Str_841B264\n"
- "._83:\n"
+ ".__83:\n"
" mov r0, #0x4\n"
" and r0, r0, r2\n"
" cmp r0, #0\n"
- " beq ._87 @cond_branch\n"
- " ldr r0, ._91\n"
+ " beq .__87 @cond_branch\n"
+ " ldr r0, .__91\n"
" strb r4, [r0]\n"
- " ldr r0, ._91 + 4\n"
+ " ldr r0, .__91 + 4\n"
" strb r4, [r0]\n"
" bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
@@ -4784,11 +5976,11 @@ void debug_sub_811B654()
" mov r2, #0xa\n"
" mov r3, #0x13\n"
" bl Menu_DrawStdWindowFrame\n"
- " ldr r0, ._91 + 8\n"
+ " ldr r0, .__91 + 8\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
" bl Menu_PrintText\n"
- " ldr r3, ._91 + 12\n"
+ " ldr r3, .__91 + 12\n"
" mov r0, #0x2\n"
" mov r1, #0x3\n"
" mov r2, #0x8\n"
@@ -4804,144 +5996,144 @@ void debug_sub_811B654()
" ldrh r0, [r5, #0x8]\n"
" add r0, r0, #0x1\n"
" strh r0, [r5, #0x8]\n"
- "._87:\n"
+ ".__87:\n"
" ldrh r1, [r7, #0x2e]\n"
" mov r0, #0x8\n"
" and r0, r0, r1\n"
" cmp r0, #0\n"
- " bne ._88 @cond_branch\n"
- " b ._116\n"
- "._88:\n"
- " ldr r1, ._91 + 16\n"
+ " bne .__88 @cond_branch\n"
+ " b .__116\n"
+ ".__88:\n"
+ " ldr r1, .__91 + 16\n"
" mov r0, #0x1\n"
" strb r0, [r1]\n"
- " b ._94\n"
- "._92:\n"
+ " b .__94\n"
+ ".__92:\n"
" .align 2, 0\n"
- "._91:\n"
+ ".__91:\n"
" .word unk_debug_bss_1+0x2\n"
" .word unk_debug_bss_1+0x3\n"
" .word Str_841B254\n"
" .word _841B270\n"
" .word unk_debug_bss_1+0x4\n"
- "._66:\n"
+ ".__66:\n"
" bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r2, r0, #0x18\n"
" mov r0, #0x2\n"
" neg r0, r0\n"
" cmp r2, r0\n"
- " beq ._116 @cond_branch\n"
+ " beq .__116 @cond_branch\n"
" add r0, r0, #0x1\n"
" cmp r2, r0\n"
- " beq ._94 @cond_branch\n"
- " ldr r1, ._96\n"
+ " beq .__94 @cond_branch\n"
+ " ldr r1, .__96\n"
" mov r0, #0x1\n"
" strb r0, [r1]\n"
- " ldr r0, ._96 + 4\n"
+ " ldr r0, .__96 + 4\n"
" lsl r1, r2, #0x3\n"
" add r0, r0, #0x4\n"
" add r1, r1, r0\n"
" ldr r0, [r1]\n"
" bl _call_via_r0\n"
- "._94:\n"
+ ".__94:\n"
" bl Menu_EraseScreen\n"
" add r0, r6, #0\n"
" bl DestroyTask\n"
- " b ._116\n"
- "._97:\n"
+ " b .__116\n"
+ ".__97:\n"
" .align 2, 0\n"
- "._96:\n"
+ ".__96:\n"
" .word unk_debug_bss_1+0x2\n"
" .word _841B270\n"
- "._68:\n"
- " ldr r2, ._100\n"
+ ".__68:\n"
+ " ldr r2, .__100\n"
" ldrh r1, [r2, #0x30]\n"
" mov r0, #0x80\n"
" and r0, r0, r1\n"
" cmp r0, #0\n"
- " beq ._98 @cond_branch\n"
- " ldr r2, ._100 + 4\n"
+ " beq .__98 @cond_branch\n"
+ " ldr r2, .__100 + 4\n"
" ldrh r0, [r2, #0xc]\n"
" add r0, r0, #0x64\n"
- " b ._99\n"
- "._101:\n"
+ " b .__99\n"
+ ".__101:\n"
" .align 2, 0\n"
- "._100:\n"
+ ".__100:\n"
" .word gMain\n"
" .word +0x2000000\n"
- "._98:\n"
+ ".__98:\n"
" mov r0, #0x40\n"
" and r0, r0, r1\n"
" cmp r0, #0\n"
- " beq ._102 @cond_branch\n"
- " ldr r1, ._104\n"
+ " beq .__102 @cond_branch\n"
+ " ldr r1, .__104\n"
" ldrh r0, [r1, #0xc]\n"
" sub r0, r0, #0x64\n"
- " b ._103\n"
- "._105:\n"
+ " b .__103\n"
+ ".__105:\n"
" .align 2, 0\n"
- "._104:\n"
+ ".__104:\n"
" .word +0x2000000\n"
- "._102:\n"
+ ".__102:\n"
" mov r0, #0x20\n"
" and r0, r0, r1\n"
" cmp r0, #0\n"
- " beq ._106 @cond_branch\n"
- " ldr r1, ._109\n"
- " ldr r2, ._109 + 4\n"
+ " beq .__106 @cond_branch\n"
+ " ldr r1, .__109\n"
+ " ldr r2, .__109 + 4\n"
" add r0, r2, #0\n"
" ldrh r2, [r1, #0xc]\n"
" add r0, r0, r2\n"
- "._103:\n"
+ ".__103:\n"
" strh r0, [r1, #0xc]\n"
" lsl r0, r0, #0x10\n"
" cmp r0, #0\n"
- " bgt ._116 @cond_branch\n"
- " ldr r0, ._109 + 8\n"
+ " bgt .__116 @cond_branch\n"
+ " ldr r0, .__109 + 8\n"
" strh r0, [r1, #0xc]\n"
- " b ._116\n"
- "._110:\n"
+ " b .__116\n"
+ ".__110:\n"
" .align 2, 0\n"
- "._109:\n"
+ ".__109:\n"
" .word +0x2000000\n"
" .word 0xfffffc18\n"
" .word 0x270f\n"
- "._106:\n"
+ ".__106:\n"
" mov r0, #0x10\n"
" and r0, r0, r1\n"
" cmp r0, #0\n"
- " beq ._111 @cond_branch\n"
- " ldr r2, ._114\n"
+ " beq .__111 @cond_branch\n"
+ " ldr r2, .__114\n"
" mov r1, #0xfa\n"
" lsl r1, r1, #0x2\n"
" add r0, r1, #0\n"
" ldrh r1, [r2, #0xc]\n"
" add r0, r0, r1\n"
- "._99:\n"
+ ".__99:\n"
" strh r0, [r2, #0xc]\n"
" lsl r0, r0, #0x10\n"
" asr r0, r0, #0x10\n"
- " ldr r1, ._114 + 4\n"
+ " ldr r1, .__114 + 4\n"
" cmp r0, r1\n"
- " ble ._116 @cond_branch\n"
+ " ble .__116 @cond_branch\n"
" strh r1, [r2, #0xc]\n"
- " b ._116\n"
- "._115:\n"
+ " b .__116\n"
+ ".__115:\n"
" .align 2, 0\n"
- "._114:\n"
+ ".__114:\n"
" .word +0x2000000\n"
" .word 0x270f\n"
- "._111:\n"
+ ".__111:\n"
" ldrh r1, [r2, #0x2e]\n"
" mov r0, #0x2\n"
" and r0, r0, r1\n"
" cmp r0, #0\n"
- " beq ._116 @cond_branch\n"
+ " beq .__116 @cond_branch\n"
" bl Menu_EraseScreen\n"
" add r0, r6, #0\n"
" bl DestroyTask\n"
- "._116:\n"
+ ".__116:\n"
" add sp, sp, #0x8\n"
" pop {r4, r5, r6, r7}\n"
" pop {r0}\n"
@@ -4960,232 +6152,232 @@ void debug_sub_811B894()
" mov r5, r8\n"
" push {r5, r6, r7}\n"
" add sp, sp, #0xfffffffc\n"
- " ldr r1, ._122\n"
+ " ldr r1, .__122\n"
" ldrh r2, [r1, #0x8]\n"
" mov r0, #0xc0\n"
" lsl r0, r0, #0x1\n"
" and r0, r0, r2\n"
" add r4, r1, #0\n"
" cmp r0, #0\n"
- " beq ._117 @cond_branch\n"
+ " beq .__117 @cond_branch\n"
" add r1, r1, #0x90\n"
" ldr r0, [r1]\n"
" add r0, r0, #0x1\n"
" str r0, [r1]\n"
- " ldr r2, ._122 + 4\n"
+ " ldr r2, .__122 + 4\n"
" cmp r0, r2\n"
- " ble ._118 @cond_branch\n"
+ " ble .__118 @cond_branch\n"
" str r2, [r1]\n"
- "._118:\n"
+ ".__118:\n"
" add r0, r4, #0\n"
" add r0, r0, #0x88\n"
" ldr r1, [r1]\n"
" ldr r0, [r0]\n"
" cmp r1, r0\n"
- " beq ._119 @cond_branch\n"
- " ldr r0, ._122 + 8\n"
+ " beq .__119 @cond_branch\n"
+ " ldr r0, .__122 + 8\n"
" mov r1, #0x4\n"
" mov r2, #0xf\n"
" bl Menu_PrintText\n"
- " ldr r1, ._122 + 12\n"
+ " ldr r1, .__122 + 12\n"
" mov r0, #0x0\n"
" strb r0, [r1]\n"
- "._119:\n"
+ ".__119:\n"
" ldrb r1, [r4, #0x4]\n"
" mov r0, #0x80\n"
" and r0, r0, r1\n"
" lsl r0, r0, #0x18\n"
" lsr r4, r0, #0x18\n"
" cmp r4, #0\n"
- " bne ._126 @cond_branch\n"
- " ldr r0, ._122 + 16\n"
+ " bne .__126 @cond_branch\n"
+ " ldr r0, .__122 + 16\n"
" mov r1, #0x4\n"
" mov r2, #0x11\n"
- " b ._121\n"
- "._123:\n"
+ " b .__121\n"
+ ".__123:\n"
" .align 2, 0\n"
- "._122:\n"
+ ".__122:\n"
" .word +0x2000000\n"
" .word 0x270f\n"
" .word Str_841B2B0\n"
" .word unk_debug_bss_1+0x4\n"
" .word Str_841B2D3\n"
- "._117:\n"
+ ".__117:\n"
" lsl r0, r2, #0x10\n"
" cmp r0, #0\n"
- " beq ._127 @cond_branch\n"
+ " beq .__127 @cond_branch\n"
" ldrb r1, [r4, #0x4]\n"
" mov r0, #0x80\n"
" and r0, r0, r1\n"
" cmp r0, #0\n"
- " beq ._126 @cond_branch\n"
+ " beq .__126 @cond_branch\n"
" mov r4, #0x3\n"
" and r4, r4, r2\n"
" cmp r4, #0\n"
- " bne ._126 @cond_branch\n"
- " ldr r0, ._163\n"
+ " bne .__126 @cond_branch\n"
+ " ldr r0, .__163\n"
" mov r1, #0x4\n"
" mov r2, #0x2\n"
- "._121:\n"
+ ".__121:\n"
" bl Menu_PrintText\n"
- " ldr r0, ._163 + 4\n"
+ " ldr r0, .__163 + 4\n"
" strb r4, [r0]\n"
- "._126:\n"
- " ldr r0, ._163 + 8\n"
+ ".__126:\n"
+ " ldr r0, .__163 + 8\n"
" ldrh r1, [r0, #0x8]\n"
" add r4, r0, #0\n"
" cmp r1, #0\n"
- " beq ._127 @cond_branch\n"
- " b ._162\n"
- "._127:\n"
+ " beq .__127 @cond_branch\n"
+ " b .__162\n"
+ ".__127:\n"
" mov r1, #0x12\n"
" ldsh r0, [r4, r1]\n"
" cmp r0, #0x3\n"
- " beq ._129 @cond_branch\n"
- " b ._162\n"
- "._129:\n"
+ " beq .__129 @cond_branch\n"
+ " b .__162\n"
+ ".__129:\n"
" ldrb r1, [r4, #0x4]\n"
" mov r0, #0x80\n"
" and r0, r0, r1\n"
" cmp r0, #0\n"
- " beq ._131 @cond_branch\n"
- " b ._162\n"
- "._131:\n"
+ " beq .__131 @cond_branch\n"
+ " b .__162\n"
+ ".__131:\n"
" mov r0, #0x0\n"
" mov r1, #0x1\n"
- " bl sub_8102BA4\n"
+ " bl GetTagOfReelSymbolOnScreenAtPos\n"
" lsl r0, r0, #0x18\n"
" lsr r7, r0, #0x18\n"
" mov r0, #0x0\n"
" mov r1, #0x2\n"
- " bl sub_8102BA4\n"
+ " bl GetTagOfReelSymbolOnScreenAtPos\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" str r0, [sp]\n"
" mov r0, #0x0\n"
" mov r1, #0x3\n"
- " bl sub_8102BA4\n"
+ " bl GetTagOfReelSymbolOnScreenAtPos\n"
" lsl r0, r0, #0x18\n"
" lsr r6, r0, #0x18\n"
" mov r0, #0x1\n"
" mov r1, #0x1\n"
- " bl sub_8102BA4\n"
+ " bl GetTagOfReelSymbolOnScreenAtPos\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" mov r9, r0\n"
" mov r0, #0x1\n"
" mov r1, #0x2\n"
- " bl sub_8102BA4\n"
+ " bl GetTagOfReelSymbolOnScreenAtPos\n"
" lsl r0, r0, #0x18\n"
" lsr r4, r0, #0x18\n"
" mov r0, #0x1\n"
" mov r1, #0x3\n"
- " bl sub_8102BA4\n"
+ " bl GetTagOfReelSymbolOnScreenAtPos\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" mov sl, r0\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
- " bl sub_8102BA4\n"
+ " bl GetTagOfReelSymbolOnScreenAtPos\n"
" lsl r0, r0, #0x18\n"
" lsr r5, r0, #0x18\n"
" mov r0, #0x2\n"
" mov r1, #0x2\n"
- " bl sub_8102BA4\n"
+ " bl GetTagOfReelSymbolOnScreenAtPos\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" mov r8, r0\n"
" mov r0, #0x2\n"
" mov r1, #0x3\n"
- " bl sub_8102BA4\n"
+ " bl GetTagOfReelSymbolOnScreenAtPos\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" cmp r7, #0\n"
- " bne ._134 @cond_branch\n"
+ " bne .__134 @cond_branch\n"
" mov r1, r9\n"
" cmp r1, #0x1\n"
- " bne ._134 @cond_branch\n"
+ " bne .__134 @cond_branch\n"
" cmp r5, #0\n"
- " beq ._159 @cond_branch\n"
- "._134:\n"
+ " beq .__159 @cond_branch\n"
+ ".__134:\n"
" ldr r1, [sp]\n"
" cmp r1, #0\n"
- " bne ._137 @cond_branch\n"
+ " bne .__137 @cond_branch\n"
" cmp r4, #0x1\n"
- " bne ._137 @cond_branch\n"
+ " bne .__137 @cond_branch\n"
" mov r1, r8\n"
" cmp r1, #0\n"
- " beq ._159 @cond_branch\n"
- "._137:\n"
+ " beq .__159 @cond_branch\n"
+ ".__137:\n"
" cmp r6, #0\n"
- " bne ._140 @cond_branch\n"
+ " bne .__140 @cond_branch\n"
" mov r1, sl\n"
" cmp r1, #0x1\n"
- " bne ._140 @cond_branch\n"
+ " bne .__140 @cond_branch\n"
" cmp r0, #0\n"
- " beq ._159 @cond_branch\n"
- "._140:\n"
+ " beq .__159 @cond_branch\n"
+ ".__140:\n"
" cmp r7, #0\n"
- " bne ._143 @cond_branch\n"
+ " bne .__143 @cond_branch\n"
" cmp r4, #0x1\n"
- " bne ._143 @cond_branch\n"
+ " bne .__143 @cond_branch\n"
" cmp r0, #0\n"
- " beq ._159 @cond_branch\n"
- "._143:\n"
+ " beq .__159 @cond_branch\n"
+ ".__143:\n"
" cmp r6, #0\n"
- " bne ._146 @cond_branch\n"
+ " bne .__146 @cond_branch\n"
" cmp r4, #0x1\n"
- " bne ._146 @cond_branch\n"
+ " bne .__146 @cond_branch\n"
" cmp r5, #0\n"
- " beq ._159 @cond_branch\n"
- "._146:\n"
+ " beq .__159 @cond_branch\n"
+ ".__146:\n"
" cmp r7, #0x1\n"
- " bne ._149 @cond_branch\n"
+ " bne .__149 @cond_branch\n"
" mov r1, r9\n"
" cmp r1, #0\n"
- " bne ._149 @cond_branch\n"
+ " bne .__149 @cond_branch\n"
" cmp r5, #0x1\n"
- " beq ._159 @cond_branch\n"
- "._149:\n"
+ " beq .__159 @cond_branch\n"
+ ".__149:\n"
" ldr r1, [sp]\n"
" cmp r1, #0x1\n"
- " bne ._152 @cond_branch\n"
+ " bne .__152 @cond_branch\n"
" cmp r4, #0\n"
- " bne ._152 @cond_branch\n"
+ " bne .__152 @cond_branch\n"
" mov r1, r8\n"
" cmp r1, #0x1\n"
- " beq ._159 @cond_branch\n"
- "._152:\n"
+ " beq .__159 @cond_branch\n"
+ ".__152:\n"
" cmp r6, #0x1\n"
- " bne ._155 @cond_branch\n"
+ " bne .__155 @cond_branch\n"
" mov r1, sl\n"
" cmp r1, #0\n"
- " bne ._155 @cond_branch\n"
+ " bne .__155 @cond_branch\n"
" cmp r0, #0x1\n"
- " beq ._159 @cond_branch\n"
- "._155:\n"
+ " beq .__159 @cond_branch\n"
+ ".__155:\n"
" cmp r7, #0x1\n"
- " bne ._158 @cond_branch\n"
+ " bne .__158 @cond_branch\n"
" cmp r4, #0\n"
- " bne ._158 @cond_branch\n"
+ " bne .__158 @cond_branch\n"
" cmp r0, #0x1\n"
- " beq ._159 @cond_branch\n"
- "._158:\n"
+ " beq .__159 @cond_branch\n"
+ ".__158:\n"
" cmp r6, #0x1\n"
- " bne ._162 @cond_branch\n"
+ " bne .__162 @cond_branch\n"
" cmp r4, #0\n"
- " bne ._162 @cond_branch\n"
+ " bne .__162 @cond_branch\n"
" cmp r5, #0x1\n"
- " bne ._162 @cond_branch\n"
- "._159:\n"
- " ldr r0, ._163 + 12\n"
+ " bne .__162 @cond_branch\n"
+ ".__159:\n"
+ " ldr r0, .__163 + 12\n"
" mov r1, #0x4\n"
" mov r2, #0x0\n"
" bl Menu_PrintText\n"
- " ldr r1, ._163 + 4\n"
+ " ldr r1, .__163 + 4\n"
" mov r0, #0x0\n"
" strb r0, [r1]\n"
- "._162:\n"
+ ".__162:\n"
" add sp, sp, #0x4\n"
" pop {r3, r4, r5}\n"
" mov r8, r3\n"
@@ -5194,9 +6386,9 @@ void debug_sub_811B894()
" pop {r4, r5, r6, r7}\n"
" pop {r0}\n"
" bx r0\n"
- "._164:\n"
+ ".__164:\n"
" .align 2, 0\n"
- "._163:\n"
+ ".__163:\n"
" .word Str_841B2E4\n"
" .word unk_debug_bss_1+0x4\n"
" .word +0x2000000\n"
@@ -6636,3 +7828,50 @@ static const struct SpritePalette gSlotMachineSpritePalettes[] = {
static const u8 sReelTimeGfx[] = INCBIN_U8("graphics/slot_machine/reel_time.4bpp.lz");
static const u16 sReelTimeWindowTilemap[] = INCBIN_U16("graphics/slot_machine/reel_time_window_map.bin");
+
+#if DEBUG
+
+const u8 Str_841B1C4[] = _("SETTEI");
+const u8 Str_841B1CB[] = _("MAWASITA");
+const u8 Str_841B1D4[] = _("MODOSI");
+const u8 Str_841B1DB[] = _("NOMARE");
+const u8 Str_841B1E2[] = _("MAE　7");
+const u8 Str_841B1E8[] = _("LR　　HENKOU");
+const u8 Str_841B1F3[] = _("START　　JIDOUSU");
+const u8 Str_841B202[] = _("SELECT　　SETTEI");
+const u8 Str_841B211[] = _("TYUHSEN");
+const u8 Str_841B219[] = _("CHERRY");
+const u8 Str_841B220[] = _("REPLAY");
+const u8 Str_841B227[] = _("HASUBO");
+const u8 Str_841B22E[] = _("RURIRI");
+const u8 Str_841B235[] = _("INAZU");
+const u8 Str_841B23B[] = _("REG");
+const u8 Str_841B23F[] = _("BIG");
+const u8 Str_841B243[] = _("BD");
+const u8 Str_841B246[] = _("R7");
+const u8 Str_841B249[] = _("B7");
+const u8 Str_841B24C[] = _("A　　COIN");
+const u8 Str_841B254[] = _("TYUHSEN");
+const u8 Str_841B25C[] = _("UD　　100");
+const u8 Str_841B264[] = _("LR　　1000");
+const u8 Str_841B26D[] = _("×");
+
+// Is this MenuAction2? I'm not sure.
+const struct {const u8 *text; void (*func)();} _841B270[] =
+{
+ {Str_841B219, debug_sub_811B1C4},
+ {Str_841B220, debug_sub_811B1EC},
+ {Str_841B227, debug_sub_811B210},
+ {Str_841B22E, debug_sub_811B238},
+ {Str_841B235, debug_sub_811B260},
+ {Str_841B23B, debug_sub_811B288},
+ {Str_841B23F, debug_sub_811B2B0},
+ {Str_841B243, debug_sub_811B2D8},
+};
+
+const u8 Str_841B2B0[] = _("·カウントエラーがおきました");
+const u8 Str_841B2BF[] = _("·リールそうさで　エラーが　おきました");
+const u8 Str_841B2D3[] = _("·フラグオフエラーが　おきました");
+const u8 Str_841B2E4[] = _("·ボーナスこやくの　エラーが　おきました");
+
+#endif
diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c
index c652b9398..ecff15c21 100644
--- a/src/pokemon/mail.c
+++ b/src/pokemon/mail.c
@@ -234,9 +234,84 @@ const struct MailLayout gUnknown_083E57A4[] =
{5, 15, 15, 4, 3, Unknown_3E5790},
};
+#if DEBUG
+
+const u8 Str_8411540[] = _("レイアウトを　にほんごで　ひょうじ？"); // Display using Japanese layout?
+const u8 Str_8411553[] = _("にほんご　"); // Japanese
+const u8 Str_8411559[] = _("かいがい　"); // Overseas
+
+const u8 *const _8411560[] =
+{
+ Str_8411553,
+ Str_8411559,
+};
+
+const u8 Str_8411568[] = _("イメージ　タイプを　えらんでね"); // Choose an image type
+const u8 Str_8411578[] = _("{STR_VAR_1}");
+const u8 Str_841157B[] = _("オレンジ　"); // Orange
+const u8 Str_8411581[] = _("ハーバー　"); // Harbor
+const u8 Str_8411587[] = _("キラキラ　"); // Glitter
+const u8 Str_841158D[] = _("メカニカル"); // Mech
+const u8 Str_8411593[] = _("ウッディー"); // Wood
+const u8 Str_8411599[] = _("クロス　　"); // Wave
+const u8 Str_841159F[] = _("トレジャー"); // Bead
+const u8 Str_84115A5[] = _("シャドウ　"); // Shadow
+const u8 Str_84115AB[] = _("トロピカル"); // Tropic
+const u8 Str_84115B1[] = _("ドリーム　"); // Dream
+const u8 Str_84115B7[] = _("ミラクル　"); // Fab
+const u8 Str_84115BD[] = _("レトロ　　"); // Retro
+
+const u8 *const _84115C4[] =
+{
+ Str_841157B,
+ Str_8411581,
+ Str_8411587,
+ Str_841158D,
+ Str_8411593,
+ Str_8411599,
+ Str_841159F,
+ Str_84115A5,
+ Str_84115AB,
+ Str_84115B1,
+ Str_84115B7,
+ Str_84115BD,
+};
+
+const u8 Str_84115F4[] = _("メールをみる"); // View Mail
+const u8 Str_84115FB[] = _("メールとうろく"); // Register Mail
+const u8 Str_8411603[] = _("もたせる"); // Give to Pokémon
+const u8 Str_8411608[] = _("メールをけす"); // Delete Mail
+
+#endif
+
// XXX: what is this?
static u8 *const sSharedMemPtr = gSharedMem;
+#if DEBUG
+
+const u8 Str_841160F[] = _("{STR_VAR_1}　{STR_VAR_2}");
+const u8 Str_841161A[] = _("メール{STR_VAR_1}　{STR_VAR_2}");
+const u8 Str_8411623[] = _("メール{STR_VAR_1}を　だれに　もたせる？");
+const u8 Str_8411634[] = _("000　{STR_VAR_1}");
+const u8 Str_841163B[] = _("せいきの　データが　とうろくずみ　です\n");
+const u8 Str_841163B_after[] = _("しんき　とうろく　できません");
+const u8 Str_841165E[] = _("せいきに　とうろくされたメールデータは\n");
+const u8 Str_841165E_after[] = _("へんこう　できません");
+const u8 Str_841167D[] = _("メール{STR_VAR_1}　とうろく　かいじょ");
+const u8 Str_841168D[] = _("デバッグメニューから　とうろくした\n");
+const u8 Str_841168D_after[] = _("メール　いがいは　けせません");
+const u8 Str_84116AE[] = _("メール{STR_VAR_1}　{STR_VAR_2}　{STR_VAR_3}");
+
+const struct MenuAction _84116BC[] =
+{
+ {Str_84115F4, NULL},
+ {Str_84115FB, NULL},
+ {Str_8411603, NULL},
+ {Str_8411608, NULL},
+};
+
+#endif
+
static u8 sub_80F8A28(void);
/*static*/ void sub_80F8D50(void);
static void sub_80F8DA0(void);
diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c
index fd4684832..63f1b322a 100644
--- a/src/pokemon/pokemon_1.c
+++ b/src/pokemon/pokemon_1.c
@@ -646,7 +646,7 @@ void debug_sub_803F55C()
" ldr r4, [sp]\n"
" mul r0, r0, r4\n"
" mov r1, #0x64\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" add r0, r0, r4\n"
" add r0, r0, #0xa\n"
" str r0, [sp, #0x4]\n"
@@ -673,7 +673,7 @@ void debug_sub_803F55C()
" ldr r1, [sp]\n"
" mul r0, r0, r1\n"
" mov r1, #0x64\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" add r0, r0, #0x5\n"
" str r0, [sp, #0x8]\n"
" add r0, r5, #0\n"
@@ -705,7 +705,7 @@ void debug_sub_803F55C()
" ldr r1, [sp]\n"
" mul r0, r0, r1\n"
" mov r1, #0x64\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" add r0, r0, #0x5\n"
" str r0, [sp, #0xc]\n"
" add r0, r5, #0\n"
@@ -737,7 +737,7 @@ void debug_sub_803F55C()
" ldr r1, [sp]\n"
" mul r0, r0, r1\n"
" mov r1, #0x64\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" add r0, r0, #0x5\n"
" str r0, [sp, #0x10]\n"
" add r0, r5, #0\n"
@@ -769,7 +769,7 @@ void debug_sub_803F55C()
" ldr r1, [sp]\n"
" mul r0, r0, r1\n"
" mov r1, #0x64\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" add r0, r0, #0x5\n"
" str r0, [sp, #0x14]\n"
" add r0, r5, #0\n"
@@ -801,7 +801,7 @@ void debug_sub_803F55C()
" ldr r1, [sp]\n"
" mul r0, r0, r1\n"
" mov r1, #0x64\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" add r0, r0, #0x5\n"
" str r0, [sp, #0x18]\n"
" add r0, r5, #0\n"
diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c
index 001cebe45..cd4c18252 100644
--- a/src/pokemon/pokemon_storage_system.c
+++ b/src/pokemon/pokemon_storage_system.c
@@ -13,7 +13,8 @@ extern const struct StorageAction gUnknown_083B6DF4[];
EWRAM_DATA struct PokemonStorage gPokemonStorage = {0};
-void sub_8098898(u8 index) {
+void sub_8098898(u8 index)
+{
u8 *ptr;
Menu_DrawStdWindowFrame(10, 16, 29, 19);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 07:10:21 +0000