diff options
-rw-r--r-- | asm/battle_1.s | 14 | ||||
-rw-r--r-- | asm/battle_9.s | 36 | ||||
-rw-r--r-- | asm/nakamura_debug_menu.s | 476 | ||||
-rw-r--r-- | asm/nohara_debug_menu.s | 340 | ||||
-rw-r--r-- | asm/pokemon_storage_system.s | 236 | ||||
-rw-r--r-- | asm/taya_debug_window.s | 252 | ||||
-rw-r--r-- | asm/tomomichi_debug_menu.s | 1160 | ||||
-rw-r--r-- | asm/unk_debug_menu_3.s | 104 | ||||
-rw-r--r-- | asm/watanabe_debug_menu.s | 1306 | ||||
-rw-r--r-- | src/roulette.c | 16 |
10 files changed, 1970 insertions, 1970 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index 8ed743677..cd925e10d 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -800,34 +800,34 @@ sub_800DAB8: .syntax divided push {r4, r5, lr} add sp, sp, #0xfffffffc - ldr r0, ._113 + ldr r0, ._113 @ gUnknown_08D00000 mov r1, #0xc0 lsl r1, r1, #0x13 bl LZDecompressVram - ldr r0, ._113 + 4 - ldr r4, ._113 + 8 + ldr r0, ._113 + 4 @ gUnknown_08D00524 + ldr r4, ._113 + 8 @ 0x600c000 mov r2, #0x80 lsl r2, r2, #0x4 add r1, r4, #0 bl CpuSet - ldr r0, ._113 + 12 + ldr r0, ._113 + 12 @ gUnknown_08D004E0 mov r1, #0x0 mov r2, #0x40 bl LoadCompressedPalette bl sub_800D74C bl DrawMainBattleBackground - ldr r0, ._113 + 16 + ldr r0, ._113 + 16 @ gBattleTypeFlags ldrh r1, [r0] mov r0, #0x2 and r0, r0, r1 cmp r0, #0 beq ._112 @cond_branch - ldr r0, ._113 + 20 + ldr r0, ._113 + 20 @ 0x6000600 mov r1, #0x0 add r2, r4, #0 mov r3, #0x1 bl debug_sub_8008218 - ldr r5, ._113 + 24 + ldr r5, ._113 + 24 @ 0x101 mov r4, #0x1 str r4, [sp] add r0, r5, #0 diff --git a/asm/battle_9.s b/asm/battle_9.s index 62e2baae6..3f162df12 100644 --- a/asm/battle_9.s +++ b/asm/battle_9.s @@ -1392,7 +1392,7 @@ _08036AFE: sub_8036B0C: .syntax divided push {r4, r5, r6, lr} - ldr r5, ._205 + ldr r5, ._205 @ gBattleTypeFlags ldrh r1, [r5] mov r0, #0x8 and r0, r0, r1 @@ -1406,13 +1406,13 @@ sub_8036B0C: bne ._199 @cond_branch b ._200 ._199: - ldr r4, ._205 + 4 - ldr r0, ._205 + 8 + ldr r4, ._205 + 4 @ 0x2000000 + ldr r0, ._205 + 8 @ gActiveBank ldrb r0, [r0] bl GetBankIdentity lsl r0, r0, #0x18 lsr r0, r0, #0x19 - ldr r1, ._205 + 12 + ldr r1, ._205 + 12 @ 0x160c8 add r0, r0, r1 add r0, r0, r4 ldrb r0, [r0] @@ -1438,7 +1438,7 @@ sub_8036B0C: .align 2, 0 ._205: .word gBattleTypeFlags - .word +0x2000000 + .word 0x2000000 .word gActiveBank .word 0x160c8 ._203: @@ -1455,13 +1455,13 @@ sub_8036B0C: ._212: mov r0, #0x64 mul r0, r0, r4 - ldr r1, ._214 + ldr r1, ._214 @ gEnemyParty add r0, r0, r1 mov r1, #0x39 bl GetMonData cmp r0, #0 beq ._210 @cond_branch - ldr r1, ._214 + 4 + ldr r1, ._214 + 4 @ gBattlePartyID lsl r0, r6, #0x1 add r0, r0, r1 ldrh r0, [r0] @@ -1472,8 +1472,8 @@ sub_8036B0C: ldrh r0, [r0] cmp r4, r0 beq ._210 @cond_branch - ldr r1, ._214 + 8 - ldr r2, ._214 + 12 + ldr r1, ._214 + 8 @ 0x2000000 + ldr r2, ._214 + 12 @ 0x16068 add r0, r6, r2 add r0, r0, r1 ldrb r0, [r0] @@ -1489,23 +1489,23 @@ sub_8036B0C: cmp r4, #0x5 ble ._212 @cond_branch ._211: - ldr r0, ._214 + 16 + ldr r0, ._214 + 16 @ gActiveBank ldrb r0, [r0] bl GetBankIdentity - ldr r1, ._214 + 8 + ldr r1, ._214 + 8 @ 0x2000000 lsl r0, r0, #0x18 lsr r0, r0, #0x19 - ldr r3, ._214 + 20 + ldr r3, ._214 + 20 @ 0x160c8 add r0, r0, r3 add r0, r0, r1 strb r4, [r0] ._201: - ldr r4, ._214 + 16 + ldr r4, ._214 + 16 @ gActiveBank ldrb r0, [r4] bl GetBankIdentity - ldr r2, ._214 + 8 + ldr r2, ._214 + 8 @ 0x2000000 ldrb r1, [r4] - ldr r3, ._214 + 12 + ldr r3, ._214 + 12 @ 0x16068 add r1, r1, r3 add r1, r1, r2 lsl r0, r0, #0x18 @@ -1521,12 +1521,12 @@ sub_8036B0C: ._214: .word gEnemyParty .word gBattlePartyID - .word +0x2000000 + .word 0x2000000 .word 0x16068 .word gActiveBank .word 0x160c8 ._200: - ldr r0, ._218 + ldr r0, ._218 @ gUnknown_02023A14 ldrb r1, [r0] mov r0, #0x20 and r0, r0, r1 @@ -1537,7 +1537,7 @@ sub_8036B0C: cmp r0, #0 bne ._217 @cond_branch ._216: - ldr r0, ._218 + 4 + ldr r0, ._218 + 4 @ gActiveBank ldrb r0, [r0] mov r2, #0x1 eor r2, r2, r0 diff --git a/asm/nakamura_debug_menu.s b/asm/nakamura_debug_menu.s index 2ef359b48..21092fe4b 100644 --- a/asm/nakamura_debug_menu.s +++ b/asm/nakamura_debug_menu.s @@ -15,7 +15,7 @@ debug_sub_815F1B8: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._1 + ldr r3, ._1 @ _843E3DC mov r0, #0x10 mov r1, #0x1 mov r2, #0x9 @@ -43,8 +43,8 @@ debug_sub_815F1B8: InitNakamuraDebugMenu: push {lr} bl debug_sub_815F1B8 - ldr r1, ._3 - ldr r0, ._3 + 4 + ldr r1, ._3 @ gMenuCallback + ldr r0, ._3 + 4 @ debug_sub_815F214 str r0, [r1] mov r0, #0x0 pop {r1} @@ -60,7 +60,7 @@ InitNakamuraDebugMenu: thumb_func_start debug_sub_815F214 debug_sub_815F214: push {r4, lr} - ldr r4, ._9 + ldr r4, ._9 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -83,7 +83,7 @@ debug_sub_815F214: and r0, r0, r1 cmp r0, #0 beq ._7 @cond_branch - ldr r4, ._9 + 4 + ldr r4, ._9 + 4 @ _843E3DC bl Menu_GetCursorPos lsl r0, r0, #0x18 lsr r0, r0, #0x15 @@ -122,7 +122,7 @@ debug_sub_815F284: push {r4, lr} lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r0, ._14 + ldr r0, ._14 @ gPaletteFade ldrb r1, [r0, #0x7] mov r0, #0x80 and r0, r0, r1 @@ -151,10 +151,10 @@ debug_sub_815F2B4: add sp, sp, #0xfffffffc bl CloseMenu bl Menu_EraseScreen - ldr r1, ._16 - ldr r0, ._16 + 4 + ldr r1, ._16 @ gMain + ldr r0, ._16 + 4 @ sub_805469C str r0, [r1, #0x8] - ldr r0, ._16 + 8 + ldr r0, ._16 + 8 @ debug_sub_815F284 mov r1, #0x0 bl CreateTask mov r0, #0x1 @@ -191,9 +191,9 @@ debug_sub_815F2F4: lsl r1, r7, #0x2 add r0, r1, r7 lsl r2, r0, #0x5 - ldr r3, ._24 + ldr r3, ._24 @ gSaveBlock1 add r0, r2, r3 - ldr r5, ._24 + 4 + ldr r5, ._24 + 4 @ 0x1a08 add r0, r0, r5 ldrb r0, [r0] mov r9, r1 @@ -204,10 +204,10 @@ debug_sub_815F2F4: b ._19 ._18: mov r5, #0x0 - ldr r6, ._24 + 8 + ldr r6, ._24 + 8 @ gSaveBlock2 add r4, r7, #0 sub r4, r4, #0x46 - ldr r3, ._24 + 12 + ldr r3, ._24 + 12 @ gSaveBlock1 ._21: add r1, r5, r2 add r1, r1, r3 @@ -240,15 +240,15 @@ debug_sub_815F2F4: ._23: add r0, r0, r3 strb r4, [r0] - ldr r1, ._35 - ldr r2, ._35 + 4 + ldr r1, ._35 @ gSaveBlock1 + ldr r2, ._35 + 4 @ 0x1a08 add r2, r2, r1 mov sl, r2 mov r3, r9 add r0, r3, r7 lsl r6, r0, #0x5 add r1, r6, r1 - ldr r5, ._35 + 4 + ldr r5, ._35 + 4 @ 0x1a08 add r5, r5, r1 mov r8, r5 ._30: @@ -259,7 +259,7 @@ debug_sub_815F2F4: bl __umodsi3 lsl r0, r0, #0x10 lsr r0, r0, #0xe - ldr r1, ._35 + 8 + ldr r1, ._35 + 8 @ _843E424 add r0, r0, r1 ldrb r0, [r0] mov r2, r8 @@ -271,9 +271,9 @@ debug_sub_815F2F4: ldrb r3, [r3] cmp r0, r3 beq ._28 @cond_branch - ldr r4, ._35 + ldr r4, ._35 @ gSaveBlock1 add r0, r6, r4 - ldr r2, ._35 + 4 + ldr r2, ._35 + 4 @ 0x1a08 add r3, r0, r2 ._29: add r0, r5, #1 @@ -297,12 +297,12 @@ debug_sub_815F2F4: mov r5, r9 add r4, r5, r7 lsl r4, r4, #0x5 - ldr r1, ._35 + ldr r1, ._35 @ gSaveBlock1 add r3, r4, r1 lsl r0, r0, #0x10 lsr r0, r0, #0x10 mov r1, #0x1 - ldr r2, ._35 + 12 + ldr r2, ._35 + 12 @ 0x1a09 add r3, r3, r2 and r0, r0, r1 lsl r0, r0, #0x4 @@ -314,7 +314,7 @@ debug_sub_815F2F4: orr r1, r1, r0 strb r1, [r3] mov r5, #0x0 - ldr r6, ._35 + 16 + ldr r6, ._35 + 16 @ gSaveBlock1 ._31: bl Random add r1, r5, r4 @@ -329,7 +329,7 @@ debug_sub_815F2F4: mov r1, r9 add r0, r1, r7 lsl r4, r0, #0x5 - ldr r3, ._35 + 20 + ldr r3, ._35 + 20 @ gSaveBlock1 mov r2, #0x0 add r6, r3, #0 add r6, r6, #0x10 @@ -381,18 +381,18 @@ debug_sub_815F470: add r6, r0, #0 add r7, r1, #0 mov ip, r2 - ldr r2, ._39 - ldr r0, ._39 + 4 + ldr r2, ._39 @ gSaveBlock1 + ldr r0, ._39 + 4 @ _nakamuraData0 ldrb r1, [r0] lsl r0, r1, #0x2 add r0, r0, r1 lsl r0, r0, #0x5 add r0, r0, r2 - ldr r1, ._39 + 8 + ldr r1, ._39 + 8 @ 0x1a08 add r0, r0, r1 ldrb r4, [r0] mov r2, #0x0 - ldr r3, ._39 + 12 + ldr r3, ._39 + 12 @ _843E424 add r5, r3, #0 ._41: lsl r1, r2, #0x2 @@ -443,8 +443,8 @@ debug_sub_815F4D8: mov r2, #0xa mov r3, #0xa bl Menu_BlankWindowRect - ldr r6, ._43 - ldr r7, ._43 + 4 + ldr r6, ._43 @ gStringVar1 + ldr r7, ._43 + 4 @ _nakamuraData0 ldrb r1, [r7] add r0, r6, #0 mov r2, #0x0 @@ -454,13 +454,13 @@ debug_sub_815F4D8: mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r2, ._43 + 8 + ldr r2, ._43 + 8 @ gSaveBlock1 ldrb r1, [r7] lsl r0, r1, #0x2 add r0, r0, r1 lsl r0, r0, #0x5 add r0, r0, r2 - ldr r1, ._43 + 12 + ldr r1, ._43 + 12 @ 0x1a08 add r0, r0, r1 ldrb r0, [r0] cmp r0, #0 @@ -480,7 +480,7 @@ debug_sub_815F4D8: mov r1, #0x1 mov r2, #0x3 bl Menu_PrintText - ldr r0, ._43 + 16 + ldr r0, ._43 + 16 @ Str_843E550 mov r1, #0x1 mov r2, #0x5 bl Menu_PrintText @@ -494,7 +494,7 @@ debug_sub_815F4D8: mov r1, #0x2 mov r2, #0x5 bl Menu_PrintText - ldr r0, ._43 + 20 + ldr r0, ._43 + 20 @ Str_843E552 mov r1, #0x1 mov r2, #0x7 bl Menu_PrintText @@ -507,7 +507,7 @@ debug_sub_815F4D8: mov r1, #0x3 mov r2, #0x7 bl Menu_PrintText - ldr r0, ._43 + 24 + ldr r0, ._43 + 24 @ Str_843E554 mov r1, #0x1 mov r2, #0x9 bl Menu_PrintText @@ -541,7 +541,7 @@ debug_sub_815F4D8: thumb_func_start debug_sub_815F5C4 debug_sub_815F5C4: push {lr} - ldr r0, ._48 + ldr r0, ._48 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x20 and r0, r0, r1 @@ -549,7 +549,7 @@ debug_sub_815F5C4: lsr r2, r0, #0x10 cmp r2, #0 beq ._45 @cond_branch - ldr r1, ._48 + 4 + ldr r1, ._48 + 4 @ _nakamuraData0 ldrb r0, [r1] cmp r0, #0 bne ._46 @cond_branch @@ -568,7 +568,7 @@ debug_sub_815F5C4: and r0, r0, r1 cmp r0, #0 beq ._51 @cond_branch - ldr r1, ._54 + ldr r1, ._54 @ _nakamuraData0 ldrb r0, [r1] cmp r0, #0x13 bne ._52 @cond_branch @@ -605,11 +605,11 @@ debug_sub_815F5C4: thumb_func_start debug_sub_815F62C debug_sub_815F62C: push {lr} - ldr r1, ._59 + ldr r1, ._59 @ _nakamuraData0 mov r0, #0x0 strb r0, [r1] - ldr r1, ._59 + 4 - ldr r0, ._59 + 8 + ldr r1, ._59 + 4 @ gMenuCallback + ldr r0, ._59 + 8 @ debug_sub_815F5C4 str r0, [r1] mov r0, #0x0 mov r1, #0x0 @@ -637,12 +637,12 @@ debug_sub_815F62C: thumb_func_start debug_sub_815F668 debug_sub_815F668: push {r4, r5, r6, lr} - ldr r0, ._61 + ldr r0, ._61 @ _nakamuraData0 ldrb r0, [r0] lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x5 - ldr r0, ._61 + 4 + ldr r0, ._61 + 4 @ gSaveBlock1 add r1, r1, r0 ldrb r4, [r1, #0x3] lsl r4, r4, #0x18 @@ -654,8 +654,8 @@ debug_sub_815F668: orr r4, r4, r0 ldrb r0, [r1] orr r4, r4, r0 - ldr r5, ._61 + 8 - ldr r6, ._61 + 12 + ldr r5, ._61 + 8 @ gStringVar1 + ldr r6, ._61 + 12 @ 0x186a0 add r0, r4, #0 add r1, r6, #0 bl __udivsi3 @@ -701,13 +701,13 @@ debug_sub_815F6E4: mov r2, #0xb mov r3, #0x4 bl Menu_BlankWindowRect - ldr r4, ._63 - ldr r0, ._63 + 4 + ldr r4, ._63 @ gStringVar1 + ldr r0, ._63 + 4 @ _nakamuraData0 ldrb r0, [r0] lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x5 - ldr r0, ._63 + 8 + ldr r0, ._63 + 8 @ gSaveBlock1 add r1, r1, r0 add r0, r4, #0 mov r2, #0x7 @@ -738,8 +738,8 @@ debug_sub_815F72C: mov r2, #0xb mov r3, #0xa bl Menu_BlankWindowRect - ldr r4, ._66 - ldr r5, ._66 + 4 + ldr r4, ._66 @ gStringVar1 + ldr r5, ._66 + 4 @ _nakamuraData0 ldrb r1, [r5] add r0, r4, #0 mov r2, #0x0 @@ -749,13 +749,13 @@ debug_sub_815F72C: mov r1, #0x2 mov r2, #0x1 bl Menu_PrintText - ldr r2, ._66 + 8 + ldr r2, ._66 + 8 @ gSaveBlock1 ldrb r1, [r5] lsl r0, r1, #0x2 add r0, r0, r1 lsl r0, r0, #0x5 add r0, r0, r2 - ldr r1, ._66 + 12 + ldr r1, ._66 + 12 @ 0x1a08 add r0, r0, r1 ldrb r0, [r0] cmp r0, #0 @@ -784,8 +784,8 @@ debug_sub_815F788: mov r2, #0xb mov r3, #0x6 bl Menu_BlankWindowRect - ldr r0, ._68 - ldr r1, ._68 + 4 + ldr r0, ._68 @ Str_843E574 + ldr r1, ._68 + 4 @ _nakamuraData2 ldrb r1, [r1] add r1, r1, #0x2 lsl r1, r1, #0x18 @@ -805,7 +805,7 @@ debug_sub_815F788: thumb_func_start debug_sub_815F7B4 debug_sub_815F7B4: push {lr} - ldr r0, ._72 + ldr r0, ._72 @ _nakamuraData1 ldrb r0, [r0] cmp r0, #0 beq ._70 @cond_branch @@ -820,10 +820,10 @@ debug_sub_815F7B4: ._72: .word _nakamuraData1 ._70: - ldr r0, ._74 + ldr r0, ._74 @ _nakamuraData3 ldrb r0, [r0] lsl r0, r0, #0x1 - ldr r1, ._74 + 4 + ldr r1, ._74 + 4 @ Str_843E576 add r0, r0, r1 mov r1, #0xb mov r2, #0x1 @@ -842,12 +842,12 @@ debug_sub_815F7B4: thumb_func_start debug_sub_815F7F0 debug_sub_815F7F0: push {r4, r5, lr} - ldr r1, ._78 + ldr r1, ._78 @ _nakamuraData0 ldrb r2, [r1] lsl r1, r2, #0x2 add r1, r1, r2 lsl r1, r1, #0x5 - ldr r2, ._78 + 4 + ldr r2, ._78 + 4 @ gSaveBlock1 add r3, r1, r2 ldrb r1, [r3, #0x3] lsl r2, r1, #0x18 @@ -862,7 +862,7 @@ debug_sub_815F7F0: lsl r0, r0, #0x18 asr r1, r0, #0x18 mov r4, #0x9 - ldr r0, ._78 + 8 + ldr r0, ._78 + 8 @ _nakamuraData2 ldrb r0, [r0] cmp r4, r0 ble ._76 @cond_branch @@ -911,12 +911,12 @@ debug_sub_815F7F0: debug_sub_815F86C: push {r4, r5, r6, lr} lsl r0, r0, #0x18 - ldr r1, ._84 + ldr r1, ._84 @ _nakamuraData0 ldrb r2, [r1] lsl r1, r2, #0x2 add r1, r1, r2 lsl r1, r1, #0x5 - ldr r2, ._84 + 4 + ldr r2, ._84 + 4 @ gSaveBlock1 add r5, r1, r2 mov r2, #0x0 mov r3, #0x0 @@ -924,7 +924,7 @@ debug_sub_815F86C: asr r0, r0, #0x18 cmp r0, #0x64 bne ._80 @cond_branch - ldr r0, ._84 + 8 + ldr r0, ._84 + 8 @ _nakamuraData2 ldrb r1, [r0] cmp r1, #0x6 bhi ._100 @cond_branch @@ -945,12 +945,12 @@ debug_sub_815F86C: .word gSaveBlock1+0x1a0a .word _nakamuraData2 ._80: - ldr r0, ._87 + ldr r0, ._87 @ _nakamuraData3 ldrb r0, [r0] cmp r0, #0x4 bhi ._98 @cond_branch lsl r0, r0, #0x2 - ldr r1, ._87 + 4 + ldr r1, ._87 + 4 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -985,7 +985,7 @@ debug_sub_815F86C: mov r3, #0xa1 mov r2, #0xaa ._98: - ldr r4, ._101 + ldr r4, ._101 @ _nakamuraData2 ldrb r1, [r4] add r1, r5, r1 ldrb r0, [r1] @@ -1019,14 +1019,14 @@ debug_sub_815F86C: thumb_func_start debug_sub_815F930 debug_sub_815F930: push {r4, r5, lr} - ldr r0, ._107 + ldr r0, ._107 @ _nakamuraData1 ldrb r2, [r0] mov r4, #0xa cmp r2, #0 bne ._103 @cond_branch mov r4, #0x7 ._103: - ldr r5, ._107 + 4 + ldr r5, ._107 + 4 @ gMain ldrh r1, [r5, #0x30] mov r0, #0x40 and r0, r0, r1 @@ -1067,7 +1067,7 @@ debug_sub_815F930: lsr r3, r0, #0x10 cmp r3, #0 beq ._114 @cond_branch - ldr r1, ._117 + ldr r1, ._117 @ _nakamuraData2 ldrb r0, [r1] cmp r0, #0 bne ._115 @cond_branch @@ -1089,7 +1089,7 @@ debug_sub_815F930: and r0, r0, r1 cmp r0, #0 beq ._120 @cond_branch - ldr r2, ._123 + ldr r2, ._123 @ _nakamuraData2 ldrb r1, [r2] sub r0, r4, #1 cmp r1, r0 @@ -1112,7 +1112,7 @@ debug_sub_815F930: beq ._126 @cond_branch cmp r2, #0 bne ._127 @cond_branch - ldr r4, ._129 + ldr r4, ._129 @ _nakamuraData3 ldrb r0, [r4] add r0, r0, #0x1 mov r1, #0x5 @@ -1140,8 +1140,8 @@ debug_sub_815F930: mov r2, #0xb mov r3, #0x2 bl Menu_BlankWindowRect - ldr r1, ._133 - ldr r0, ._133 + 4 + ldr r1, ._133 @ gMenuCallback + ldr r0, ._133 + 4 @ debug_sub_815FA38 str r0, [r1] b ._136 ._134: @@ -1170,7 +1170,7 @@ debug_sub_815F930: thumb_func_start debug_sub_815FA38 debug_sub_815FA38: push {r4, lr} - ldr r0, ._139 + ldr r0, ._139 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -1201,7 +1201,7 @@ debug_sub_815FA38: lsr r2, r0, #0x10 cmp r2, #0 beq ._143 @cond_branch - ldr r1, ._146 + ldr r1, ._146 @ _nakamuraData0 ldrb r0, [r1] cmp r0, #0 bne ._144 @cond_branch @@ -1221,7 +1221,7 @@ debug_sub_815FA38: lsr r4, r0, #0x10 cmp r4, #0 beq ._149 @cond_branch - ldr r1, ._152 + ldr r1, ._152 @ _nakamuraData0 ldrb r0, [r1] cmp r0, #0x13 bne ._150 @cond_branch @@ -1243,30 +1243,30 @@ debug_sub_815FA38: and r0, r0, r1 cmp r0, #0 beq ._155 @cond_branch - ldr r1, ._159 + ldr r1, ._159 @ _nakamuraData0 ldrb r0, [r1] cmp r0, #0 beq ._161 @cond_branch - ldr r2, ._159 + 4 + ldr r2, ._159 + 4 @ gSaveBlock1 add r1, r0, #0 lsl r0, r1, #0x2 add r0, r0, r1 lsl r0, r0, #0x5 add r0, r0, r2 - ldr r1, ._159 + 8 + ldr r1, ._159 + 8 @ 0x1a08 add r0, r0, r1 ldrb r0, [r0] cmp r0, #0 beq ._161 @cond_branch bl Menu_GetCursorPos - ldr r1, ._159 + 12 + ldr r1, ._159 + 12 @ _nakamuraData1 strb r0, [r1] - ldr r0, ._159 + 16 + ldr r0, ._159 + 16 @ _nakamuraData2 strb r4, [r0] bl debug_sub_815F788 bl debug_sub_815F7B4 - ldr r1, ._159 + 20 - ldr r0, ._159 + 24 + ldr r1, ._159 + 20 @ gMenuCallback + ldr r0, ._159 + 24 @ debug_sub_815F930 str r0, [r1] b ._161 ._160: @@ -1297,13 +1297,13 @@ debug_sub_815FA38: debug_sub_815FB1C: push {lr} add sp, sp, #0xfffffff8 - ldr r0, ._162 + ldr r0, ._162 @ _nakamuraData0 mov r1, #0x0 strb r1, [r0] - ldr r0, ._162 + 4 + ldr r0, ._162 + 4 @ _nakamuraData3 strb r1, [r0] - ldr r1, ._162 + 8 - ldr r0, ._162 + 12 + ldr r1, ._162 + 8 @ gMenuCallback + ldr r0, ._162 + 12 @ debug_sub_815FA38 str r0, [r1] mov r0, #0x0 mov r1, #0x0 @@ -1342,7 +1342,7 @@ debug_sub_815FB1C: thumb_func_start debug_sub_815FB78 debug_sub_815FB78: push {lr} - ldr r0, ._166 + ldr r0, ._166 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -1407,15 +1407,15 @@ debug_sub_815FB78: debug_sub_815FBE8: push {r4, lr} add sp, sp, #0xfffffff8 - ldr r1, ._178 - ldr r0, ._178 + 4 + ldr r1, ._178 @ gMenuCallback + ldr r0, ._178 + 4 @ debug_sub_815FB78 str r0, [r1] mov r0, #0x0 mov r1, #0x0 mov r2, #0x1d mov r3, #0x13 bl Menu_EraseWindowRect - ldr r4, ._178 + 8 + ldr r4, ._178 + 8 @ gStringVar1 add r0, r4, #0 bl debug_sub_814A73C mov r0, #0x0 @@ -1427,7 +1427,7 @@ debug_sub_815FBE8: mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._178 + 12 + ldr r0, ._178 + 12 @ Str_843E580 mov r1, #0x2 mov r2, #0x3 bl Menu_PrintText @@ -1459,11 +1459,11 @@ debug_sub_815FBE8: debug_sub_815FC54: push {r4, r5, r6, r7, lr} mov r3, #0x0 - ldr r7, ._181 + ldr r7, ._181 @ gSaveBlock1 mov r6, #0xe8 lsl r6, r6, #0x3 - ldr r5, ._181 + 4 - ldr r4, ._181 + 8 + ldr r5, ._181 + 4 @ 0x3e7 + ldr r4, ._181 + 8 @ 0x742 ._180: lsl r1, r3, #0x2 add r1, r1, r7 @@ -1519,7 +1519,7 @@ debug_sub_815FCB4: lsl r4, r4, #0x18 lsr r4, r4, #0x18 mov r7, #0x0 - ldr r5, ._188 + ldr r5, ._188 @ gMapHeader ldr r0, [r5] ldr r0, [r0, #0x4] mov r1, #0x3 @@ -1543,7 +1543,7 @@ debug_sub_815FCB4: add r5, r6, #1 cmp r4, r0 bge ._184 @cond_branch - ldr r0, ._188 + ldr r0, ._188 @ gMapHeader mov r9, r0 ._186: add r0, r4, #7 @@ -1563,7 +1563,7 @@ debug_sub_815FCB4: add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 - ldr r0, ._188 + ldr r0, ._188 @ gMapHeader ldr r0, [r0] ldr r0, [r0] cmp r4, r0 @@ -1607,7 +1607,7 @@ debug_sub_815FD40: sub r0, r0, #0x7 strh r0, [r4] mov r5, #0x0 - ldr r1, ._192 + ldr r1, ._192 @ gMapHeader ldr r0, [r1] ldr r0, [r0, #0x4] add r7, r4, #0 @@ -1650,7 +1650,7 @@ debug_sub_815FD40: add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 - ldr r0, ._200 + ldr r0, ._200 @ gMapHeader ldr r0, [r0] ._191: ldr r0, [r0] @@ -1659,7 +1659,7 @@ debug_sub_815FD40: add r0, r5, #1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 - ldr r1, ._200 + ldr r1, ._200 @ gMapHeader ldr r0, [r1] ldr r0, [r0, #0x4] cmp r5, r0 @@ -1683,7 +1683,7 @@ debug_sub_815FD40: thumb_func_start debug_sub_815FDE4 debug_sub_815FDE4: push {lr} - ldr r0, ._205 + ldr r0, ._205 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x1 and r0, r0, r1 @@ -1727,11 +1727,11 @@ debug_sub_815FE1C: mov r2, #0x10 mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._210 + ldr r0, ._210 @ Str_843E58D mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r6, ._210 + 4 + ldr r6, ._210 + 4 @ gStringVar1 mov r0, #0x0 bl debug_sub_815FCB4 add r1, r0, #0 @@ -1810,8 +1810,8 @@ debug_sub_815FE1C: mov r1, #0xb mov r2, #0x7 bl Menu_PrintText - ldr r0, ._210 + 8 - ldr r1, ._210 + 12 + ldr r0, ._210 + 8 @ gSaveBlock1 + ldr r1, ._210 + 12 @ 0x2dd6 add r0, r0, r1 ldrh r0, [r0] bl FeebasSeedRng @@ -1877,7 +1877,7 @@ debug_sub_815FE1C: ._208: cmp r5, #0x6 bne ._209 @cond_branch - ldr r4, ._210 + 4 + ldr r4, ._210 + 4 @ gStringVar1 bl debug_sub_815FD40 add r1, r0, #0 lsl r1, r1, #0x10 @@ -1890,8 +1890,8 @@ debug_sub_815FE1C: mov r1, #0x2 mov r2, #0x11 bl Menu_PrintText - ldr r1, ._210 + 16 - ldr r0, ._210 + 20 + ldr r1, ._210 + 16 @ gMenuCallback + ldr r0, ._210 + 20 @ debug_sub_815FDE4 str r0, [r1] mov r0, #0x0 pop {r4, r5, r6, r7} @@ -1924,18 +1924,18 @@ debug_sub_815FFDC: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._214 + ldr r0, ._214 @ Str_843E5D4 mov r1, #0x1 mov r2, #0xf bl Menu_PrintText mov r5, #0x0 - ldr r0, ._214 + 4 + ldr r0, ._214 + 4 @ _nakamuraStatic0 mov r8, r0 ._216: mov r0, #0x64 add r1, r5, #0 mul r1, r1, r0 - ldr r0, ._214 + 8 + ldr r0, ._214 + 8 @ gPlayerParty add r6, r1, r0 add r0, r6, #0 mov r1, #0xb @@ -1978,15 +1978,15 @@ debug_sub_815FFDC: lsr r5, r0, #0x18 cmp r5, #0x5 bls ._216 @cond_branch - ldr r1, ._217 + ldr r1, ._217 @ _nakamuraData4 mov r0, #0x0 strb r0, [r1] mov r0, #0xf mov r1, #0x1 mov r2, #0xff bl PrintTriangleCursorWithPalette - ldr r1, ._217 + 4 - ldr r0, ._217 + 8 + ldr r1, ._217 + 4 @ gMenuCallback + ldr r0, ._217 + 8 @ debug_sub_8160498 str r0, [r1] pop {r3} mov r8, r3 @@ -2008,14 +2008,14 @@ debug_sub_816009C: add r2, r0, #0 lsl r2, r2, #0x18 lsr r2, r2, #0x18 - ldr r1, ._219 + ldr r1, ._219 @ _nakamuraStatic0 lsl r0, r2, #0x2 add r0, r0, r1 mov r3, #0x0 ldsh r1, [r0, r3] mov r0, #0xb mul r0, r0, r1 - ldr r1, ._219 + 4 + ldr r1, ._219 + 4 @ gSpeciesNames add r0, r0, r1 lsl r2, r2, #0x1 add r2, r2, #0x1 @@ -2040,20 +2040,20 @@ debug_sub_81600D0: lsl r0, r0, #0x18 lsr r4, r0, #0x18 add r5, r4, #0 - ldr r1, ._223 + ldr r1, ._223 @ Str_843E5F0 mov r0, sp mov r2, #0x2 bl memcpy mov r0, #0x64 mul r0, r0, r4 - ldr r1, ._223 + 4 + ldr r1, ._223 + 4 @ gPlayerParty add r0, r0, r1 bl GetMonGender lsl r0, r0, #0x18 lsr r0, r0, #0x18 cmp r0, #0 bne ._221 @cond_branch - ldr r0, ._223 + 8 + ldr r0, ._223 + 8 @ gOtherText_MaleSymbol2 b ._222 ._224: .align 2, 0 @@ -2064,7 +2064,7 @@ debug_sub_81600D0: ._221: cmp r0, #0xfe bne ._225 @cond_branch - ldr r0, ._227 + ldr r0, ._227 @ gOtherText_FemaleSymbolAndLv ._222: lsl r2, r4, #0x1 add r2, r2, #0x1 @@ -2099,8 +2099,8 @@ debug_sub_816013C: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r5, ._229 - ldr r1, ._229 + 4 + ldr r5, ._229 @ gStringVar1 + ldr r1, ._229 + 4 @ _nakamuraStatic0 lsl r0, r4, #0x2 add r0, r0, r1 mov r1, #0x2 @@ -2143,7 +2143,7 @@ debug_sub_816017C: mov r0, #0x10 mov r2, #0x1c bl Menu_BlankWindowRect - ldr r1, ._232 + ldr r1, ._232 @ _nakamuraStatic0 lsl r0, r4, #0x2 add r0, r0, r1 mov r1, #0x0 @@ -2177,7 +2177,7 @@ debug_sub_81601C8: lsr r5, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r1, ._239 + ldr r1, ._239 @ _nakamuraStatic0 lsl r0, r5, #0x2 add r2, r0, r1 mov r4, #0x0 @@ -2206,7 +2206,7 @@ debug_sub_81601C8: lsl r0, r0, #0x11 cmp r1, r0 ble ._237 @cond_branch - ldr r1, ._239 + 4 + ldr r1, ._239 + 4 @ 0xfffffe65 add r0, r2, r1 strh r0, [r4] ._237: @@ -2215,13 +2215,13 @@ debug_sub_81601C8: ldsh r0, [r4, r2] cmp r0, #0 bge ._238 @cond_branch - ldr r2, ._239 + 8 + ldr r2, ._239 + 8 @ 0x19b add r0, r1, r2 strh r0, [r4] ._238: mov r0, #0x64 mul r0, r0, r5 - ldr r1, ._239 + 12 + ldr r1, ._239 + 12 @ gPlayerParty add r0, r0, r1 ldrh r1, [r4] ldrb r2, [r4, #0x2] @@ -2252,7 +2252,7 @@ debug_sub_8160258: push {lr} lsl r0, r0, #0x18 lsr r2, r0, #0x18 - ldr r1, ._242 + ldr r1, ._242 @ _nakamuraStatic0 lsl r0, r2, #0x2 add r0, r0, r1 mov r1, #0x0 @@ -2279,7 +2279,7 @@ debug_sub_816027C: add r4, r0, #0 lsl r1, r1, #0x18 lsr r2, r1, #0x18 - ldr r1, ._247 + ldr r1, ._247 @ _nakamuraStatic0 lsl r0, r4, #0x2 add r3, r0, r1 mov r1, #0x0 @@ -2307,9 +2307,9 @@ debug_sub_816027C: ._246: mov r0, #0x64 mul r4, r4, r0 - ldr r0, ._247 + 4 + ldr r0, ._247 + 4 @ gPlayerParty add r4, r4, r0 - ldr r2, ._247 + 8 + ldr r2, ._247 + 8 @ gBaseStats mov r0, #0x0 ldsh r1, [r3, r0] lsl r0, r1, #0x3 @@ -2324,7 +2324,7 @@ debug_sub_816027C: mov r0, #0x2 ldrsb r0, [r3, r0] lsl r0, r0, #0x2 - ldr r1, ._247 + 12 + ldr r1, ._247 + 12 @ gExperienceTables add r0, r0, r1 add r2, r2, r0 add r0, r4, #0 @@ -2370,7 +2370,7 @@ debug_sub_8160308: mov r9, r0 mov r0, r9 mul r0, r0, r2 - ldr r7, ._254 + ldr r7, ._254 @ gPlayerParty add r6, r0, r7 ._251: add r0, r6, #0 @@ -2407,11 +2407,11 @@ debug_sub_8160308: cmp r2, #0x4 bls ._252 @cond_branch bl CalculatePlayerPartyCount - ldr r4, ._254 + 4 + ldr r4, ._254 + 4 @ gPlayerPartyCount ldrb r1, [r4] cmp r1, #0 bne ._253 @cond_branch - ldr r0, ._254 + ldr r0, ._254 @ gPlayerParty str r1, [sp] str r1, [sp, #0x4] str r1, [sp, #0x8] @@ -2445,7 +2445,7 @@ debug_sub_81603B8: lsr r6, r0, #0x18 mov r0, #0x5 bl PlaySE - ldr r7, ._259 + ldr r7, ._259 @ _nakamuraData4 ldrb r4, [r7] add r0, r4, #0 mov r1, #0x6 @@ -2457,7 +2457,7 @@ debug_sub_81603B8: bl __umodsi3 lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r0, ._259 + 4 + ldr r0, ._259 + 4 @ _843E5D1 add r0, r5, r0 ldrb r2, [r0] lsl r3, r4, #0x1 @@ -2489,7 +2489,7 @@ debug_sub_81603B8: ._258: strb r0, [r7] ._256: - ldr r1, ._264 + ldr r1, ._264 @ _nakamuraData4 cmp r6, #0x1 bne ._261 @cond_branch cmp r4, #0x5 @@ -2543,7 +2543,7 @@ debug_sub_81603B8: bl __umodsi3 add r1, r0, #0 lsl r1, r1, #0x18 - ldr r0, ._272 + ldr r0, ._272 @ _843E5D1 add r0, r5, r0 ldrb r0, [r0] lsr r1, r1, #0x17 @@ -2565,7 +2565,7 @@ debug_sub_81603B8: thumb_func_start debug_sub_8160498 debug_sub_8160498: push {r4, lr} - ldr r1, ._276 + ldr r1, ._276 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x40 and r0, r0, r2 @@ -2607,7 +2607,7 @@ debug_sub_8160498: and r0, r0, r1 cmp r0, #0 beq ._284 @cond_branch - ldr r4, ._289 + ldr r4, ._289 @ _nakamuraData4 ldrb r0, [r4] cmp r0, #0x5 bhi ._285 @cond_branch @@ -2649,7 +2649,7 @@ debug_sub_8160498: and r0, r0, r1 cmp r0, #0 beq ._291 @cond_branch - ldr r4, ._294 + ldr r4, ._294 @ _nakamuraData4 ldrb r0, [r4] cmp r0, #0x5 bhi ._304 @cond_branch @@ -2666,7 +2666,7 @@ debug_sub_8160498: and r0, r0, r1 cmp r0, #0 beq ._296 @cond_branch - ldr r4, ._301 + ldr r4, ._301 @ _nakamuraData4 ldrb r0, [r4] cmp r0, #0x5 bhi ._297 @cond_branch @@ -2709,7 +2709,7 @@ debug_sub_8160498: and r0, r0, r1 cmp r0, #0 beq ._303 @cond_branch - ldr r4, ._308 + ldr r4, ._308 @ _nakamuraData4 ldrb r0, [r4] cmp r0, #0x5 bhi ._304 @cond_branch @@ -2790,7 +2790,7 @@ debug_sub_816062C: mov r0, #0x64 mov r4, r8 mul r4, r4, r0 - ldr r0, ._316 + ldr r0, ._316 @ gPlayerParty add r4, r4, r0 add r0, r4, #0 mov r1, #0xb @@ -2801,7 +2801,7 @@ debug_sub_816062C: bl GetMonGender lsl r0, r0, #0x18 lsr r2, r0, #0x18 - ldr r1, ._316 + 4 + ldr r1, ._316 + 4 @ gBaseStats lsl r0, r7, #0x3 sub r0, r0, r7 lsl r0, r0, #0x2 @@ -2818,7 +2818,7 @@ debug_sub_816062C: mov r1, r8 mul r1, r1, r0 add r0, r1, #0 - ldr r1, ._316 + ldr r1, ._316 @ gPlayerParty add r0, r0, r1 bl GetMonGender lsl r0, r0, #0x18 @@ -2862,12 +2862,12 @@ debug_sub_816062C: mov r0, #0x64 mov r4, r8 mul r4, r4, r0 - ldr r0, ._323 + ldr r0, ._323 @ gPlayerParty add r4, r4, r0 add r0, r4, #0 mov r1, #0x42 bl GetMonData - ldr r0, ._323 + 4 + ldr r0, ._323 + 4 @ _nakamuraStatic0 add r0, r0, r9 ldrh r1, [r0] ldrb r2, [r0, #0x2] @@ -2978,7 +2978,7 @@ debug_sub_8160714: cmp r0, #0x31 ble ._334 @cond_branch ._333: - ldr r1, ._336 + ldr r1, ._336 @ ContestStatsText_GoldPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0xe @@ -2990,7 +2990,7 @@ debug_sub_8160714: ._334: cmp r7, #0x4 bne ._338 @cond_branch - ldr r1, ._340 + ldr r1, ._340 @ ContestStatsText_WhitePokeBlock add r0, r6, #0 bl StringCopy mov r0, #0xd @@ -3026,7 +3026,7 @@ debug_sub_8160714: cmp r4, #0x4 bne ._346 @cond_branch ._345: - ldr r1, ._348 + ldr r1, ._348 @ ContestStatsText_BlackPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0xc @@ -3038,7 +3038,7 @@ debug_sub_8160714: ._346: cmp r7, #0x3 bne ._350 @cond_branch - ldr r1, ._352 + ldr r1, ._352 @ ContestStatsText_GrayPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0xb @@ -3091,7 +3091,7 @@ debug_sub_8160714: ._360: cmp r2, #0 bne ._361 @cond_branch - ldr r1, ._363 + ldr r1, ._363 @ ContestStatsText_PurplePokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x6 @@ -3103,7 +3103,7 @@ debug_sub_8160714: ._361: cmp r2, #0x1 bne ._365 @cond_branch - ldr r1, ._367 + ldr r1, ._367 @ ContestStatsText_IndigoPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x7 @@ -3115,7 +3115,7 @@ debug_sub_8160714: ._365: cmp r2, #0x2 bne ._369 @cond_branch - ldr r1, ._371 + ldr r1, ._371 @ ContestStatsText_BrownPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x8 @@ -3127,7 +3127,7 @@ debug_sub_8160714: ._369: cmp r2, #0x3 bne ._373 @cond_branch - ldr r1, ._375 + ldr r1, ._375 @ ContestStatsText_LiteBluePokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x9 @@ -3139,7 +3139,7 @@ debug_sub_8160714: ._373: cmp r2, #0x4 bne ._377 @cond_branch - ldr r1, ._379 + ldr r1, ._379 @ ContestStatsText_OlivePokeBlock add r0, r6, #0 bl StringCopy mov r0, #0xa @@ -3160,7 +3160,7 @@ debug_sub_8160714: ldsh r0, [r0, r1] cmp r0, #0 beq ._383 @cond_branch - ldr r1, ._385 + ldr r1, ._385 @ ContestStatsText_RedPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x1 @@ -3174,7 +3174,7 @@ debug_sub_8160714: ldrh r0, [r0, #0x2] cmp r0, #0 beq ._387 @cond_branch - ldr r1, ._389 + ldr r1, ._389 @ ContestStatsText_BluePokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x2 @@ -3189,7 +3189,7 @@ debug_sub_8160714: ldsh r0, [r0, r4] cmp r0, #0 beq ._391 @cond_branch - ldr r1, ._393 + ldr r1, ._393 @ ContestStatsText_PinkPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x3 @@ -3204,7 +3204,7 @@ debug_sub_8160714: ldsh r0, [r0, r1] cmp r0, #0 beq ._395 @cond_branch - ldr r1, ._397 + ldr r1, ._397 @ ContestStatsText_GreenPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x4 @@ -3219,7 +3219,7 @@ debug_sub_8160714: ldsh r0, [r0, r4] cmp r0, #0 beq ._399 @cond_branch - ldr r1, ._401 + ldr r1, ._401 @ ContestStatsText_YellowPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x5 @@ -3229,7 +3229,7 @@ debug_sub_8160714: ._401: .word ContestStatsText_YellowPokeBlock ._399: - ldr r1, ._403 + ldr r1, ._403 @ gOtherText_FiveQuestions add r0, r6, #0 bl StringCopy mov r0, #0x0 @@ -3393,10 +3393,10 @@ debug_sub_8160A80: lsl r0, r0, #0x18 lsr r0, r0, #0x18 add r2, r0, #0 - ldr r1, ._422 + ldr r1, ._422 @ _nakamuraStatic18 cmp r0, #0 bne ._420 @cond_branch - ldr r4, ._422 + 4 + ldr r4, ._422 + 4 @ gStringVar1 ldrb r1, [r1, #0x1] add r0, r4, #0 bl debug_sub_816097C @@ -3413,7 +3413,7 @@ debug_sub_8160A80: ._420: cmp r0, #0x1 bne ._424 @cond_branch - ldr r4, ._426 + ldr r4, ._426 @ gStringVar1 ldrb r1, [r1, #0x2] add r0, r4, #0 bl debug_sub_816097C @@ -3429,7 +3429,7 @@ debug_sub_8160A80: ._424: cmp r0, #0x2 bne ._428 @cond_branch - ldr r4, ._430 + ldr r4, ._430 @ gStringVar1 ldrb r1, [r1, #0x3] add r0, r4, #0 bl debug_sub_816097C @@ -3445,7 +3445,7 @@ debug_sub_8160A80: ._428: cmp r0, #0x3 bne ._432 @cond_branch - ldr r4, ._434 + ldr r4, ._434 @ gStringVar1 ldrb r1, [r1, #0x4] add r0, r4, #0 bl debug_sub_816097C @@ -3461,7 +3461,7 @@ debug_sub_8160A80: ._432: cmp r0, #0x4 bne ._436 @cond_branch - ldr r4, ._438 + ldr r4, ._438 @ gStringVar1 ldrb r1, [r1, #0x5] add r0, r4, #0 bl debug_sub_816097C @@ -3477,7 +3477,7 @@ debug_sub_8160A80: ._436: cmp r2, #0x5 bne ._440 @cond_branch - ldr r4, ._441 + ldr r4, ._441 @ gStringVar1 ldrb r1, [r1, #0x6] add r0, r4, #0 bl debug_sub_816097C @@ -3505,7 +3505,7 @@ debug_sub_8160B50: lsl r1, r1, #0x18 lsr r1, r1, #0x18 add r4, r1, #0 - ldr r2, ._445 + ldr r2, ._445 @ _nakamuraStatic18 cmp r0, #0 bne ._443 @cond_branch ldrb r0, [r2, #0x1] @@ -3560,8 +3560,8 @@ debug_sub_8160B50: thumb_func_start debug_sub_8160BB0 debug_sub_8160BB0: push {r4, r5, lr} - ldr r5, ._456 - ldr r4, ._456 + 4 + ldr r5, ._456 @ gStringVar1 + ldr r4, ._456 + 4 @ _nakamuraStatic18 add r0, r5, #0 add r1, r4, #0 bl debug_sub_8160714 @@ -3596,27 +3596,27 @@ debug_sub_8160BE4: mov r3, #0xf bl Menu_DrawStdWindowFrame bl debug_sub_8160BB0 - ldr r0, ._459 + ldr r0, ._459 @ gContestStatsText_Spicy mov r1, #0x2 mov r2, #0x3 bl Menu_PrintText - ldr r0, ._459 + 4 + ldr r0, ._459 + 4 @ gContestStatsText_Dry mov r1, #0x2 mov r2, #0x5 bl Menu_PrintText - ldr r0, ._459 + 8 + ldr r0, ._459 + 8 @ gContestStatsText_Sweet mov r1, #0x2 mov r2, #0x7 bl Menu_PrintText - ldr r0, ._459 + 12 + ldr r0, ._459 + 12 @ gContestStatsText_Bitter mov r1, #0x2 mov r2, #0x9 bl Menu_PrintText - ldr r0, ._459 + 16 + ldr r0, ._459 + 16 @ gContestStatsText_Sour mov r1, #0x2 mov r2, #0xb bl Menu_PrintText - ldr r0, ._459 + 20 + ldr r0, ._459 + 20 @ gContestStatsText_Tasty mov r1, #0x2 mov r2, #0xd bl Menu_PrintText @@ -3657,7 +3657,7 @@ debug_sub_8160BE4: thumb_func_start debug_sub_8160C7C debug_sub_8160C7C: push {r4, lr} - ldr r2, ._469 + ldr r2, ._469 @ _nakamuraStatic18 mov r1, #0x0 ldrb r0, [r2] cmp r0, #0xc @@ -3727,7 +3727,7 @@ debug_sub_8160C7C: thumb_func_start debug_sub_8160CF4 debug_sub_8160CF4: push {lr} - ldr r2, ._473 + ldr r2, ._473 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x40 and r0, r0, r1 @@ -3820,8 +3820,8 @@ debug_sub_8160D98: mov r3, #0x13 bl Menu_EraseWindowRect bl debug_sub_8160BE4 - ldr r1, ._485 - ldr r0, ._485 + 4 + ldr r1, ._485 @ gMenuCallback + ldr r0, ._485 + 4 @ debug_sub_8160CF4 str r0, [r1] mov r0, #0x0 pop {r1} @@ -3842,39 +3842,39 @@ debug_sub_8160DC0: mov r2, #0x16 mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._487 + ldr r0, ._487 @ gOtherText_Slash mov r1, #0xb mov r2, #0x1 bl Menu_PrintText - ldr r0, ._487 + 4 + ldr r0, ._487 + 4 @ Str_843E5F2 mov r1, #0x2 mov r2, #0x3 bl Menu_PrintText - ldr r0, ._487 + 8 + ldr r0, ._487 + 8 @ Str_843E5FB mov r1, #0x2 mov r2, #0x5 bl Menu_PrintText - ldr r0, ._487 + 12 + ldr r0, ._487 + 12 @ Str_843E606 mov r1, #0x2 mov r2, #0x7 bl Menu_PrintText - ldr r0, ._487 + 16 + ldr r0, ._487 + 16 @ Str_843E611 mov r1, #0x2 mov r2, #0x9 bl Menu_PrintText - ldr r0, ._487 + 20 + ldr r0, ._487 + 20 @ Str_843E61C mov r1, #0x2 mov r2, #0xb bl Menu_PrintText - ldr r0, ._487 + 24 + ldr r0, ._487 + 24 @ Str_843E627 mov r1, #0x2 mov r2, #0xd bl Menu_PrintText - ldr r0, ._487 + 28 + ldr r0, ._487 + 28 @ Str_843E637 mov r1, #0x2 mov r2, #0xf bl Menu_PrintText - ldr r0, ._487 + 32 + ldr r0, ._487 + 32 @ Str_843E632 mov r1, #0x2 mov r2, #0x11 bl Menu_PrintText @@ -3904,7 +3904,7 @@ debug_sub_8160E50: mov r2, #0xa mov r3, #0x2 bl Menu_BlankWindowRect - ldr r5, ._489 + ldr r5, ._489 @ gStringVar1 add r0, r6, #0 mov r1, #0x2 add r2, r5, #0 @@ -3923,7 +3923,7 @@ debug_sub_8160E50: bl GetMonData mov r1, #0xb mul r0, r0, r1 - ldr r1, ._489 + 4 + ldr r1, ._489 + 4 @ gSpeciesNames add r0, r0, r1 mov r1, #0xc mov r2, #0x1 @@ -4110,7 +4110,7 @@ debug_sub_8161028: neg r0, r0 cmp r1, r0 bne ._491 @cond_branch - ldr r0, ._496 + ldr r0, ._496 @ _nakamuraData5 ldrb r0, [r0] cmp r0, #0 bne ._492 @cond_branch @@ -4120,7 +4120,7 @@ debug_sub_8161028: asr r4, r0, #0x10 mov r0, #0x64 mul r0, r0, r4 - ldr r1, ._496 + 4 + ldr r1, ._496 + 4 @ gPlayerParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -4132,7 +4132,7 @@ debug_sub_8161028: cmp r0, #0 bge ._494 @cond_branch ._492: - ldr r1, ._496 + ldr r1, ._496 @ _nakamuraData5 ldrb r0, [r1] add r0, r0, r6 strb r0, [r1] @@ -4145,7 +4145,7 @@ debug_sub_8161028: ._491: cmp r1, #0x1 bne ._506 @cond_branch - ldr r4, ._501 + ldr r4, ._501 @ _nakamuraData5 ldrb r0, [r4] add r0, r0, r6 strb r0, [r4] @@ -4160,7 +4160,7 @@ debug_sub_8161028: ._501: .word _nakamuraData5 ._493: - ldr r0, ._504 + ldr r0, ._504 @ _nakamuraData5 strb r5, [r0] b ._506 ._505: @@ -4171,7 +4171,7 @@ debug_sub_8161028: ldrb r1, [r4] mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._507 + ldr r1, ._507 @ gPlayerParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -4193,7 +4193,7 @@ debug_sub_8161028: thumb_func_start debug_sub_81610BC debug_sub_81610BC: push {lr} - ldr r0, ._511 + ldr r0, ._511 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x20 and r0, r0, r1 @@ -4214,11 +4214,11 @@ debug_sub_81610BC: mov r0, #0x1 ._510: bl debug_sub_8161028 - ldr r0, ._515 + ldr r0, ._515 @ _nakamuraData5 ldrb r1, [r0] mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._515 + 4 + ldr r1, ._515 + 4 @ gPlayerParty add r0, r0, r1 bl debug_sub_8160E50 mov r0, #0x0 @@ -4257,14 +4257,14 @@ DebugMenu_EffortValues: mov r2, #0x1d mov r3, #0x13 bl Menu_EraseWindowRect - ldr r1, ._519 + ldr r1, ._519 @ _nakamuraData5 mov r0, #0x0 strb r0, [r1] bl debug_sub_8160DC0 - ldr r0, ._519 + 4 + ldr r0, ._519 + 4 @ gPlayerParty bl debug_sub_8160E50 - ldr r1, ._519 + 8 - ldr r0, ._519 + 12 + ldr r1, ._519 + 8 @ gMenuCallback + ldr r0, ._519 + 12 @ debug_sub_81610BC str r0, [r1] mov r0, #0x0 pop {r1} @@ -4285,8 +4285,8 @@ debug_sub_8161160: mov r7, r8 push {r7} mov r7, #0x0 - ldr r2, ._523 - ldr r1, ._523 + 4 + ldr r2, ._523 @ _nakamuraData6 + ldr r1, ._523 + 4 @ _nakamuraData8 ldrh r0, [r2] ldrh r3, [r1] cmp r0, r3 @@ -4304,11 +4304,11 @@ debug_sub_8161160: ldrh r5, [r2] ._522: mov r4, #0x0 - ldr r0, ._529 + ldr r0, ._529 @ _nakamuraDataA ldrh r0, [r0] cmp r4, r0 bcs ._525 @cond_branch - ldr r0, ._529 + 4 + ldr r0, ._529 + 4 @ _nakamuraDataC mov r8, r0 ._528: bl Random @@ -4328,7 +4328,7 @@ debug_sub_8161160: lsr r7, r0, #0x10 ._527: add r4, r4, #0x1 - ldr r0, ._529 + ldr r0, ._529 @ _nakamuraDataA ldrh r0, [r0] cmp r4, r0 bcc ._528 @cond_branch @@ -4356,31 +4356,31 @@ debug_sub_81611D8: mov r2, #0xf mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r0, ._531 + ldr r0, ._531 @ Str_843E642 mov r1, #0x2 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._531 + 4 + ldr r0, ._531 + 4 @ Str_843E647 mov r1, #0x2 mov r2, #0x3 bl Menu_PrintText - ldr r0, ._531 + 8 + ldr r0, ._531 + 8 @ Str_843E65A mov r1, #0x2 mov r2, #0x5 bl Menu_PrintText - ldr r0, ._531 + 12 + ldr r0, ._531 + 12 @ Str_843E64C mov r1, #0x2 mov r2, #0x7 bl Menu_PrintText - ldr r0, ._531 + 16 + ldr r0, ._531 + 16 @ Str_843E651 mov r1, #0x2 mov r2, #0x9 bl Menu_PrintText - ldr r0, ._531 + 20 + ldr r0, ._531 + 20 @ Str_843E655 mov r1, #0xd mov r2, #0x9 bl Menu_PrintText - ldr r4, ._531 + 24 + ldr r4, ._531 + 24 @ Str_843E658 add r0, r4, #0 mov r1, #0xc mov r2, #0x1 @@ -4433,7 +4433,7 @@ debug_sub_8161290: add r1, r0, #0 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - ldr r4, ._533 + ldr r4, ._533 @ gStringVar1 add r0, r4, #0 mov r2, #0x1 mov r3, #0x5 @@ -4463,7 +4463,7 @@ debug_sub_81612B8: ldrh r2, [r0] add r1, r1, r2 strh r1, [r0] - ldr r5, ._535 + ldr r5, ._535 @ gStringVar1 ldrh r1, [r0] add r0, r5, #0 mov r2, #0x1 @@ -4486,7 +4486,7 @@ debug_sub_81612B8: thumb_func_start debug_sub_81612EC debug_sub_81612EC: push {r4, r5, lr} - ldr r2, ._540 + ldr r2, ._540 @ gMain ldrh r1, [r2, #0x2c] mov r0, #0x80 lsl r0, r0, #0x1 @@ -4529,28 +4529,28 @@ debug_sub_81612EC: asr r4, r0, #0x18 cmp r4, #0 bne ._545 @cond_branch - ldr r0, ._550 + ldr r0, ._550 @ _nakamuraData6 neg r1, r5 mov r2, #0x1 bl debug_sub_81612B8 ._545: cmp r4, #0x1 bne ._546 @cond_branch - ldr r0, ._550 + 4 + ldr r0, ._550 + 4 @ _nakamuraData8 neg r1, r5 mov r2, #0x3 bl debug_sub_81612B8 ._546: cmp r4, #0x2 bne ._547 @cond_branch - ldr r0, ._550 + 8 + ldr r0, ._550 + 8 @ _nakamuraDataC neg r1, r5 mov r2, #0x5 bl debug_sub_81612B8 ._547: cmp r4, #0x3 bne ._565 @cond_branch - ldr r0, ._550 + 12 + ldr r0, ._550 + 12 @ _nakamuraDataA neg r1, r5 mov r2, #0x7 bl debug_sub_81612B8 @@ -4572,28 +4572,28 @@ debug_sub_81612EC: asr r4, r0, #0x18 cmp r4, #0 bne ._553 @cond_branch - ldr r0, ._558 + ldr r0, ._558 @ _nakamuraData6 add r1, r5, #0 mov r2, #0x1 bl debug_sub_81612B8 ._553: cmp r4, #0x1 bne ._554 @cond_branch - ldr r0, ._558 + 4 + ldr r0, ._558 + 4 @ _nakamuraData8 add r1, r5, #0 mov r2, #0x3 bl debug_sub_81612B8 ._554: cmp r4, #0x2 bne ._555 @cond_branch - ldr r0, ._558 + 8 + ldr r0, ._558 + 8 @ _nakamuraDataC add r1, r5, #0 mov r2, #0x5 bl debug_sub_81612B8 ._555: cmp r4, #0x3 bne ._565 @cond_branch - ldr r0, ._558 + 12 + ldr r0, ._558 + 12 @ _nakamuraDataA add r1, r5, #0 mov r2, #0x7 bl debug_sub_81612B8 @@ -4611,7 +4611,7 @@ debug_sub_81612EC: and r0, r0, r1 cmp r0, #0 beq ._560 @cond_branch - ldr r0, ._563 + ldr r0, ._563 @ _nakamuraDataC ldrh r0, [r0] cmp r0, #0 beq ._565 @cond_branch @@ -4648,14 +4648,14 @@ debug_sub_81612EC: thumb_func_start DebugMenu_RandomNumberTest DebugMenu_RandomNumberTest: push {lr} - ldr r0, ._566 + ldr r0, ._566 @ _nakamuraData6 mov r1, #0x0 strh r1, [r0] - ldr r0, ._566 + 4 + ldr r0, ._566 + 4 @ _nakamuraData8 strh r1, [r0] - ldr r0, ._566 + 8 + ldr r0, ._566 + 8 @ _nakamuraDataC strh r1, [r0] - ldr r0, ._566 + 12 + ldr r0, ._566 + 12 @ _nakamuraDataA strh r1, [r0] mov r0, #0x0 mov r1, #0x0 @@ -4663,8 +4663,8 @@ DebugMenu_RandomNumberTest: mov r3, #0x13 bl Menu_EraseWindowRect bl debug_sub_81611D8 - ldr r1, ._566 + 16 - ldr r0, ._566 + 20 + ldr r1, ._566 + 16 @ gMenuCallback + ldr r0, ._566 + 20 @ debug_sub_81612EC str r0, [r1] mov r0, #0x0 pop {r1} diff --git a/asm/nohara_debug_menu.s b/asm/nohara_debug_menu.s index 88e6f1868..003f34798 100644 --- a/asm/nohara_debug_menu.s +++ b/asm/nohara_debug_menu.s @@ -15,7 +15,7 @@ InitNoharaDebugMenu: mov r2, #0x13 mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._1 + ldr r3, ._1 @ gUnknown_Debug_083C4938 mov r0, #0x1 mov r1, #0x1 mov r2, #0x9 @@ -29,8 +29,8 @@ InitNoharaDebugMenu: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._1 + 4 - ldr r0, ._1 + 8 + ldr r1, ._1 + 4 @ gMenuCallback + ldr r0, ._1 + 8 @ debug_sub_808F414 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -58,8 +58,8 @@ debug_sub_808F414: add r0, r0, #0x1 cmp r1, r0 beq ._4 @cond_branch - ldr r2, ._6 - ldr r0, ._6 + 4 + ldr r2, ._6 @ gMenuCallback + ldr r0, ._6 + 4 @ gUnknown_Debug_083C4938 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -86,7 +86,7 @@ debug_sub_808F414: NoharaDebugMenu_TV: push {lr} add sp, sp, #0xfffffff8 - ldr r1, ._8 + ldr r1, ._8 @ gDebug_03000726 mov r0, #0x0 strb r0, [r1] bl Menu_EraseScreen @@ -95,7 +95,7 @@ NoharaDebugMenu_TV: mov r2, #0xa mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._8 + 4 + ldr r3, ._8 + 4 @ gUnknown_Debug_083C4B8C mov r0, #0x1 mov r1, #0x1 mov r2, #0x9 @@ -109,8 +109,8 @@ NoharaDebugMenu_TV: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._8 + 8 - ldr r0, ._8 + 12 + ldr r1, ._8 + 8 @ gMenuCallback + ldr r0, ._8 + 12 @ debug_sub_808F4AC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -139,8 +139,8 @@ debug_sub_808F4AC: add r0, r0, #0x1 cmp r1, r0 beq ._11 @cond_branch - ldr r2, ._13 - ldr r0, ._13 + 4 + ldr r2, ._13 @ gMenuCallback + ldr r0, ._13 + 4 @ gUnknown_Debug_083C4B8C lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -167,14 +167,14 @@ debug_sub_808F4AC: debug_sub_808F4EC: push {lr} bl debug_sub_808F6BC - ldr r0, ._15 + ldr r0, ._15 @ gUnknown_Debug_083C4980 bl sub_8071F40 mov r0, #0x3 mov r1, #0x3 mov r2, #0x1 bl DisplayYesNoMenu - ldr r1, ._15 + 4 - ldr r0, ._15 + 8 + ldr r1, ._15 + 4 @ gMenuCallback + ldr r0, ._15 + 8 @ debug_sub_808F648 str r0, [r1] pop {r0} bx r0 @@ -191,8 +191,8 @@ debug_sub_808F4EC: debug_sub_808F518: push {r4, lr} mov r2, #0x0 - ldr r4, ._20 - ldr r3, ._20 + 4 + ldr r4, ._20 @ gSaveBlock1 + ldr r3, ._20 + 4 @ 0x2738 ._19: lsl r0, r2, #0x3 add r0, r0, r2 @@ -205,7 +205,7 @@ debug_sub_808F518: lsr r0, r0, #0x18 cmp r0, #0x13 bhi ._18 @cond_branch - ldr r0, ._20 + 8 + ldr r0, ._20 + 8 @ 0x2739 add r1, r1, r0 ldrb r0, [r1] cmp r0, #0 @@ -234,8 +234,8 @@ debug_sub_808F518: debug_sub_808F560: push {r4, lr} mov r1, #0x0 - ldr r4, ._23 - ldr r3, ._23 + 4 + ldr r4, ._23 @ gSaveBlock1 + ldr r3, ._23 + 4 @ 0x2739 mov r2, #0x0 ._22: lsl r0, r1, #0x3 @@ -266,9 +266,9 @@ debug_sub_808F560: debug_sub_808F594: push {r4, r5, r6, lr} mov r2, #0x0 - ldr r6, ._27 - ldr r5, ._27 + 4 - ldr r4, ._27 + 8 + ldr r6, ._27 @ gSaveBlock1 + ldr r5, ._27 + 4 @ 0x2738 + ldr r4, ._27 + 8 @ 0x2739 mov r3, #0x1 ._26: lsl r0, r2, #0x3 @@ -307,12 +307,12 @@ debug_sub_808F5D8: mov r7, r8 push {r7} mov r4, #0x0 - ldr r6, ._30 - ldr r7, ._30 + 4 + ldr r6, ._30 @ gStringVar1 + ldr r7, ._30 + 4 @ gUnknown_Debug_083C4BD4 add r0, r7, #1 mov r8, r0 ._29: - ldr r5, ._30 + 8 + ldr r5, ._30 + 8 @ gSpecialVar_0x8004 strh r4, [r5] bl GetSlotMachineId add r1, r0, #0 @@ -338,8 +338,8 @@ debug_sub_808F5D8: bls ._29 @cond_branch mov r0, #0x0 strh r0, [r5] - ldr r1, ._30 + 12 - ldr r0, ._30 + 16 + ldr r1, ._30 + 12 @ gMenuCallback + ldr r0, ._30 + 16 @ debug_sub_8090278 str r0, [r1] mov r0, #0x0 pop {r3} @@ -361,7 +361,7 @@ debug_sub_808F5D8: thumb_func_start debug_sub_808F648 debug_sub_808F648: push {lr} - ldr r0, ._35 + ldr r0, ._35 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x20 and r0, r0, r1 @@ -372,7 +372,7 @@ debug_sub_808F648: mov r2, #0x1d mov r3, #0xd bl Menu_EraseWindowRect - ldr r0, ._35 + 4 + ldr r0, ._35 + 4 @ gDebug_03000726 ldrb r1, [r0] mov r2, #0x1 eor r1, r1, r2 @@ -425,14 +425,14 @@ debug_sub_808F648: debug_sub_808F6BC: push {r4, r5, r6, lr} mov r4, #0x0 - ldr r5, ._48 - ldr r6, ._48 + 4 + ldr r5, ._48 @ gStringVar1 + ldr r6, ._48 + 4 @ gSaveBlock1 ._45: lsl r0, r4, #0x3 add r0, r0, r4 lsl r0, r0, #0x2 add r0, r0, r6 - ldr r1, ._48 + 8 + ldr r1, ._48 + 8 @ 0x2738 add r0, r0, r1 ldrb r1, [r0] add r0, r5, #0 @@ -453,14 +453,14 @@ debug_sub_808F6BC: cmp r4, #0x4 bls ._45 @cond_branch mov r4, #0x5 - ldr r5, ._48 - ldr r6, ._48 + 4 + ldr r5, ._48 @ gStringVar1 + ldr r6, ._48 + 4 @ gSaveBlock1 ._50: lsl r0, r4, #0x3 add r0, r0, r4 lsl r0, r0, #0x2 add r0, r0, r6 - ldr r1, ._48 + 8 + ldr r1, ._48 + 8 @ 0x2738 add r0, r0, r1 ldrb r1, [r0] add r0, r5, #0 @@ -497,12 +497,12 @@ debug_sub_808F6BC: cmp r4, #0x17 bls ._50 @cond_branch mov r4, #0x0 - ldr r5, ._53 + ldr r5, ._53 @ gStringVar1 ._55: - ldr r0, ._53 + 4 + ldr r0, ._53 + 4 @ gSaveBlock1 lsl r1, r4, #0x2 add r1, r1, r0 - ldr r0, ._53 + 8 + ldr r0, ._53 + 8 @ 0x2abc add r1, r1, r0 ldrb r1, [r1] add r0, r5, #0 @@ -551,14 +551,14 @@ debug_sub_808F6BC: debug_sub_808F7B4: push {r4, r5, r6, lr} mov r4, #0x0 - ldr r5, ._59 - ldr r6, ._59 + 4 + ldr r5, ._59 @ gStringVar1 + ldr r6, ._59 + 4 @ gSaveBlock1 ._56: lsl r0, r4, #0x3 add r0, r0, r4 lsl r0, r0, #0x2 add r0, r0, r6 - ldr r1, ._59 + 8 + ldr r1, ._59 + 8 @ 0x2739 add r0, r0, r1 ldrb r1, [r0] add r0, r5, #0 @@ -579,14 +579,14 @@ debug_sub_808F7B4: cmp r4, #0x4 bls ._56 @cond_branch mov r4, #0x5 - ldr r5, ._59 - ldr r6, ._59 + 4 + ldr r5, ._59 @ gStringVar1 + ldr r6, ._59 + 4 @ gSaveBlock1 ._61: lsl r0, r4, #0x3 add r0, r0, r4 lsl r0, r0, #0x2 add r0, r0, r6 - ldr r1, ._59 + 8 + ldr r1, ._59 + 8 @ 0x2739 add r0, r0, r1 ldrb r1, [r0] add r0, r5, #0 @@ -623,12 +623,12 @@ debug_sub_808F7B4: cmp r4, #0x17 bls ._61 @cond_branch mov r4, #0x0 - ldr r5, ._64 + ldr r5, ._64 @ gStringVar1 ._66: - ldr r0, ._64 + 4 + ldr r0, ._64 + 4 @ gSaveBlock1 lsl r1, r4, #0x2 add r1, r1, r0 - ldr r0, ._64 + 8 + ldr r0, ._64 + 8 @ 0x2abd add r1, r1, r0 ldrb r1, [r1] add r0, r5, #0 @@ -676,9 +676,9 @@ debug_sub_808F7B4: thumb_func_start debug_sub_808F8AC debug_sub_808F8AC: push {lr} - ldr r0, ._67 + ldr r0, ._67 @ 0x832 bl FlagSet - ldr r0, ._67 + 4 + ldr r0, ._67 + 4 @ 0x818 bl FlagSet bl CloseMenu mov r0, #0x1 @@ -695,17 +695,17 @@ debug_sub_808F8AC: thumb_func_start debug_sub_808F8CC debug_sub_808F8CC: push {r4, lr} - ldr r1, ._69 + ldr r1, ._69 @ gDebug_03000724 mov r0, #0x0 strb r0, [r1] - ldr r0, ._69 + 4 + ldr r0, ._69 + 4 @ gUnknown_Debug_083C49CA bl sub_8071F40 mov r0, #0xd mov r1, #0x6 mov r2, #0x1a mov r3, #0x8 bl Menu_BlankWindowRect - ldr r0, ._69 + 8 + ldr r0, ._69 + 8 @ gUnknown_Debug_083C4ABD ldr r0, [r0] mov r1, #0xe mov r2, #0x7 @@ -715,7 +715,7 @@ debug_sub_808F8CC: mov r2, #0x18 mov r3, #0x2 bl Menu_BlankWindowRect - ldr r4, ._69 + 12 + ldr r4, ._69 + 12 @ gStringVar1 add r0, r4, #0 mov r1, #0x0 mov r2, #0x0 @@ -725,8 +725,8 @@ debug_sub_808F8CC: mov r1, #0x17 mov r2, #0x1 bl Menu_PrintText - ldr r1, ._69 + 16 - ldr r0, ._69 + 20 + ldr r1, ._69 + 16 @ gMenuCallback + ldr r0, ._69 + 20 @ debug_sub_808F93C str r0, [r1] pop {r4} pop {r0} @@ -747,13 +747,13 @@ debug_sub_808F8CC: debug_sub_808F93C: push {r4, lr} mov r2, #0x0 - ldr r0, ._83 + ldr r0, ._83 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x40 and r0, r0, r1 cmp r0, #0 beq ._71 @cond_branch - ldr r1, ._83 + 4 + ldr r1, ._83 + 4 @ gDebug_03000725 ldrb r0, [r1] add r0, r0, #0x1 strb r0, [r1] @@ -767,13 +767,13 @@ debug_sub_808F93C: bl PlaySE mov r2, #0x1 ._71: - ldr r0, ._83 + ldr r0, ._83 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 and r0, r0, r1 cmp r0, #0 beq ._73 @cond_branch - ldr r1, ._83 + 4 + ldr r1, ._83 + 4 @ gDebug_03000725 ldrb r0, [r1] cmp r0, #0 bne ._74 @cond_branch @@ -787,13 +787,13 @@ debug_sub_808F93C: bl PlaySE mov r2, #0x1 ._73: - ldr r0, ._83 + ldr r0, ._83 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x10 and r0, r0, r1 cmp r0, #0 beq ._75 @cond_branch - ldr r1, ._83 + 8 + ldr r1, ._83 + 8 @ gDebug_03000724 ldrb r0, [r1] add r0, r0, #0x1 strb r0, [r1] @@ -808,13 +808,13 @@ debug_sub_808F93C: bl PlaySE mov r2, #0x1 ._75: - ldr r0, ._83 + ldr r0, ._83 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._77 @cond_branch - ldr r1, ._83 + 8 + ldr r1, ._83 + 8 @ gDebug_03000724 ldrb r0, [r1] cmp r0, #0 bne ._78 @cond_branch @@ -835,8 +835,8 @@ debug_sub_808F93C: mov r2, #0x1a mov r3, #0x8 bl Menu_BlankWindowRect - ldr r1, ._83 + 12 - ldr r0, ._83 + 8 + ldr r1, ._83 + 12 @ gUnknown_Debug_083C4ABD + ldr r0, ._83 + 8 @ gDebug_03000724 ldrb r0, [r0] lsl r0, r0, #0x2 add r0, r0, r1 @@ -849,8 +849,8 @@ debug_sub_808F93C: mov r2, #0x18 mov r3, #0x2 bl Menu_BlankWindowRect - ldr r4, ._83 + 16 - ldr r0, ._83 + 4 + ldr r4, ._83 + 16 @ gStringVar1 + ldr r0, ._83 + 4 @ gDebug_03000725 ldrb r1, [r0] add r0, r4, #0 mov r2, #0x0 @@ -861,7 +861,7 @@ debug_sub_808F93C: mov r2, #0x1 bl Menu_PrintText ._79: - ldr r4, ._83 + ldr r4, ._83 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x1 and r0, r0, r1 @@ -869,10 +869,10 @@ debug_sub_808F93C: beq ._80 @cond_branch mov r0, #0x15 bl PlaySE - ldr r0, ._83 + 4 + ldr r0, ._83 + 4 @ gDebug_03000725 ldrb r0, [r0] - ldr r2, ._83 + 20 - ldr r1, ._83 + 8 + ldr r2, ._83 + 20 @ gUnknown_Debug_083C4ABD + ldr r1, ._83 + 8 @ gDebug_03000724 ldrb r1, [r1] add r1, r1, r2 ldrb r1, [r1] @@ -895,7 +895,7 @@ debug_sub_808F93C: .word gStringVar1 .word gUnknown_Debug_083C4ABD ._81: - ldr r0, ._85 + ldr r0, ._85 @ gSaveBlock1 bl sub_80BF588 bl CloseMenu mov r0, #0x1 @@ -925,20 +925,20 @@ debug_sub_808FA88: lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r9, r0 - ldr r3, ._92 + ldr r3, ._92 @ gSaveBlock1 lsl r4, r6, #0x3 add r2, r4, r6 lsl r2, r2, #0x2 add r0, r2, r3 - ldr r5, ._92 + 4 + ldr r5, ._92 + 4 @ 0x2738 add r1, r0, r5 strb r7, [r1] - ldr r1, ._92 + 8 + ldr r1, ._92 + 8 @ 0x2739 add r0, r0, r1 mov r1, #0x1 strb r1, [r0] mov r1, #0x0 - ldr r0, ._92 + 12 + ldr r0, ._92 + 12 @ 0x273a add r5, r3, r0 mov r3, #0x1 ._87: @@ -975,7 +975,7 @@ debug_sub_808FA88: ._90: add r0, r4, r6 lsl r0, r0, #0x2 - ldr r1, ._96 + ldr r1, ._96 @ gSaveBlock1 add r0, r0, r1 bl sub_80BE160 b ._95 @@ -986,7 +986,7 @@ debug_sub_808FA88: ._88: add r0, r4, r6 lsl r0, r0, #0x2 - ldr r1, ._100 + ldr r1, ._100 @ gSaveBlock1 add r0, r0, r1 bl sub_80BE138 ._95: @@ -996,7 +996,7 @@ debug_sub_808FA88: b ._173 ._98: lsl r0, r0, #0x2 - ldr r1, ._100 + 4 + ldr r1, ._100 + 4 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -1050,13 +1050,13 @@ debug_sub_808FA88: ._104: add r0, r4, r6 lsl r0, r0, #0x2 - ldr r1, ._145 + ldr r1, ._145 @ gSaveBlock1 add r4, r0, r1 mov r2, #0x1 strh r2, [r4, #0x2] add r1, r1, #0x10 add r0, r0, r1 - ldr r1, ._145 + 4 + ldr r1, ._145 + 4 @ gSaveBlock2 bl StringCopy mov r0, #0x5 strb r0, [r4, #0x18] @@ -1069,19 +1069,19 @@ debug_sub_808FA88: ._105: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r6, ._148 + ldr r6, ._148 @ gSaveBlock1 add r1, r4, r6 mov r8, r1 mov r0, #0x1 strh r0, [r1, #0x2] add r0, r6, #5 add r0, r4, r0 - ldr r1, ._148 + 4 + ldr r1, ._148 + 4 @ gSaveBlock2 bl StringCopy mov r0, #0x64 mov r5, r9 mul r5, r5, r0 - ldr r0, ._148 + 8 + ldr r0, ._148 + 8 @ gPlayerParty add r5, r5, r0 add r6, r6, #0x10 add r4, r4, r6 @@ -1109,14 +1109,14 @@ debug_sub_808FA88: mov r1, r9 mul r1, r1, r0 mov r8, r1 - ldr r0, ._151 + ldr r0, ._151 @ gPlayerParty add r8, r8, r0 mov r0, r8 mov r1, #0xb bl GetMonData add r4, r4, r6 lsl r4, r4, #0x2 - ldr r5, ._151 + 4 + ldr r5, ._151 + 4 @ gSaveBlock1 add r6, r4, r5 strh r0, [r6, #0x2] mov r0, #0x1 @@ -1124,7 +1124,7 @@ debug_sub_808FA88: add r0, r5, #0 add r0, r0, #0xf add r0, r4, r0 - ldr r1, ._151 + 8 + ldr r1, ._151 + 8 @ gSaveBlock2 bl StringCopy add r5, r5, #0x4 add r4, r4, r5 @@ -1148,7 +1148,7 @@ debug_sub_808FA88: ._108: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r6, ._154 + ldr r6, ._154 @ gSaveBlock1 add r5, r4, r6 mov r8, r5 mov r0, #0x1 @@ -1156,12 +1156,12 @@ debug_sub_808FA88: add r0, r6, #0 add r0, r0, #0x16 add r0, r4, r0 - ldr r1, ._154 + 4 + ldr r1, ._154 + 4 @ gSaveBlock2 bl StringCopy mov r0, #0x64 mov r5, r9 mul r5, r5, r0 - ldr r0, ._154 + 8 + ldr r0, ._154 + 8 @ gPlayerParty add r5, r5, r0 add r6, r6, #0x8 add r4, r4, r6 @@ -1187,14 +1187,14 @@ debug_sub_808FA88: ._109: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r5, ._157 + ldr r5, ._157 @ gSaveBlock1 add r6, r4, r5 mov r0, #0x1 strh r0, [r6, #0xa] strh r0, [r6, #0x14] add r0, r5, #2 add r0, r4, r0 - ldr r1, ._157 + 4 + ldr r1, ._157 + 4 @ gSaveBlock2 mov r8, r1 bl StringCopy add r5, r5, #0xc @@ -1213,7 +1213,7 @@ debug_sub_808FA88: ._143: add r0, r4, r6 lsl r0, r0, #0x2 - ldr r1, ._160 + ldr r1, ._160 @ gSaveBlock1 add r0, r0, r1 mov r1, #0x1 strh r1, [r0, #0xc] @@ -1226,14 +1226,14 @@ debug_sub_808FA88: ._123: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r0, ._163 + ldr r0, ._163 @ gSaveBlock1 add r4, r4, r0 - ldr r1, ._163 + 4 + ldr r1, ._163 + 4 @ gUnknown_Debug_083C4C64 mov r0, sp mov r2, #0x8 bl memcpy add r5, sp, #0x8 - ldr r1, ._163 + 8 + ldr r1, ._163 + 8 @ gUnknown_Debug_083C4C6C add r0, r5, #0 mov r2, #0xb bl memcpy @@ -1263,10 +1263,10 @@ debug_sub_808FA88: ._124: add r0, r4, r6 lsl r0, r0, #0x2 - ldr r1, ._168 + ldr r1, ._168 @ gSaveBlock1 add r5, r0, r1 add r4, sp, #0x14 - ldr r1, ._168 + 4 + ldr r1, ._168 + 4 @ gUnknown_Debug_083C4C64 add r0, r4, #0 mov r2, #0x8 bl memcpy @@ -1308,10 +1308,10 @@ debug_sub_808FA88: ._125: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r0, ._171 + ldr r0, ._171 @ gSaveBlock1 add r4, r4, r0 add r5, sp, #0x1c - ldr r1, ._171 + 4 + ldr r1, ._171 + 4 @ gUnknown_Debug_083C4C64 add r0, r5, #0 mov r2, #0x8 bl memcpy @@ -1339,10 +1339,10 @@ debug_sub_808FA88: ._126: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r0, ._174 + ldr r0, ._174 @ gSaveBlock1 add r4, r4, r0 add r5, sp, #0x24 - ldr r1, ._174 + 4 + ldr r1, ._174 + 4 @ gUnknown_Debug_083C4C64 add r0, r5, #0 mov r2, #0x8 bl memcpy @@ -1367,14 +1367,14 @@ debug_sub_808FA88: ._127: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r0, ._176 + ldr r0, ._176 @ gSaveBlock1 add r4, r4, r0 add r5, sp, #0x2c - ldr r1, ._176 + 4 + ldr r1, ._176 + 4 @ gUnknown_Debug_083C4C64 add r0, r5, #0 mov r2, #0x8 bl memcpy - ldr r0, ._176 + 8 + ldr r0, ._176 + 8 @ 0xffff strh r0, [r4, #0x2] mov r0, #0x1 neg r0, r0 @@ -1421,17 +1421,17 @@ debug_sub_808FEBC: thumb_func_start debug_sub_808FECC debug_sub_808FECC: push {r4, lr} - ldr r1, ._178 + ldr r1, ._178 @ gDebug_03000724 mov r0, #0x0 strb r0, [r1] - ldr r0, ._178 + 4 + ldr r0, ._178 + 4 @ gUnknown_Debug_083C49CA bl sub_8071F40 mov r0, #0xd mov r1, #0x6 mov r2, #0x17 mov r3, #0x8 bl Menu_BlankWindowRect - ldr r0, ._178 + 8 + ldr r0, ._178 + 8 @ gUnknown_Debug_083C4B20 ldr r0, [r0] mov r1, #0xe mov r2, #0x7 @@ -1441,7 +1441,7 @@ debug_sub_808FECC: mov r2, #0x18 mov r3, #0x2 bl Menu_BlankWindowRect - ldr r4, ._178 + 12 + ldr r4, ._178 + 12 @ gStringVar1 add r0, r4, #0 mov r1, #0x0 mov r2, #0x0 @@ -1451,8 +1451,8 @@ debug_sub_808FECC: mov r1, #0x17 mov r2, #0x1 bl Menu_PrintText - ldr r1, ._178 + 16 - ldr r0, ._178 + 20 + ldr r1, ._178 + 16 @ gMenuCallback + ldr r0, ._178 + 20 @ debug_sub_808FF3C str r0, [r1] pop {r4} pop {r0} @@ -1473,13 +1473,13 @@ debug_sub_808FECC: debug_sub_808FF3C: push {r4, lr} mov r2, #0x0 - ldr r0, ._192 + ldr r0, ._192 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x40 and r0, r0, r1 cmp r0, #0 beq ._180 @cond_branch - ldr r1, ._192 + 4 + ldr r1, ._192 + 4 @ gDebug_03000725 ldrb r0, [r1] add r0, r0, #0x1 strb r0, [r1] @@ -1493,13 +1493,13 @@ debug_sub_808FF3C: bl PlaySE mov r2, #0x1 ._180: - ldr r0, ._192 + ldr r0, ._192 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 and r0, r0, r1 cmp r0, #0 beq ._182 @cond_branch - ldr r1, ._192 + 4 + ldr r1, ._192 + 4 @ gDebug_03000725 ldrb r0, [r1] cmp r0, #0 bne ._183 @cond_branch @@ -1513,13 +1513,13 @@ debug_sub_808FF3C: bl PlaySE mov r2, #0x1 ._182: - ldr r0, ._192 + ldr r0, ._192 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x10 and r0, r0, r1 cmp r0, #0 beq ._184 @cond_branch - ldr r1, ._192 + 8 + ldr r1, ._192 + 8 @ gDebug_03000724 ldrb r0, [r1] add r0, r0, #0x1 strb r0, [r1] @@ -1534,13 +1534,13 @@ debug_sub_808FF3C: bl PlaySE mov r2, #0x1 ._184: - ldr r0, ._192 + ldr r0, ._192 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._186 @cond_branch - ldr r1, ._192 + 8 + ldr r1, ._192 + 8 @ gDebug_03000724 ldrb r0, [r1] cmp r0, #0 bne ._187 @cond_branch @@ -1561,8 +1561,8 @@ debug_sub_808FF3C: mov r2, #0x17 mov r3, #0x8 bl Menu_BlankWindowRect - ldr r1, ._192 + 12 - ldr r0, ._192 + 8 + ldr r1, ._192 + 12 @ gUnknown_Debug_083C4B20 + ldr r0, ._192 + 8 @ gDebug_03000724 ldrb r0, [r0] lsl r0, r0, #0x2 add r0, r0, r1 @@ -1575,8 +1575,8 @@ debug_sub_808FF3C: mov r2, #0x18 mov r3, #0x2 bl Menu_BlankWindowRect - ldr r4, ._192 + 16 - ldr r0, ._192 + 4 + ldr r4, ._192 + 16 @ gStringVar1 + ldr r0, ._192 + 4 @ gDebug_03000725 ldrb r1, [r0] add r0, r4, #0 mov r2, #0x0 @@ -1587,7 +1587,7 @@ debug_sub_808FF3C: mov r2, #0x1 bl Menu_PrintText ._188: - ldr r4, ._192 + ldr r4, ._192 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x1 and r0, r0, r1 @@ -1595,10 +1595,10 @@ debug_sub_808FF3C: beq ._189 @cond_branch mov r0, #0x15 bl PlaySE - ldr r0, ._192 + 4 + ldr r0, ._192 + 4 @ gDebug_03000725 ldrb r0, [r0] - ldr r2, ._192 + 20 - ldr r1, ._192 + 8 + ldr r2, ._192 + 20 @ gUnknown_Debug_083C4B20 + ldr r1, ._192 + 8 @ gDebug_03000724 ldrb r1, [r1] add r1, r1, r2 ldrb r1, [r1] @@ -1634,13 +1634,13 @@ debug_sub_808FF3C: thumb_func_start debug_sub_8090080 debug_sub_8090080: lsl r0, r0, #0x18 - ldr r2, ._194 + ldr r2, ._194 @ gSaveBlock1 lsr r0, r0, #0x16 add r0, r0, r2 - ldr r3, ._194 + 4 + ldr r3, ._194 + 4 @ 0x2abc add r2, r0, r3 strb r1, [r2] - ldr r1, ._194 + 8 + ldr r1, ._194 + 8 @ 0x2abd add r2, r0, r1 mov r1, #0x1 strb r1, [r2] @@ -1665,7 +1665,7 @@ debug_sub_80900AC: push {r7} mov r7, #0x0 mov r5, #0x0 - ldr r0, ._202 + ldr r0, ._202 @ gSaveBlock1 mov r8, r0 ._198: lsl r0, r5, #0x3 @@ -1673,7 +1673,7 @@ debug_sub_80900AC: lsl r0, r0, #0x2 mov r1, r8 add r6, r0, r1 - ldr r1, ._202 + 4 + ldr r1, ._202 + 4 @ 0x2738 add r0, r6, r1 ldrb r4, [r0] cmp r4, #0 @@ -1682,12 +1682,12 @@ debug_sub_80900AC: bne ._197 @cond_branch mov r7, #0x0 ._197: - ldr r0, ._202 + 8 + ldr r0, ._202 + 8 @ gUnknown_Debug_083C4ABD add r0, r7, r0 ldrb r1, [r0] add r0, r5, #0 bl debug_sub_808FA88 - ldr r1, ._202 + 12 + ldr r1, ._202 + 12 @ 0x2739 add r0, r6, r1 strb r4, [r0] add r0, r7, #1 @@ -1702,10 +1702,10 @@ debug_sub_80900AC: mov r7, #0x0 mov r5, #0x0 ._201: - ldr r0, ._202 + ldr r0, ._202 @ gSaveBlock1 lsl r1, r5, #0x2 add r1, r1, r0 - ldr r0, ._202 + 16 + ldr r0, ._202 + 16 @ 0x2abc add r1, r1, r0 ldrb r0, [r1] cmp r0, #0 @@ -1714,7 +1714,7 @@ debug_sub_80900AC: bne ._200 @cond_branch mov r7, #0x0 ._200: - ldr r0, ._202 + 20 + ldr r0, ._202 + 20 @ gUnknown_Debug_083C4B20 add r0, r7, r0 ldrb r1, [r0] add r0, r5, #0 @@ -1757,7 +1757,7 @@ NoharaDebugMenu_Fan: mov r2, #0xb mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._204 + ldr r3, ._204 @ gUnknown_Debug_083C4D28 mov r0, #0x1 mov r1, #0x1 mov r2, #0x9 @@ -1771,8 +1771,8 @@ NoharaDebugMenu_Fan: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._204 + 4 - ldr r0, ._204 + 8 + ldr r1, ._204 + 4 @ gMenuCallback + ldr r0, ._204 + 8 @ debug_sub_80901A4 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1800,8 +1800,8 @@ debug_sub_80901A4: add r0, r0, #0x1 cmp r1, r0 beq ._207 @cond_branch - ldr r2, ._209 - ldr r0, ._209 + 4 + ldr r2, ._209 @ gMenuCallback + ldr r0, ._209 + 4 @ gUnknown_Debug_083C4D28 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -1842,8 +1842,8 @@ debug_sub_80901F8: bl sub_810FB9C lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._211 - ldr r1, ._211 + 4 + ldr r2, ._211 @ gUnknown_Debug_083C4CA8 + ldr r1, ._211 + 4 @ gUnknown_083F8408 add r0, r0, r1 ldrb r0, [r0] sub r0, r0, #0x8 @@ -1853,8 +1853,8 @@ debug_sub_80901F8: mov r1, #0xe mov r2, #0x7 bl Menu_PrintText - ldr r1, ._211 + 8 - ldr r0, ._211 + 12 + ldr r1, ._211 + 8 @ gMenuCallback + ldr r0, ._211 + 12 @ debug_sub_8090278 str r0, [r1] mov r0, #0x0 pop {r1} @@ -1875,8 +1875,8 @@ debug_sub_8090238: bl sub_810FC18 lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._213 - ldr r1, ._213 + 4 + ldr r2, ._213 @ gUnknown_Debug_083C4CA8 + ldr r1, ._213 + 4 @ gUnknown_083F8410 add r0, r0, r1 ldrb r0, [r0] sub r0, r0, #0x8 @@ -1886,8 +1886,8 @@ debug_sub_8090238: mov r1, #0xe mov r2, #0x7 bl Menu_PrintText - ldr r1, ._213 + 8 - ldr r0, ._213 + 12 + ldr r1, ._213 + 8 @ gMenuCallback + ldr r0, ._213 + 12 @ debug_sub_8090278 str r0, [r1] mov r0, #0x0 pop {r1} @@ -1905,7 +1905,7 @@ debug_sub_8090238: thumb_func_start debug_sub_8090278 debug_sub_8090278: push {lr} - ldr r0, ._217 + ldr r0, ._217 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x1 and r0, r0, r1 @@ -1929,9 +1929,9 @@ debug_sub_8090278: thumb_func_start debug_sub_809029C debug_sub_809029C: push {r4, lr} - ldr r4, ._219 - ldr r0, ._219 + 4 - ldr r1, ._219 + 8 + ldr r4, ._219 @ gStringVar1 + ldr r0, ._219 + 4 @ gSaveBlock1 + ldr r1, ._219 + 8 @ 0x13c2 add r0, r0, r1 ldrh r0, [r0] mov r1, #0x7f @@ -1944,8 +1944,8 @@ debug_sub_809029C: mov r1, #0x10 mov r2, #0x7 bl Menu_PrintText - ldr r1, ._219 + 12 - ldr r0, ._219 + 16 + ldr r1, ._219 + 12 @ gMenuCallback + ldr r0, ._219 + 16 @ debug_sub_8090278 str r0, [r1] mov r0, #0x0 pop {r4} @@ -1965,7 +1965,7 @@ debug_sub_809029C: thumb_func_start debug_sub_80902E4 debug_sub_80902E4: push {lr} - ldr r1, ._221 + ldr r1, ._221 @ gSaveBlock2 ldrh r0, [r1, #0xe] add r0, r0, #0x6 strh r0, [r1, #0xe] @@ -2031,7 +2031,7 @@ debug_sub_8090338: thumb_func_start NoharaDebugMenu_BattleVSDad NoharaDebugMenu_BattleVSDad: push {lr} - ldr r0, ._223 + ldr r0, ._223 @ 0x4085 mov r1, #0x6 bl VarSet bl CloseMenu @@ -2048,7 +2048,7 @@ NoharaDebugMenu_BattleVSDad: thumb_func_start NoharaDebugMenu_DadAfterBattle NoharaDebugMenu_DadAfterBattle: push {lr} - ldr r0, ._225 + ldr r0, ._225 @ 0x4085 mov r1, #0x7 bl VarSet bl CloseMenu @@ -2069,7 +2069,7 @@ NoharaDebugMenu_SootopolisCity: bl FlagSet mov r0, #0x71 bl FlagSet - ldr r0, ._227 + ldr r0, ._227 @ 0x32f bl FlagClear bl CloseMenu mov r0, #0x1 @@ -2085,9 +2085,9 @@ NoharaDebugMenu_SootopolisCity: thumb_func_start NoharaDebugMenu_Embark NoharaDebugMenu_Embark: push {lr} - ldr r0, ._229 + ldr r0, ._229 @ 0x2e3 bl FlagClear - ldr r0, ._229 + 4 + ldr r0, ._229 + 4 @ 0x4090 mov r1, #0x1 bl VarSet bl CloseMenu @@ -2105,8 +2105,8 @@ NoharaDebugMenu_Embark: thumb_func_start NoharaDebugMenu_Yes9999 NoharaDebugMenu_Yes9999: push {lr} - ldr r0, ._231 - ldr r1, ._231 + 4 + ldr r0, ._231 @ 0x4048 + ldr r1, ._231 + 4 @ 0x270f bl VarSet bl CloseMenu mov r0, #0x1 @@ -2135,8 +2135,8 @@ NoharaDebugMenu_LegendsFlagOn: thumb_func_start NoharaDebugMenu_AddNumWinningStreaks NoharaDebugMenu_AddNumWinningStreaks: push {lr} - ldr r0, ._235 - ldr r1, ._235 + 4 + ldr r0, ._235 @ gSaveBlock2 + ldr r1, ._235 + 4 @ 0x572 add r2, r0, r1 ldrh r1, [r2] cmp r1, #0x31 @@ -2154,7 +2154,7 @@ NoharaDebugMenu_AddNumWinningStreaks: mov r0, #0x64 b ._244 ._237: - ldr r0, ._241 + ldr r0, ._241 @ 0x3e7 cmp r1, r0 bhi ._239 @cond_branch add r0, r0, #0x1 @@ -2164,10 +2164,10 @@ NoharaDebugMenu_AddNumWinningStreaks: ._241: .word 0x3e7 ._239: - ldr r0, ._245 + ldr r0, ._245 @ 0x1387 cmp r1, r0 bhi ._243 @cond_branch - ldr r0, ._245 + 4 + ldr r0, ._245 + 4 @ 0x2706 b ._244 ._246: .align 2, 0 @@ -2175,7 +2175,7 @@ NoharaDebugMenu_AddNumWinningStreaks: .word 0x1387 .word 0x2706 ._243: - ldr r0, ._248 + ldr r0, ._248 @ 0x2705 cmp r1, r0 bhi ._247 @cond_branch add r0, r0, #0xa diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 6e6e17db3..a0fa06f14 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1047,10 +1047,10 @@ debug_sub_80A3904: lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x4 - ldr r2, ._163 + ldr r2, ._163 @ gPokemonStorage add r1, r1, r2 add r6, r3, r1 - ldr r2, ._163 + 4 + ldr r2, ._163 + 4 @ gUnknown_Debug_083E05F0 lsl r1, r7, #0x1 add r1, r1, r2 ldrh r4, [r1] @@ -1983,8 +1983,8 @@ sub_8096874: @ 8096874 sub_8096884: .syntax divided push {r4, lr} - ldr r0, ._223 - ldr r1, ._223 + 4 + ldr r0, ._223 @ gMain + ldr r1, ._223 + 4 @ 0x43c add r0, r0, r1 ldrb r0, [r0] cmp r0, #0x9 @@ -1992,7 +1992,7 @@ sub_8096884: b ._222 ._221: lsl r0, r0, #0x2 - ldr r1, ._223 + 8 + ldr r1, ._223 + 8 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -2021,7 +2021,7 @@ sub_8096884: mov r4, #0x0 strh r4, [r0] bl sub_8096804 - ldr r0, ._237 + ldr r0, ._237 @ unk_2038790 strb r4, [r0] b ._250 ._238: @@ -2029,7 +2029,7 @@ sub_8096884: ._237: .word unk_2038790 ._227: - ldr r0, ._240 + ldr r0, ._240 @ gWindowTemplate_81E6D00 bl Text_LoadWindowTemplate b ._250 ._241: @@ -2037,7 +2037,7 @@ sub_8096884: ._240: .word gWindowTemplate_81E6D00 ._228: - ldr r0, ._243 + ldr r0, ._243 @ gWindowTemplate_81E6D00 bl InitMenuWindow bl Menu_EraseScreen b ._250 @@ -2063,17 +2063,17 @@ sub_8096884: bl sub_8098400 b ._250 ._234: - ldr r0, ._251 + ldr r0, ._251 @ gPokemonStorage ldrb r0, [r0] bl sub_8099BF8 - ldr r2, ._251 + 4 - ldr r1, ._251 + 8 + ldr r2, ._251 + 4 @ 0x2000000 + ldr r1, ._251 + 8 @ 0x12bc add r0, r2, r1 mov r1, #0xa strh r1, [r0] - ldr r1, ._251 + 12 + ldr r1, ._251 + 12 @ 0x12be add r2, r2, r1 - ldr r1, ._251 + 16 + ldr r1, ._251 + 16 @ 0xdacb strh r1, [r2] bl sub_80F727C bl sub_80F7404 @@ -2082,21 +2082,21 @@ sub_8096884: .align 2, 0 ._251: .word gPokemonStorage - .word +0x2000000 + .word 0x2000000 .word 0x12bc .word 0x12be .word 0xdacb ._235: bl sub_8096874 - ldr r0, ._253 + ldr r0, ._253 @ sub_8096BF0 bl sub_8096BE0 - ldr r0, ._253 + 4 + ldr r0, ._253 + 4 @ sub_8096B38 bl SetMainCallback2 - ldr r0, ._253 + 8 + ldr r0, ._253 + 8 @ sub_8096AFC bl SetVBlankCallback ._250: - ldr r1, ._253 + 12 - ldr r0, ._253 + 16 + ldr r1, ._253 + 12 @ gMain + ldr r0, ._253 + 16 @ 0x43c add r1, r1, r0 ldrb r0, [r1] add r0, r0, #0x1 @@ -2392,19 +2392,19 @@ _08096AF8: .4byte 0x0000043c debug_sub_80A4300: .syntax divided push {lr} - ldr r1, ._296 + ldr r1, ._296 @ gUnknown_0203847D mov r0, #0x0 strb r0, [r1] - ldr r1, ._296 + 4 + ldr r1, ._296 + 4 @ 0x2000000 mov r0, #0x0 strb r0, [r1, #0x5] bl sub_8096884 - ldr r0, ._296 + 8 + ldr r0, ._296 + 8 @ gMain ldr r1, [r0, #0x4] - ldr r0, ._296 + 12 + ldr r0, ._296 + 12 @ sub_8096B38 cmp r1, r0 bne ._295 @cond_branch - ldr r1, ._296 + 16 + ldr r1, ._296 + 16 @ unk_2038790 mov r0, #0x1 strb r0, [r1] ._295: @@ -2414,7 +2414,7 @@ debug_sub_80A4300: .align 2, 0 ._296: .word gUnknown_0203847D - .word +0x2000000 + .word 0x2000000 .word gMain .word sub_8096B38+1 .word unk_2038790 @@ -2425,11 +2425,11 @@ debug_sub_80A4300: debug_sub_80A433C: .syntax divided push {lr} - ldr r2, ._298 + ldr r2, ._298 @ unk_2038794 str r1, [r2] - ldr r1, ._298 + 4 + ldr r1, ._298 + 4 @ unk_2038798 str r0, [r1] - ldr r0, ._298 + 8 + ldr r0, ._298 + 8 @ debug_sub_80A4300 bl SetMainCallback2 pop {r0} bx r0 @@ -2447,7 +2447,7 @@ debug_sub_80A435C: .syntax divided push {r4, r5, lr} add sp, sp, #0xfffffffc - ldr r5, ._303 + ldr r5, ._303 @ 0x2000000 ldrb r4, [r5, #0x4] cmp r4, #0 beq ._300 @cond_branch @@ -2457,9 +2457,9 @@ debug_sub_80A435C: ._304: .align 2, 0 ._303: - .word +0x2000000 + .word 0x2000000 ._300: - ldr r0, ._306 + ldr r0, ._306 @ unk_2038798 ldr r0, [r0] bl unref_sub_809CB94 mov r0, #0x1 @@ -2482,7 +2482,7 @@ debug_sub_80A435C: lsl r0, r0, #0x18 cmp r0, #0 bne ._308 @cond_branch - ldr r0, ._309 + ldr r0, ._309 @ unk_2038794 ldr r0, [r0] bl _call_via_r0 ._308: @@ -2700,21 +2700,21 @@ _08096C80: .4byte sub_8096C84 sub_8096C84: .syntax divided push {r4, lr} - ldr r0, ._347 + ldr r0, ._347 @ 0x2000000 ldrb r0, [r0, #0x4] cmp r0, #0x6 bls ._345 @cond_branch b ._466 ._345: lsl r0, r0, #0x2 - ldr r1, ._347 + 4 + ldr r1, ._347 + 4 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 ._348: .align 2, 0 ._347: - .word +0x2000000 + .word 0x2000000 .word ._349 ._349: .word ._350 @@ -2734,7 +2734,7 @@ sub_8096C84: b ._466 ._357: lsl r0, r0, #0x2 - ldr r1, ._360 + ldr r1, ._360 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -2762,16 +2762,16 @@ sub_8096C84: ._362: mov r0, #0x5 bl PlaySE - ldr r1, ._379 + ldr r1, ._379 @ 0x2000000 mov r0, #0x1 strb r0, [r1, #0x4] b ._466 ._380: .align 2, 0 ._379: - .word +0x2000000 + .word 0x2000000 ._366: - ldr r4, ._383 + ldr r4, ._383 @ 0x2000000 ldrb r0, [r4, #0x5] cmp r0, #0x2 beq ._381 @cond_branch @@ -2783,10 +2783,10 @@ sub_8096C84: ._384: .align 2, 0 ._383: - .word +0x2000000 + .word 0x2000000 ._381: bl sub_809B0D4 - ldr r0, ._386 + ldr r0, ._386 @ sub_8096FC8 bl sub_8096BE0 b ._466 ._387: @@ -2794,7 +2794,7 @@ sub_8096C84: ._386: .word sub_8096FC8+1 ._367: - ldr r4, ._394 + ldr r4, ._394 @ 0x2000000 ldrb r0, [r4, #0x5] cmp r0, #0x2 beq ._388 @cond_branch @@ -2804,7 +2804,7 @@ sub_8096C84: lsl r0, r0, #0x18 cmp r0, #0 beq ._391 @cond_branch - ldr r1, ._394 + 4 + ldr r1, ._394 + 4 @ 0x11f2 add r0, r4, r1 ldrh r0, [r0] bl ItemIsMail @@ -2813,23 +2813,23 @@ sub_8096C84: beq ._391 @cond_branch b ._392 ._391: - ldr r0, ._394 + 8 + ldr r0, ._394 + 8 @ sub_8097004 bl sub_8096BE0 b ._466 ._395: .align 2, 0 ._394: - .word +0x2000000 + .word 0x2000000 .word 0x11f2 .word sub_8097004+1 ._365: - ldr r0, ._399 + ldr r0, ._399 @ unk_2038790 ldrb r0, [r0] cmp r0, #0 beq ._396 @cond_branch b ._466 ._396: - ldr r0, ._399 + 4 + ldr r0, ._399 + 4 @ sub_8097BA0 bl sub_8096BE0 b ._466 ._400: @@ -2838,13 +2838,13 @@ sub_8096C84: .word unk_2038790 .word sub_8097BA0+1 ._377: - ldr r0, ._404 + ldr r0, ._404 @ unk_2038790 ldrb r0, [r0] cmp r0, #0 beq ._401 @cond_branch b ._466 ._401: - ldr r0, ._404 + 4 + ldr r0, ._404 + 4 @ sub_8097CC0 bl sub_8096BE0 b ._466 ._405: @@ -2855,7 +2855,7 @@ sub_8096C84: ._368: mov r0, #0x5 bl PlaySE - ldr r0, ._407 + ldr r0, ._407 @ sub_809789C bl sub_8096BE0 b ._466 ._408: @@ -2865,7 +2865,7 @@ sub_8096C84: ._369: mov r0, #0x5 bl PlaySE - ldr r0, ._410 + ldr r0, ._410 @ sub_8097078 bl sub_8096BE0 b ._466 ._411: @@ -2875,11 +2875,11 @@ sub_8096C84: ._370: mov r0, #0x5 bl PlaySE - ldr r4, ._414 - ldr r0, ._414 + 4 + ldr r4, ._414 @ 0x2000000 + ldr r0, ._414 + 4 @ gPokemonStorage ldrb r0, [r0] add r0, r0, #0x1 - ldr r2, ._414 + 8 + ldr r2, ._414 + 8 @ 0x8b2 add r1, r4, r2 strh r0, [r1] cmp r0, #0xd @@ -2889,17 +2889,17 @@ sub_8096C84: ._415: .align 2, 0 ._414: - .word +0x2000000 + .word 0x2000000 .word gPokemonStorage .word 0x8b2 ._371: mov r0, #0x5 bl PlaySE - ldr r4, ._418 - ldr r0, ._418 + 4 + ldr r4, ._418 @ 0x2000000 + ldr r0, ._418 + 4 @ gPokemonStorage ldrb r0, [r0] sub r0, r0, #0x1 - ldr r2, ._418 + 8 + ldr r2, ._418 + 8 @ 0x8b2 add r1, r4, r2 strh r0, [r1] cmp r0, #0 @@ -2916,7 +2916,7 @@ sub_8096C84: ._419: .align 2, 0 ._418: - .word +0x2000000 + .word 0x2000000 .word gPokemonStorage .word 0x8b2 ._372: @@ -2924,8 +2924,8 @@ sub_8096C84: lsl r0, r0, #0x18 cmp r0, #0 bne ._428 @cond_branch - ldr r4, ._423 - ldr r1, ._423 + 4 + ldr r4, ._423 @ 0x2000000 + ldr r1, ._423 + 4 @ 0x11f2 add r0, r4, r1 ldrh r0, [r0] bl ItemIsMail @@ -2939,12 +2939,12 @@ sub_8096C84: ._424: .align 2, 0 ._423: - .word +0x2000000 + .word 0x2000000 .word 0x11f2 ._421: mov r0, #0x5 bl PlaySE - ldr r0, ._426 + ldr r0, ._426 @ sub_809746C bl sub_8096BE0 b ._466 ._427: @@ -2958,7 +2958,7 @@ sub_8096C84: bne ._428 @cond_branch mov r0, #0x5 bl PlaySE - ldr r0, ._430 + ldr r0, ._430 @ sub_80972A8 bl sub_8096BE0 b ._466 ._431: @@ -2971,18 +2971,18 @@ sub_8096C84: cmp r0, #0 bne ._432 @cond_branch ._428: - ldr r1, ._434 + ldr r1, ._434 @ 0x2000000 mov r0, #0x4 strb r0, [r1, #0x4] b ._466 ._435: .align 2, 0 ._434: - .word +0x2000000 + .word 0x2000000 ._432: mov r0, #0x5 bl PlaySE - ldr r0, ._437 + ldr r0, ._437 @ c3_0808DC50 bl sub_8096BE0 b ._466 ._438: @@ -2992,7 +2992,7 @@ sub_8096C84: ._373: mov r0, #0x5 bl PlaySE - ldr r0, ._440 + ldr r0, ._440 @ sub_8097390 bl sub_8096BE0 b ._466 ._441: @@ -3002,7 +3002,7 @@ sub_8096C84: ._376: mov r0, #0x5 bl PlaySE - ldr r0, ._443 + ldr r0, ._443 @ sub_80972FC bl sub_8096BE0 b ._466 ._444: @@ -3023,8 +3023,8 @@ sub_8096C84: ._446: bl sub_8098710 ._447: - ldr r4, ._450 - ldr r2, ._450 + 4 + ldr r4, ._450 @ 0x2000000 + ldr r2, ._450 + 4 @ 0x11f6 add r0, r4, r2 ldrb r0, [r0] cmp r0, #0 @@ -3037,20 +3037,20 @@ sub_8096C84: ._451: .align 2, 0 ._450: - .word +0x2000000 + .word 0x2000000 .word 0x11f6 ._352: bl sub_8099D34 lsl r0, r0, #0x18 cmp r0, #0 bne ._466 @cond_branch - ldr r1, ._456 - ldr r0, ._456 + 4 - ldr r2, ._456 + 8 + ldr r1, ._456 @ gPokemonStorage + ldr r0, ._456 + 4 @ 0x2000000 + ldr r2, ._456 + 8 @ 0x8b2 add r0, r0, r2 ldrh r0, [r0] strb r0, [r1] - ldr r0, ._456 + 12 + ldr r0, ._456 + 12 @ gUnknown_0203847C ldrb r0, [r0] cmp r0, #0 bne ._455 @cond_branch @@ -3065,11 +3065,11 @@ sub_8096C84: .align 2, 0 ._456: .word gPokemonStorage - .word +0x2000000 + .word 0x2000000 .word 0x8b2 .word gUnknown_0203847C ._353: - ldr r0, ._460 + ldr r0, ._460 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0xf3 and r0, r0, r1 @@ -3077,7 +3077,7 @@ sub_8096C84: beq ._466 @cond_branch bl sub_8098A5C ._455: - ldr r1, ._460 + 4 + ldr r1, ._460 + 4 @ 0x2000000 mov r0, #0x0 strb r0, [r1, #0x4] b ._466 @@ -3085,7 +3085,7 @@ sub_8096C84: .align 2, 0 ._460: .word gMain - .word +0x2000000 + .word 0x2000000 ._354: mov r0, #0x20 bl PlaySE @@ -3097,23 +3097,23 @@ sub_8096C84: mov r0, #0x16 ._462: bl sub_8098898 - ldr r1, ._464 + ldr r1, ._464 @ 0x2000000 mov r0, #0x6 strb r0, [r1, #0x4] b ._466 ._465: .align 2, 0 ._464: - .word +0x2000000 + .word 0x2000000 ._356: - ldr r0, ._467 + ldr r0, ._467 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0xf3 and r0, r0, r1 cmp r0, #0 beq ._466 @cond_branch bl sub_8098A5C - ldr r0, ._467 + 4 + ldr r0, ._467 + 4 @ sub_8096C84 bl sub_8096BE0 ._466: pop {r4} @@ -3594,21 +3594,21 @@ _08097074: .4byte sub_8096C84 sub_8097078: .syntax divided push {r4, lr} - ldr r0, ._495 + ldr r0, ._495 @ 0x2000000 ldrb r0, [r0, #0x4] cmp r0, #0x5 bls ._493 @cond_branch b ._597 ._493: lsl r0, r0, #0x2 - ldr r1, ._495 + 4 + ldr r1, ._495 + 4 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 ._496: .align 2, 0 ._495: - .word +0x2000000 + .word 0x2000000 .word ._497 ._497: .word ._498 @@ -3621,14 +3621,14 @@ sub_8097078: mov r0, #0x4 bl sub_8098898 bl sub_809CE84 - ldr r1, ._505 + ldr r1, ._505 @ 0x2000000 mov r0, #0x1 strb r0, [r1, #0x4] b ._597 ._506: .align 2, 0 ._505: - .word +0x2000000 + .word 0x2000000 ._499: bl sub_809CF30 add r0, r0, #0x1 @@ -3639,7 +3639,7 @@ sub_8097078: b ._597 ._507: lsl r0, r0, #0x2 - ldr r1, ._510 + ldr r1, ._510 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -3684,7 +3684,7 @@ sub_8097078: .word ._545 ._513: bl sub_8098A5C - ldr r0, ._547 + ldr r0, ._547 @ sub_8096C84 bl sub_8096BE0 b ._597 ._548: @@ -3699,7 +3699,7 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._551 + ldr r0, ._551 @ sub_80972A8 bl sub_8096BE0 b ._597 ._552: @@ -3710,7 +3710,7 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._554 + ldr r0, ._554 @ sub_80972FC bl sub_8096BE0 b ._597 ._555: @@ -3725,7 +3725,7 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._558 + ldr r0, ._558 @ c3_0808DC50 bl sub_8096BE0 b ._597 ._559: @@ -3736,7 +3736,7 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._561 + ldr r0, ._561 @ sub_8097390 bl sub_8096BE0 b ._597 ._562: @@ -3748,8 +3748,8 @@ sub_8097078: lsl r0, r0, #0x18 cmp r0, #0 bne ._563 @cond_branch - ldr r4, ._566 - ldr r1, ._566 + 4 + ldr r4, ._566 @ 0x2000000 + ldr r1, ._566 + 4 @ 0x11f2 add r0, r4, r1 ldrh r0, [r0] bl ItemIsMail @@ -3759,13 +3759,13 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._566 + 8 + ldr r0, ._566 + 8 @ sub_809746C bl sub_8096BE0 b ._597 ._567: .align 2, 0 ._566: - .word +0x2000000 + .word 0x2000000 .word 0x11f2 .word sub_809746C+1 ._520: @@ -3774,17 +3774,17 @@ sub_8097078: cmp r0, #0 beq ._568 @cond_branch ._563: - ldr r1, ._570 + ldr r1, ._570 @ 0x2000000 mov r0, #0x2 strb r0, [r1, #0x4] b ._597 ._571: .align 2, 0 ._570: - .word +0x2000000 + .word 0x2000000 ._568: - ldr r4, ._574 - ldr r1, ._574 + 4 + ldr r4, ._574 @ 0x2000000 + ldr r1, ._574 + 4 @ 0x11f9 add r0, r4, r1 ldrb r0, [r0] cmp r0, #0 @@ -3795,10 +3795,10 @@ sub_8097078: ._575: .align 2, 0 ._574: - .word +0x2000000 + .word 0x2000000 .word 0x11f9 ._572: - ldr r1, ._578 + ldr r1, ._578 @ 0x11f2 add r0, r4, r1 ldrh r0, [r0] bl ItemIsMail @@ -3816,7 +3816,7 @@ sub_8097078: ._576: mov r0, #0x5 bl PlaySE - ldr r0, ._581 + ldr r0, ._581 @ sub_8097594 bl sub_8096BE0 b ._597 ._582: @@ -3826,7 +3826,7 @@ sub_8097078: ._519: mov r0, #0x5 bl PlaySE - ldr r0, ._584 + ldr r0, ._584 @ sub_8097788 bl sub_8096BE0 b ._597 ._585: @@ -3836,7 +3836,7 @@ sub_8097078: ._521: mov r0, #0x5 bl PlaySE - ldr r0, ._587 + ldr r0, ._587 @ sub_80977E4 bl sub_8096BE0 b ._597 ._588: @@ -3847,7 +3847,7 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._590 + ldr r0, ._590 @ debug_sub_80A435C bl sub_8096BE0 b ._597 ._591: @@ -3870,23 +3870,23 @@ sub_8097078: mov r0, #0x16 ._593: bl sub_8098898 - ldr r1, ._595 + ldr r1, ._595 @ 0x2000000 mov r0, #0x5 strb r0, [r1, #0x4] b ._597 ._596: .align 2, 0 ._595: - .word +0x2000000 + .word 0x2000000 ._503: - ldr r0, ._598 + ldr r0, ._598 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0xf3 and r0, r0, r1 cmp r0, #0 beq ._597 @cond_branch bl sub_8098A5C - ldr r0, ._598 + 4 + ldr r0, ._598 + 4 @ sub_8096C84 bl sub_8096BE0 ._597: pop {r4} @@ -15164,7 +15164,7 @@ debug_sub_80AA40C: sub_809CAB0: .syntax divided push {lr} - ldr r0, ._2088 + ldr r0, ._2088 @ unk_2038790 ldrb r0, [r0] cmp r0, #0 beq ._2086 @cond_branch @@ -15181,7 +15181,7 @@ sub_809CAB0: bl sub_809AB8C lsl r0, r0, #0x10 lsr r1, r0, #0x10 - ldr r0, ._2094 + ldr r0, ._2094 @ gUnknown_083B6DB4 ldr r0, [r0] ldrb r0, [r0, #0x5] cmp r0, #0x1 @@ -15212,7 +15212,7 @@ sub_809CAB0: bl sub_809CDEC b ._2109 ._2096: - ldr r0, ._2105 + ldr r0, ._2105 @ gUnknown_020384E6 ldrb r0, [r0] cmp r0, #0 beq ._2102 @cond_branch @@ -15241,12 +15241,12 @@ sub_809CAB0: ._2109: mov r0, #0x6 bl sub_809CDEC - ldr r0, ._2114 + ldr r0, ._2114 @ gUnknown_083B6DB4 ldr r0, [r0] ldrb r0, [r0, #0x5] cmp r0, #0x2 bne ._2113 @cond_branch - ldr r0, ._2114 + 4 + ldr r0, ._2114 + 4 @ gUnknown_020384E4 ldrb r0, [r0] lsl r0, r0, #0x18 asr r0, r0, #0x18 diff --git a/asm/taya_debug_window.s b/asm/taya_debug_window.s index 1c25de5f6..68d27390d 100644 --- a/asm/taya_debug_window.s +++ b/asm/taya_debug_window.s @@ -19,7 +19,7 @@ TayaDebugMenu_Trend: mov r2, #0x1e mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r5, ._3 + ldr r5, ._3 @ gSaveBlock1 mov r7, #0x0 mov r0, #0x1 add r0, r0, sp @@ -96,8 +96,8 @@ TayaDebugMenu_Trend: lsr r7, r0, #0x10 cmp r7, #0x4 bls ._2 @cond_branch - ldr r1, ._3 + 4 - ldr r0, ._3 + 8 + ldr r1, ._3 + 4 @ gMenuCallback + ldr r0, ._3 + 8 @ debug_sub_8090808 str r0, [r1] mov r0, #0x0 add sp, sp, #0x28 @@ -120,7 +120,7 @@ TayaDebugMenu_Trend: thumb_func_start debug_sub_8090808 debug_sub_8090808: push {lr} - ldr r0, ._7 + ldr r0, ._7 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x3 and r0, r0, r1 @@ -146,7 +146,7 @@ debug_sub_8090808: TayaDebugMenu_TrendR: push {r4, r5, r6, r7, lr} mov r0, #0x0 - ldr r7, ._11 + ldr r7, ._11 @ gSaveBlock1 ._10: mov r4, #0x0 lsl r5, r0, #0x3 @@ -221,8 +221,8 @@ debug_sub_809089C: mov r0, #0x1 b ._17 ._16: - ldr r2, ._19 - ldr r0, ._19 + 4 + ldr r2, ._19 @ gSpecialVar_0x8004 + ldr r0, ._19 + 4 @ gUnknown_Debug_083C4EC0 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -233,7 +233,7 @@ debug_sub_809089C: cmp r0, #0x7 bhi ._27 @cond_branch lsl r0, r0, #0x2 - ldr r1, ._19 + 8 + ldr r1, ._19 + 8 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -253,17 +253,17 @@ debug_sub_809089C: .word ._29 .word ._29 ._29: - ldr r0, ._30 + ldr r0, ._30 @ gSpecialVar_0x8005 mov r1, #0x0 strh r1, [r0] - ldr r0, ._30 + 4 + ldr r0, ._30 + 4 @ gSpecialVar_0x8006 strh r1, [r0] ._27: mov r0, #0x1 mov r1, #0x0 bl FadeScreen - ldr r1, ._30 + 8 - ldr r0, ._30 + 12 + ldr r1, ._30 + 8 @ gMenuCallback + ldr r0, ._30 + 12 @ debug_sub_8090880 str r0, [r1] ._15: mov r0, #0x0 @@ -289,7 +289,7 @@ TayaDebugMenu_SimpleText: mov r2, #0xc mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._32 + ldr r3, ._32 @ gUnknown_Debug_083C4EC0 mov r0, #0x1 mov r1, #0x1 mov r2, #0x9 @@ -303,8 +303,8 @@ TayaDebugMenu_SimpleText: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._32 + 4 - ldr r0, ._32 + 8 + ldr r1, ._32 + 4 @ gMenuCallback + ldr r0, ._32 + 8 @ debug_sub_809089C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -349,11 +349,11 @@ debug_sub_8090984: cmp r1, #0x6 bne ._41 @cond_branch mov r4, #0x0 - ldr r0, ._44 + ldr r0, ._44 @ gSaveBlock1 add r1, r0, #2 mov ip, r1 - ldr r7, ._44 + 4 - ldr r1, ._44 + 8 + ldr r7, ._44 + 4 @ gUnknown_Debug_083C4F08 + ldr r1, ._44 + 8 @ 0xfffffd94 add r6, r0, r1 add r5, r0, #0 add r5, r5, #0xe @@ -412,7 +412,7 @@ TayaDebugMenu_OldMan: mov r2, #0xa mov r3, #0x11 bl Menu_DrawStdWindowFrame - ldr r3, ._48 + ldr r3, ._48 @ gUnknown_Debug_083C4F54 mov r0, #0x1 mov r1, #0x1 mov r2, #0x8 @@ -428,8 +428,8 @@ TayaDebugMenu_OldMan: mov r2, #0x1 mov r3, #0x8 bl InitMenu - ldr r1, ._48 + 4 - ldr r0, ._48 + 8 + ldr r1, ._48 + 4 @ gMenuCallback + ldr r0, ._48 + 8 @ debug_sub_8090984 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -458,89 +458,89 @@ TayaDebugMenu_LanettesPC: thumb_func_start TayaDebugMenu_TownFlags TayaDebugMenu_TownFlags: push {lr} - ldr r0, ._50 + ldr r0, ._50 @ 0x80f bl FlagSet mov r0, #0x81 lsl r0, r0, #0x4 bl FlagSet - ldr r0, ._50 + 4 + ldr r0, ._50 + 4 @ 0x811 bl FlagSet - ldr r0, ._50 + 8 + ldr r0, ._50 + 8 @ 0x812 bl FlagSet - ldr r0, ._50 + 12 + ldr r0, ._50 + 12 @ 0x813 bl FlagSet - ldr r0, ._50 + 16 + ldr r0, ._50 + 16 @ 0x814 bl FlagSet - ldr r0, ._50 + 20 + ldr r0, ._50 + 20 @ 0x815 bl FlagSet - ldr r0, ._50 + 24 + ldr r0, ._50 + 24 @ 0x816 bl FlagSet - ldr r0, ._50 + 28 + ldr r0, ._50 + 28 @ 0x817 bl FlagSet - ldr r0, ._50 + 32 + ldr r0, ._50 + 32 @ 0x818 bl FlagSet - ldr r0, ._50 + 36 + ldr r0, ._50 + 36 @ 0x819 bl FlagSet - ldr r0, ._50 + 40 + ldr r0, ._50 + 40 @ 0x81a bl FlagSet - ldr r0, ._50 + 44 + ldr r0, ._50 + 44 @ 0x81b bl FlagSet - ldr r0, ._50 + 48 + ldr r0, ._50 + 48 @ 0x81c bl FlagSet - ldr r0, ._50 + 52 + ldr r0, ._50 + 52 @ 0x81d bl FlagSet - ldr r0, ._50 + 56 + ldr r0, ._50 + 56 @ 0x81e bl FlagSet - ldr r0, ._50 + 60 + ldr r0, ._50 + 60 @ 0x848 bl FlagSet - ldr r0, ._50 + 64 + ldr r0, ._50 + 64 @ 0x849 bl FlagSet - ldr r0, ._50 + 68 + ldr r0, ._50 + 68 @ 0x84a bl FlagSet - ldr r0, ._50 + 72 + ldr r0, ._50 + 72 @ 0x854 bl FlagSet - ldr r0, ._50 + 76 + ldr r0, ._50 + 76 @ 0x855 bl FlagSet - ldr r0, ._50 + 80 + ldr r0, ._50 + 80 @ 0x856 bl FlagSet - ldr r0, ._50 + 84 + ldr r0, ._50 + 84 @ 0x857 bl FlagSet - ldr r0, ._50 + 88 + ldr r0, ._50 + 88 @ 0x858 bl FlagSet - ldr r0, ._50 + 92 + ldr r0, ._50 + 92 @ 0x859 bl FlagSet - ldr r0, ._50 + 96 + ldr r0, ._50 + 96 @ 0x85a bl FlagSet - ldr r0, ._50 + 100 + ldr r0, ._50 + 100 @ 0x85b bl FlagSet - ldr r0, ._50 + 104 + ldr r0, ._50 + 104 @ 0x85c bl FlagSet - ldr r0, ._50 + 108 + ldr r0, ._50 + 108 @ 0x83c bl FlagSet - ldr r0, ._50 + 112 + ldr r0, ._50 + 112 @ 0x83d bl FlagSet - ldr r0, ._50 + 116 + ldr r0, ._50 + 116 @ 0x83e bl FlagSet - ldr r0, ._50 + 120 + ldr r0, ._50 + 120 @ 0x83f bl FlagSet mov r0, #0x84 lsl r0, r0, #0x4 bl FlagSet - ldr r0, ._50 + 124 + ldr r0, ._50 + 124 @ 0x841 bl FlagSet - ldr r0, ._50 + 128 + ldr r0, ._50 + 128 @ 0x842 bl FlagSet - ldr r0, ._50 + 132 + ldr r0, ._50 + 132 @ 0x843 bl FlagSet - ldr r0, ._50 + 136 + ldr r0, ._50 + 136 @ 0x844 bl FlagSet - ldr r0, ._50 + 140 + ldr r0, ._50 + 140 @ 0x845 bl FlagSet - ldr r0, ._50 + 144 + ldr r0, ._50 + 144 @ 0x846 bl FlagSet - ldr r0, ._50 + 148 + ldr r0, ._50 + 148 @ 0x847 bl FlagSet - ldr r0, ._50 + 152 + ldr r0, ._50 + 152 @ 0x83b bl FlagSet bl CloseMenu mov r0, #0x1 @@ -599,7 +599,7 @@ TayaDebugMenu_AwardARibbon: mov r1, #0x10 mov r2, #0x0 bl BlendPalettes - ldr r0, ._52 + ldr r0, ._52 @ debug_sub_80915BC bl SetMainCallback2 bl CloseMenu mov r0, #0x1 @@ -615,7 +615,7 @@ TayaDebugMenu_AwardARibbon: thumb_func_start debug_sub_8090C44 debug_sub_8090C44: push {r4, r5, lr} - ldr r4, ._54 + ldr r4, ._54 @ gSharedMem sub r5, r4, #1 ldrh r1, [r5, #0x8] add r0, r4, #0 @@ -656,14 +656,14 @@ debug_sub_8090C88: add sp, sp, #0xfffffffc mov r0, #0x1 mov r8, r0 - ldr r2, ._59 + ldr r2, ._59 @ gMain ldrh r1, [r2, #0x2e] mov r0, #0x20 and r0, r0, r1 add r3, r2, #0 cmp r0, #0 beq ._57 @cond_branch - ldr r1, ._59 + 4 + ldr r1, ._59 + 4 @ gSharedMem ldrb r0, [r1] cmp r0, #0 beq ._57 @cond_branch @@ -683,7 +683,7 @@ debug_sub_8090C88: strh r1, [r7, #0x8] b ._62 ._79: - ldr r0, ._64 + ldr r0, ._64 @ gSharedMem ldrh r0, [r0, #0x8] bl SetLotteryNumber16_Unused ._78: @@ -700,7 +700,7 @@ debug_sub_8090C88: and r0, r0, r1 cmp r0, #0 beq ._66 @cond_branch - ldr r1, ._81 + ldr r1, ._81 @ gSharedMem ldrb r0, [r1] cmp r0, #0x3 bls ._67 @cond_branch @@ -710,10 +710,10 @@ debug_sub_8090C88: and r0, r0, r1 cmp r0, #0 beq ._68 @cond_branch - ldr r0, ._81 + ldr r0, ._81 @ gSharedMem ldrh r1, [r0, #0x8] str r1, [r0, #0xc] - ldr r1, ._81 + 4 + ldr r1, ._81 + 4 @ 0x2710 strh r1, [r0, #0x10] mov r4, #0x0 ldrb r1, [r0] @@ -739,7 +739,7 @@ debug_sub_8090C88: ldr r0, [r7, #0xc] add r0, r0, r1 str r0, [r7, #0xc] - ldr r1, ._81 + 8 + ldr r1, ._81 + 8 @ 0xffff cmp r0, r1 ble ._71 @cond_branch str r1, [r7, #0xc] @@ -754,10 +754,10 @@ debug_sub_8090C88: and r0, r0, r1 cmp r0, #0 beq ._73 @cond_branch - ldr r0, ._81 + ldr r0, ._81 @ gSharedMem ldrh r1, [r0, #0x8] str r1, [r0, #0xc] - ldr r1, ._81 + 4 + ldr r1, ._81 + 4 @ 0x2710 strh r1, [r0, #0x10] mov r4, #0x0 ldrb r1, [r0] @@ -837,15 +837,15 @@ TayaDebugMenu_PKMNLottery: mov r3, #0x5 bl Menu_DrawStdWindowFrame bl RetrieveLotteryNumber - ldr r2, ._83 - ldr r0, ._83 + 4 + ldr r2, ._83 @ gSharedMem + ldr r0, ._83 + 4 @ gSpecialVar_Result ldrh r0, [r0] mov r1, #0x0 strh r0, [r2, #0x8] strb r1, [r2] bl debug_sub_8090C44 - ldr r1, ._83 + 8 - ldr r0, ._83 + 12 + ldr r1, ._83 + 8 @ gMenuCallback + ldr r0, ._83 + 12 @ debug_sub_8090C88 str r0, [r1] mov r0, #0x0 pop {r1} @@ -864,7 +864,7 @@ TayaDebugMenu_PKMNLottery: TayaDebugMenu_Trainer: push {r4, r5, lr} mov r4, #0x0 - ldr r5, ._86 + ldr r5, ._86 @ gTrainerEyeTrainers ._85: lsl r0, r4, #0x4 add r0, r0, r5 @@ -875,37 +875,37 @@ TayaDebugMenu_Trainer: lsr r4, r0, #0x10 cmp r4, #0x37 bls ._85 @cond_branch - ldr r0, ._86 + 4 + ldr r0, ._86 + 4 @ 0x109 bl SetTrainerFlag mov r0, #0x85 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 8 + ldr r0, ._86 + 8 @ 0x10b bl SetTrainerFlag mov r0, #0x86 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 12 + ldr r0, ._86 + 12 @ 0x10d bl SetTrainerFlag mov r0, #0x87 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 16 + ldr r0, ._86 + 16 @ 0x10f bl SetTrainerFlag mov r0, #0x88 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 20 + ldr r0, ._86 + 20 @ 0x105 bl SetTrainerFlag mov r0, #0x83 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 24 + ldr r0, ._86 + 24 @ 0x107 bl SetTrainerFlag mov r0, #0x84 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 28 + ldr r0, ._86 + 28 @ 0x14f bl SetTrainerFlag bl CloseMenu mov r0, #0x1 @@ -942,9 +942,9 @@ TayaDebugMenu_PokenavD: mov r1, #0x3 mov r9, r1 ._93: - ldr r4, ._94 + ldr r4, ._94 @ gSharedMem add r0, r4, #0 - ldr r1, ._94 + 4 + ldr r1, ._94 + 4 @ gUnknown_Debug_083C4F94 bl StringCopy mov r5, sl add r5, r5, #0x1 @@ -990,7 +990,7 @@ TayaDebugMenu_PokenavD: add r0, r0, #0x19 lsl r0, r0, #0x10 lsr r3, r0, #0x10 - ldr r0, ._94 + 8 + ldr r0, ._94 + 8 @ 0x19b cmp r3, r0 bls ._89 @cond_branch mov r3, #0x1 @@ -1004,7 +1004,7 @@ TayaDebugMenu_PokenavD: lsl r0, r1, #0x2 add r0, r0, r8 lsl r0, r0, #0x4 - ldr r1, ._94 + 12 + ldr r1, ._94 + 12 @ gPokemonStorage add r0, r0, r1 add r4, r4, r0 lsl r2, r5, #0x18 @@ -1261,9 +1261,9 @@ TayaDebugMenu_8091190: add r0, r0, #0x1 cmp r3, r0 beq ._97 @cond_branch - ldr r2, ._99 - ldr r1, ._99 + 4 - ldr r0, ._99 + 8 + ldr r2, ._99 @ gMenuCallback + ldr r1, ._99 + 4 @ gUnknown_Debug_83C5068 + ldr r0, ._99 + 8 @ unk_2030224 ldrb r0, [r0] lsl r0, r0, #0x18 asr r0, r0, #0x18 @@ -1284,9 +1284,9 @@ TayaDebugMenu_8091190: .word gUnknown_Debug_83C5068 .word unk_2030224 ._96: - ldr r3, ._107 + ldr r3, ._107 @ unk_2030224 ldrb r4, [r3] - ldr r2, ._107 + 4 + ldr r2, ._107 + 4 @ gMain ldrh r1, [r2, #0x2e] mov r0, #0x20 and r0, r0, r1 @@ -1328,7 +1328,7 @@ TayaDebugMenu_8091190: mov r2, #0xb mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r4, ._107 + 8 + ldr r4, ._107 + 8 @ gUnknown_Debug_83C5068 mov r0, #0x0 ldrsb r0, [r5, r0] lsl r0, r0, #0x3 @@ -1373,7 +1373,7 @@ TayaDebugMenu_8091190: InitTayaDebugWindow: push {lr} add sp, sp, #0xfffffff8 - ldr r1, ._109 + ldr r1, ._109 @ unk_2030224 mov r0, #0x0 strb r0, [r1] bl Menu_EraseScreen @@ -1382,7 +1382,7 @@ InitTayaDebugWindow: mov r2, #0xb mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._109 + 4 + ldr r0, ._109 + 4 @ gUnknown_Debug_83C5068 ldr r3, [r0] mov r0, #0x1 mov r1, #0x1 @@ -1397,8 +1397,8 @@ InitTayaDebugWindow: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._109 + 8 - ldr r0, ._109 + 12 + ldr r1, ._109 + 8 @ gMenuCallback + ldr r0, ._109 + 12 @ TayaDebugMenu_8091190 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1417,7 +1417,7 @@ InitTayaDebugWindow: thumb_func_start debug_sub_80912D8 debug_sub_80912D8: push {lr} - ldr r0, ._113 + ldr r0, ._113 @ gPaletteFade ldrb r1, [r0, #0x7] mov r0, #0x80 and r0, r0, r1 @@ -1430,7 +1430,7 @@ debug_sub_80912D8: ._113: .word gPaletteFade ._111: - ldr r0, ._115 + ldr r0, ._115 @ debug_sub_8110F28 bl SetMainCallback2 mov r0, #0x1 ._112: @@ -1449,8 +1449,8 @@ debug_sub_8091300: mov r0, #0x1 mov r1, #0x0 bl FadeScreen - ldr r1, ._117 - ldr r0, ._117 + 4 + ldr r1, ._117 @ gMenuCallback + ldr r0, ._117 + 4 @ debug_sub_80912D8 str r0, [r1] mov r0, #0x0 pop {r1} @@ -1482,7 +1482,7 @@ debug_sub_8091334: push {r6, r7} bl AnimateSprites bl BuildOamBuffer - ldr r3, ._123 + ldr r3, ._123 @ gSharedMem add r0, r3, #0 add r0, r0, #0x52 ldrb r4, [r0] @@ -1501,7 +1501,7 @@ debug_sub_8091334: add r5, r3, #0 add r5, r5, #0x55 strb r4, [r5] - ldr r2, ._131 + ldr r2, ._131 @ gMain ldrh r1, [r2, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -1522,7 +1522,7 @@ debug_sub_8091334: ldrh r1, [r0, #0x2e] mov r0, #0x80 and r0, r0, r1 - ldr r5, ._131 + 4 + ldr r5, ._131 + 4 @ gSharedMem cmp r0, #0 beq ._133 @cond_branch add r0, r5, #0 @@ -1612,7 +1612,7 @@ debug_sub_8091334: and r0, r0, r2 cmp r0, #0 beq ._142 @cond_branch - ldr r2, ._145 + ldr r2, ._145 @ gUnknown_Debug_083C50EC add r3, r5, #0 add r3, r3, #0x53 add r0, r5, #0 @@ -1661,7 +1661,7 @@ debug_sub_8091334: mov r1, #0x10 mov r2, #0x0 bl BlendPalettes - ldr r0, ._151 + ldr r0, ._151 @ sub_80546F0 bl SetMainCallback2 b ._162 ._152: @@ -1673,7 +1673,7 @@ debug_sub_8091334: add r5, r5, #0x55 mov r0, #0x0 strb r0, [r5] - ldr r2, ._159 + ldr r2, ._159 @ gMain ldrh r1, [r2, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -1704,7 +1704,7 @@ debug_sub_8091334: ldrh r1, [r2, #0x2e] mov r0, #0x80 and r0, r0, r1 - ldr r5, ._159 + 4 + ldr r5, ._159 + 4 @ gSharedMem cmp r0, #0 beq ._156 @cond_branch add r2, r5, #0 @@ -1748,8 +1748,8 @@ debug_sub_8091334: and r0, r0, r1 cmp r0, #0 beq ._161 @cond_branch - ldr r0, ._164 - ldr r1, ._164 + 4 + ldr r0, ._164 @ gPlayerParty + ldr r1, ._164 + 4 @ gUnknown_Debug_083C50EC mov ip, r1 mov r2, #0x53 add r2, r2, r6 @@ -1785,7 +1785,7 @@ debug_sub_8091334: and r0, r0, r1 cmp r0, #0 beq ._162 @cond_branch - ldr r2, ._164 + 4 + ldr r2, ._164 + 4 @ gUnknown_Debug_083C50EC add r0, r6, #0 add r0, r0, #0x53 ldrb r4, [r0] @@ -1799,7 +1799,7 @@ debug_sub_8091334: ldrh r0, [r1, #0x4] cmp r0, #0 beq ._163 @cond_branch - ldr r0, ._164 + ldr r0, ._164 @ gPlayerParty ldrh r1, [r1, #0x4] add r2, r4, r6 add r2, r3, r2 @@ -1828,15 +1828,15 @@ debug_sub_80915BC: push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} - ldr r0, ._168 + ldr r0, ._168 @ 0x4000010 mov r1, #0x0 strh r1, [r0] add r0, r0, #0x2 strh r1, [r0] mov r1, #0x0 - ldr r0, ._168 + 4 + ldr r0, ._168 + 4 @ gUnknown_Debug_083C50EC mov r8, r0 - ldr r7, ._168 + 8 + ldr r7, ._168 + 8 @ gSharedMem ._171: mov r4, #0x0 lsl r0, r1, #0x1 @@ -1849,7 +1849,7 @@ debug_sub_80915BC: ldrh r1, [r0, #0x4] cmp r1, #0 beq ._166 @cond_branch - ldr r0, ._168 + 12 + ldr r0, ._168 + 12 @ gPlayerParty bl GetMonData add r1, r4, r5 add r1, r1, r7 @@ -1876,7 +1876,7 @@ debug_sub_80915BC: lsr r1, r0, #0x18 cmp r1, #0x5 bls ._171 @cond_branch - ldr r4, ._172 + ldr r4, ._172 @ gWindowTemplate_81E7224 add r0, r4, #0 bl Text_LoadWindowTemplate add r0, r4, #0 @@ -1887,7 +1887,7 @@ debug_sub_80915BC: mov r2, #0x1d mov r3, #0x3 bl Menu_DrawStdWindowFrame - ldr r0, ._172 + 4 + ldr r0, ._172 + 4 @ gUnknown_Debug_083C517C mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText @@ -1907,7 +1907,7 @@ debug_sub_80915BC: lsl r2, r2, #0x5 add r0, r2, #0 strh r0, [r1] - ldr r2, ._172 + 8 + ldr r2, ._172 + 8 @ gSharedMem add r0, r2, #0 add r0, r0, #0x53 mov r1, #0x0 @@ -1917,9 +1917,9 @@ debug_sub_80915BC: sub r0, r0, #0x2 strb r1, [r0] bl debug_sub_80916AC - ldr r0, ._172 + 12 + ldr r0, ._172 + 12 @ debug_sub_8091320 bl SetVBlankCallback - ldr r0, ._172 + 16 + ldr r0, ._172 + 16 @ debug_sub_8091334 bl SetMainCallback2 pop {r3} mov r8, r3 @@ -1946,12 +1946,12 @@ debug_sub_80916AC: push {r5, r6, r7} add sp, sp, #0xfffffffc mov r6, #0x0 - ldr r0, ._177 + ldr r0, ._177 @ gSharedMem mov sl, r0 mov r1, #0x0 mov r8, r1 ._182: - ldr r2, ._177 + 4 + ldr r2, ._177 + 4 @ gSharedMem mov r5, #0x0 lsl r0, r6, #0x1 mov r9, r0 @@ -1963,7 +1963,7 @@ debug_sub_80916AC: ldrb r0, [r0] cmp r0, r5 bne ._175 @cond_branch - ldr r1, ._177 + 8 + ldr r1, ._177 + 8 @ gSharedMem ldrb r0, [r1] cmp r0, r6 bne ._175 @cond_branch @@ -1986,7 +1986,7 @@ debug_sub_80916AC: add r4, r1, r6 add r0, r4, r5 lsl r0, r0, #0x3 - ldr r1, ._183 + ldr r1, ._183 @ gUnknown_Debug_083C50EC add r0, r0, r1 ldr r1, [r0] add r0, r2, #0 @@ -1995,7 +1995,7 @@ debug_sub_80916AC: mov r0, r8 strb r0, [r2] add r2, r2, #0x1 - ldr r7, ._183 + 4 + ldr r7, ._183 + 4 @ gSharedMem add r4, r5, r4 add r4, r4, r7 ldrb r1, [r4] diff --git a/asm/tomomichi_debug_menu.s b/asm/tomomichi_debug_menu.s index e6e0db8d6..c0dfe38e0 100644 --- a/asm/tomomichi_debug_menu.s +++ b/asm/tomomichi_debug_menu.s @@ -32,12 +32,12 @@ debug_sub_808B874: mov r2, #0xd mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._1 + ldr r3, ._1 @ gUnknown_Debug_083C0CBA mov r0, #0x1 mov r1, #0x1 mov r2, #0x7 bl Menu_PrintItems - ldr r0, ._1 + 4 + ldr r0, ._1 + 4 @ gDebug_0300071D ldrb r0, [r0] str r0, [sp] mov r0, #0xc @@ -47,8 +47,8 @@ debug_sub_808B874: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._1 + 8 - ldr r0, ._1 + 12 + ldr r1, ._1 + 8 @ gMenuCallback + ldr r0, ._1 + 12 @ debug_sub_808B8C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -67,7 +67,7 @@ debug_sub_808B874: thumb_func_start debug_sub_808B8C8 debug_sub_808B8C8: push {r4, lr} - ldr r4, ._7 + ldr r4, ._7 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -78,7 +78,7 @@ debug_sub_808B8C8: mov r0, #0x1 neg r0, r0 bl Menu_MoveCursor - ldr r1, ._7 + 4 + ldr r1, ._7 + 4 @ gDebug_0300071D strb r0, [r1] ._3: ldrh r1, [r4, #0x2e] @@ -90,7 +90,7 @@ debug_sub_808B8C8: bl PlaySE mov r0, #0x1 bl Menu_MoveCursor - ldr r1, ._7 + 4 + ldr r1, ._7 + 4 @ gDebug_0300071D strb r0, [r1] ._4: ldrh r1, [r4, #0x2e] @@ -100,8 +100,8 @@ debug_sub_808B8C8: beq ._5 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._7 + 8 - ldr r0, ._7 + 4 + ldr r1, ._7 + 8 @ gUnknown_Debug_083C0CBA + ldr r0, ._7 + 4 @ gDebug_0300071D ldrb r0, [r0] lsl r0, r0, #0x3 add r1, r1, #0x4 @@ -144,11 +144,11 @@ TomomichiDebugMenu_ContestGraphics: mov r2, #0x14 mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r0, ._11 + ldr r0, ._11 @ gUnknown_Debug_083C0CF4 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._11 + 4 + ldr r3, ._11 + 4 @ gUnknown_Debug_083C0D2C mov r0, #0x2 mov r1, #0x3 mov r2, #0x4 @@ -162,18 +162,18 @@ TomomichiDebugMenu_ContestGraphics: mov r2, #0x3 mov r3, #0x4 bl InitMenu - ldr r1, ._11 + 8 - ldr r0, ._11 + 12 + ldr r1, ._11 + 8 @ gMenuCallback + ldr r0, ._11 + 12 @ debug_sub_808BC48 str r0, [r1] - ldr r0, ._11 + 16 + ldr r0, ._11 + 16 @ gDebug_03000700 mov r2, #0x1 strh r2, [r0] - ldr r1, ._11 + 20 - ldr r0, ._11 + 24 + ldr r1, ._11 + 20 @ gDebug_03000704 + ldr r0, ._11 + 24 @ 0x6f33 str r0, [r1] - ldr r0, ._11 + 28 + ldr r0, ._11 + 28 @ gDebug_03000708 str r4, [r0] - ldr r0, ._11 + 32 + ldr r0, ._11 + 32 @ gDebug_0300070C strb r2, [r0] mov r0, #0x0 add sp, sp, #0x8 @@ -205,11 +205,11 @@ TomomichiDebugMenu_ArtMusGraphics: mov r2, #0x14 mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r0, ._13 + ldr r0, ._13 @ gUnknown_Debug_083C0D4C mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._13 + 4 + ldr r3, ._13 + 4 @ gUnknown_Debug_083C0D83 mov r0, #0x2 mov r1, #0x3 mov r2, #0x4 @@ -223,18 +223,18 @@ TomomichiDebugMenu_ArtMusGraphics: mov r2, #0x3 mov r3, #0x4 bl InitMenu - ldr r1, ._13 + 8 - ldr r0, ._13 + 12 + ldr r1, ._13 + 8 @ gMenuCallback + ldr r0, ._13 + 12 @ debug_sub_808BCBC str r0, [r1] - ldr r0, ._13 + 16 + ldr r0, ._13 + 16 @ gDebug_03000700 mov r2, #0x1 strh r2, [r0] - ldr r1, ._13 + 20 - ldr r0, ._13 + 24 + ldr r1, ._13 + 20 @ gDebug_03000704 + ldr r0, ._13 + 24 @ 0x6f33 str r0, [r1] - ldr r0, ._13 + 28 + ldr r0, ._13 + 28 @ gDebug_03000708 str r4, [r0] - ldr r0, ._13 + 32 + ldr r0, ._13 + 32 @ gDebug_0300070D strb r2, [r0] mov r0, #0x0 add sp, sp, #0x8 @@ -266,11 +266,11 @@ TomomichiDebugMenu_PreviewData: mov r2, #0x14 mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r0, ._15 + ldr r0, ._15 @ gUnknown_Debug_083C0DA4 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._15 + 4 + ldr r3, ._15 + 4 @ gUnknown_Debug_083C0DD4 mov r0, #0x2 mov r1, #0x3 mov r2, #0x4 @@ -284,18 +284,18 @@ TomomichiDebugMenu_PreviewData: mov r2, #0x3 mov r3, #0x4 bl InitMenu - ldr r1, ._15 + 8 - ldr r0, ._15 + 12 + ldr r1, ._15 + 8 @ gMenuCallback + ldr r0, ._15 + 12 @ debug_sub_808BD30 str r0, [r1] - ldr r0, ._15 + 16 + ldr r0, ._15 + 16 @ gDebug_03000700 mov r2, #0x1 strh r2, [r0] - ldr r1, ._15 + 20 - ldr r0, ._15 + 24 + ldr r1, ._15 + 20 @ gDebug_03000704 + ldr r0, ._15 + 24 @ 0x6f33 str r0, [r1] - ldr r0, ._15 + 28 + ldr r0, ._15 + 28 @ gDebug_03000708 str r4, [r0] - ldr r0, ._15 + 32 + ldr r0, ._15 + 32 @ gDebug_0300070E strb r2, [r0] mov r0, #0x0 add sp, sp, #0x8 @@ -327,16 +327,16 @@ TomomichiDebugMenu_TrickHouse: mov r2, #0x18 mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r0, ._17 + ldr r0, ._17 @ gUnknown_Debug_083C0DF4 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._17 + 4 + ldr r3, ._17 + 4 @ gUnknown_Debug_083C0E15 mov r0, #0x2 mov r1, #0x3 mov r2, #0x2 bl Menu_PrintItems - ldr r0, ._17 + 8 + ldr r0, ._17 + 8 @ gDebug_0300071E ldrb r0, [r0] str r0, [sp] mov r0, #0x17 @@ -346,8 +346,8 @@ TomomichiDebugMenu_TrickHouse: mov r2, #0x3 mov r3, #0x2 bl InitMenu - ldr r1, ._17 + 12 - ldr r0, ._17 + 16 + ldr r1, ._17 + 12 @ gMenuCallback + ldr r0, ._17 + 16 @ debug_sub_808BDA4 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -374,12 +374,12 @@ TomomichiDebugMenu_ControlEvents: mov r2, #0x18 mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._19 + ldr r3, ._19 @ gUnknown_Debug_083C0E32 mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 bl Menu_PrintItems - ldr r0, ._19 + 4 + ldr r0, ._19 + 4 @ gDebug_0300071F ldrb r0, [r0] str r0, [sp] mov r0, #0x17 @@ -389,8 +389,8 @@ TomomichiDebugMenu_ControlEvents: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._19 + 8 - ldr r0, ._19 + 12 + ldr r1, ._19 + 8 @ gMenuCallback + ldr r0, ._19 + 12 @ debug_sub_808BE2C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -416,12 +416,12 @@ TomomichiDebugMenu_ControlFlags: mov r2, #0x18 mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._21 + ldr r3, ._21 @ gUnknown_Debug_083C0E7F mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 bl Menu_PrintItems - ldr r0, ._21 + 4 + ldr r0, ._21 + 4 @ gDebug_03000720 ldrb r0, [r0] str r0, [sp] mov r0, #0x17 @@ -431,8 +431,8 @@ TomomichiDebugMenu_ControlFlags: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._21 + 8 - ldr r0, ._21 + 12 + ldr r1, ._21 + 8 @ gMenuCallback + ldr r0, ._21 + 12 @ debug_sub_808BEB4 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -458,12 +458,12 @@ TomomichiDebugMenu_ControlWorks: mov r2, #0x18 mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._23 + ldr r3, ._23 @ gUnknown_Debug_083C0EF1 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 bl Menu_PrintItems - ldr r0, ._23 + 4 + ldr r0, ._23 + 4 @ gDebug_03000721 ldrb r0, [r0] str r0, [sp] mov r0, #0x17 @@ -473,8 +473,8 @@ TomomichiDebugMenu_ControlWorks: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._23 + 8 - ldr r0, ._23 + 12 + ldr r1, ._23 + 8 @ gMenuCallback + ldr r0, ._23 + 12 @ debug_sub_808BF3C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -537,8 +537,8 @@ debug_sub_808BC48: ._34: cmp r1, #0x3 bne ._36 @cond_branch - ldr r0, ._37 - ldr r1, ._37 + 4 + ldr r0, ._37 @ gMenuCallback + ldr r1, ._37 + 4 @ gUnknown_Debug_083C0D2C ldr r1, [r1, #0x1c] str r1, [r0] ._36: @@ -602,8 +602,8 @@ debug_sub_808BCBC: ._48: cmp r1, #0x3 bne ._50 @cond_branch - ldr r0, ._51 - ldr r1, ._51 + 4 + ldr r0, ._51 @ gMenuCallback + ldr r1, ._51 + 4 @ gUnknown_Debug_083C0D83 ldr r1, [r1, #0x1c] str r1, [r0] ._50: @@ -667,8 +667,8 @@ debug_sub_808BD30: ._62: cmp r1, #0x3 bne ._64 @cond_branch - ldr r0, ._65 - ldr r1, ._65 + 4 + ldr r0, ._65 @ gMenuCallback + ldr r1, ._65 + 4 @ gUnknown_Debug_083C0DD4 ldr r1, [r1, #0x1c] str r1, [r0] ._64: @@ -688,7 +688,7 @@ debug_sub_808BD30: thumb_func_start debug_sub_808BDA4 debug_sub_808BDA4: push {r4, lr} - ldr r4, ._71 + ldr r4, ._71 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -699,7 +699,7 @@ debug_sub_808BDA4: mov r0, #0x1 neg r0, r0 bl Menu_MoveCursor - ldr r1, ._71 + 4 + ldr r1, ._71 + 4 @ gDebug_0300071E strb r0, [r1] ._67: ldrh r1, [r4, #0x2e] @@ -711,7 +711,7 @@ debug_sub_808BDA4: bl PlaySE mov r0, #0x1 bl Menu_MoveCursor - ldr r1, ._71 + 4 + ldr r1, ._71 + 4 @ gDebug_0300071E strb r0, [r1] ._68: ldrh r1, [r4, #0x2e] @@ -721,8 +721,8 @@ debug_sub_808BDA4: beq ._69 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._71 + 8 - ldr r0, ._71 + 4 + ldr r1, ._71 + 8 @ gUnknown_Debug_083C0E15 + ldr r0, ._71 + 4 @ gDebug_0300071E ldrb r0, [r0] lsl r0, r0, #0x3 add r1, r1, #0x4 @@ -758,7 +758,7 @@ debug_sub_808BDA4: thumb_func_start debug_sub_808BE2C debug_sub_808BE2C: push {r4, lr} - ldr r4, ._79 + ldr r4, ._79 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -769,7 +769,7 @@ debug_sub_808BE2C: mov r0, #0x1 neg r0, r0 bl Menu_MoveCursor - ldr r1, ._79 + 4 + ldr r1, ._79 + 4 @ gDebug_0300071F strb r0, [r1] ._75: ldrh r1, [r4, #0x2e] @@ -781,7 +781,7 @@ debug_sub_808BE2C: bl PlaySE mov r0, #0x1 bl Menu_MoveCursor - ldr r1, ._79 + 4 + ldr r1, ._79 + 4 @ gDebug_0300071F strb r0, [r1] ._76: ldrh r1, [r4, #0x2e] @@ -791,8 +791,8 @@ debug_sub_808BE2C: beq ._77 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._79 + 8 - ldr r0, ._79 + 4 + ldr r1, ._79 + 8 @ gUnknown_Debug_083C0E32 + ldr r0, ._79 + 4 @ gDebug_0300071F ldrb r0, [r0] lsl r0, r0, #0x3 add r1, r1, #0x4 @@ -828,7 +828,7 @@ debug_sub_808BE2C: thumb_func_start debug_sub_808BEB4 debug_sub_808BEB4: push {r4, lr} - ldr r4, ._87 + ldr r4, ._87 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -839,7 +839,7 @@ debug_sub_808BEB4: mov r0, #0x1 neg r0, r0 bl Menu_MoveCursor - ldr r1, ._87 + 4 + ldr r1, ._87 + 4 @ gDebug_03000720 strb r0, [r1] ._83: ldrh r1, [r4, #0x2e] @@ -851,7 +851,7 @@ debug_sub_808BEB4: bl PlaySE mov r0, #0x1 bl Menu_MoveCursor - ldr r1, ._87 + 4 + ldr r1, ._87 + 4 @ gDebug_03000720 strb r0, [r1] ._84: ldrh r1, [r4, #0x2e] @@ -861,8 +861,8 @@ debug_sub_808BEB4: beq ._85 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._87 + 8 - ldr r0, ._87 + 4 + ldr r1, ._87 + 8 @ gUnknown_Debug_083C0E7F + ldr r0, ._87 + 4 @ gDebug_03000720 ldrb r0, [r0] lsl r0, r0, #0x3 add r1, r1, #0x4 @@ -898,7 +898,7 @@ debug_sub_808BEB4: thumb_func_start debug_sub_808BF3C debug_sub_808BF3C: push {r4, lr} - ldr r4, ._95 + ldr r4, ._95 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -909,7 +909,7 @@ debug_sub_808BF3C: mov r0, #0x1 neg r0, r0 bl Menu_MoveCursor - ldr r1, ._95 + 4 + ldr r1, ._95 + 4 @ gDebug_03000721 strb r0, [r1] ._91: ldrh r1, [r4, #0x2e] @@ -921,7 +921,7 @@ debug_sub_808BF3C: bl PlaySE mov r0, #0x1 bl Menu_MoveCursor - ldr r1, ._95 + 4 + ldr r1, ._95 + 4 @ gDebug_03000721 strb r0, [r1] ._92: ldrh r1, [r4, #0x2e] @@ -931,8 +931,8 @@ debug_sub_808BF3C: beq ._93 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._95 + 8 - ldr r0, ._95 + 4 + ldr r1, ._95 + 8 @ gUnknown_Debug_083C0EF1 + ldr r0, ._95 + 4 @ gDebug_03000721 ldrb r0, [r0] lsl r0, r0, #0x3 add r1, r1, #0x4 @@ -975,7 +975,7 @@ debug_sub_808BFC4: mov r2, #0x1c mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._99 + ldr r3, ._99 @ gUnknown_Debug_083C0F79 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -989,8 +989,8 @@ debug_sub_808BFC4: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._99 + 4 - ldr r0, ._99 + 8 + ldr r1, ._99 + 4 @ gMenuCallback + ldr r0, ._99 + 8 @ debug_sub_808C064 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1015,7 +1015,7 @@ debug_sub_808C014: mov r2, #0x1c mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._101 + ldr r3, ._101 @ gUnknown_Debug_083C0FFC mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -1029,8 +1029,8 @@ debug_sub_808C014: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._101 + 4 - ldr r0, ._101 + 8 + ldr r1, ._101 + 4 @ gMenuCallback + ldr r0, ._101 + 8 @ debug_sub_808C0A8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1062,8 +1062,8 @@ debug_sub_808C064: neg r0, r0 cmp r1, r0 beq ._105 @cond_branch - ldr r2, ._107 - ldr r0, ._107 + 4 + ldr r2, ._107 @ gMenuCallback + ldr r0, ._107 + 4 @ gUnknown_Debug_083C0F79 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -1102,8 +1102,8 @@ debug_sub_808C0A8: neg r0, r0 cmp r1, r0 beq ._111 @cond_branch - ldr r2, ._113 - ldr r0, ._113 + 4 + ldr r2, ._113 @ gMenuCallback + ldr r0, ._113 + 4 @ gUnknown_Debug_083C0FFC lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -1128,7 +1128,7 @@ debug_sub_808C0A8: thumb_func_start debug_sub_808C0EC debug_sub_808C0EC: push {lr} - ldr r0, ._115 + ldr r0, ._115 @ DebugScript_081C1CFE bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1144,7 +1144,7 @@ debug_sub_808C0EC: thumb_func_start debug_sub_808C104 debug_sub_808C104: push {lr} - ldr r0, ._117 + ldr r0, ._117 @ DebugScript_081C1D07 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1160,7 +1160,7 @@ debug_sub_808C104: thumb_func_start debug_sub_808C11C debug_sub_808C11C: push {lr} - ldr r0, ._119 + ldr r0, ._119 @ DebugScript_081C1D1E bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1176,7 +1176,7 @@ debug_sub_808C11C: thumb_func_start debug_sub_808C134 debug_sub_808C134: push {lr} - ldr r0, ._121 + ldr r0, ._121 @ DebugScript_081C1D24 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1192,7 +1192,7 @@ debug_sub_808C134: thumb_func_start debug_sub_808C14C debug_sub_808C14C: push {lr} - ldr r0, ._123 + ldr r0, ._123 @ DebugScript_081C1D2A bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1208,7 +1208,7 @@ debug_sub_808C14C: thumb_func_start debug_sub_808C164 debug_sub_808C164: push {lr} - ldr r0, ._125 + ldr r0, ._125 @ DebugScript_081C1D35 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1224,7 +1224,7 @@ debug_sub_808C164: thumb_func_start debug_sub_808C17C debug_sub_808C17C: push {lr} - ldr r0, ._127 + ldr r0, ._127 @ DebugScript_081C1D46 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1240,7 +1240,7 @@ debug_sub_808C17C: thumb_func_start debug_sub_808C194 debug_sub_808C194: push {lr} - ldr r0, ._129 + ldr r0, ._129 @ DebugScript_081C221F bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1256,7 +1256,7 @@ debug_sub_808C194: thumb_func_start debug_sub_808C1AC debug_sub_808C1AC: push {lr} - ldr r0, ._131 + ldr r0, ._131 @ DebugScript_081C23E2 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1272,7 +1272,7 @@ debug_sub_808C1AC: thumb_func_start debug_sub_808C1C4 debug_sub_808C1C4: push {lr} - ldr r0, ._133 + ldr r0, ._133 @ DebugScript_081C23E6 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1288,7 +1288,7 @@ debug_sub_808C1C4: thumb_func_start debug_sub_808C1DC debug_sub_808C1DC: push {lr} - ldr r0, ._135 + ldr r0, ._135 @ DebugScript_081C23F6 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1304,7 +1304,7 @@ debug_sub_808C1DC: thumb_func_start debug_sub_808C1F4 debug_sub_808C1F4: push {lr} - ldr r0, ._137 + ldr r0, ._137 @ DebugScript_081C2482 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1320,7 +1320,7 @@ debug_sub_808C1F4: thumb_func_start debug_sub_808C20C debug_sub_808C20C: push {lr} - ldr r0, ._139 + ldr r0, ._139 @ DebugScript_081C23FD bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1336,7 +1336,7 @@ debug_sub_808C20C: thumb_func_start debug_sub_808C224 debug_sub_808C224: push {lr} - ldr r0, ._141 + ldr r0, ._141 @ DebugScript_081C2518 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1352,7 +1352,7 @@ debug_sub_808C224: thumb_func_start debug_sub_808C23C debug_sub_808C23C: push {lr} - ldr r0, ._143 + ldr r0, ._143 @ DebugScript_081C2507 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1376,8 +1376,8 @@ TomomichiDebugMenu_ContestGraphics_Show: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r1, ._145 - ldr r0, ._145 + 4 + ldr r1, ._145 @ gMenuCallback + ldr r0, ._145 + 4 @ debug_sub_808C280 str r0, [r1] mov r0, #0x0 add sp, sp, #0x4 @@ -1404,10 +1404,10 @@ debug_sub_808C280: bl CloseMenu mov r0, #0x0 bl debug_sub_808F168 - ldr r0, ._149 + ldr r0, ._149 @ CB2_ContestPainting bl SetMainCallback2 - ldr r1, ._149 + 4 - ldr r0, ._149 + 8 + ldr r1, ._149 + 4 @ gMain + ldr r0, ._149 + 8 @ debug_sub_808B868 str r0, [r1, #0x8] mov r0, #0x1 ._148: @@ -1433,8 +1433,8 @@ TomomichiDebugMenu_MuseumGraphics_Show: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r1, ._151 - ldr r0, ._151 + 4 + ldr r1, ._151 @ gMenuCallback + ldr r0, ._151 + 4 @ debug_sub_808C2E4 str r0, [r1] mov r0, #0x0 add sp, sp, #0x4 @@ -1461,10 +1461,10 @@ debug_sub_808C2E4: bl CloseMenu mov r0, #0x1 bl debug_sub_808F168 - ldr r0, ._155 + ldr r0, ._155 @ CB2_ContestPainting bl SetMainCallback2 - ldr r1, ._155 + 4 - ldr r0, ._155 + 8 + ldr r1, ._155 + 4 @ gMain + ldr r0, ._155 + 8 @ debug_sub_808B868 str r0, [r1, #0x8] mov r0, #0x1 ._154: @@ -1489,7 +1489,7 @@ debug_sub_808C31C: mov r2, #0x1c mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._157 + ldr r3, ._157 @ gUnknown_Debug_083C2828 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1503,8 +1503,8 @@ debug_sub_808C31C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._157 + 4 - ldr r0, ._157 + 8 + ldr r1, ._157 + 4 @ gMenuCallback + ldr r0, ._157 + 8 @ debug_sub_808C36C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1536,8 +1536,8 @@ debug_sub_808C36C: neg r0, r0 cmp r1, r0 beq ._161 @cond_branch - ldr r2, ._163 - ldr r0, ._163 + 4 + ldr r2, ._163 @ gMenuCallback + ldr r0, ._163 + 4 @ gUnknown_Debug_083C2828 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -1569,7 +1569,7 @@ debug_sub_808C3B0: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._165 + ldr r3, ._165 @ gUnknown_Debug_083C2938 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1583,10 +1583,10 @@ debug_sub_808C3B0: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._165 + 4 + ldr r0, ._165 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._165 + 8 - ldr r0, ._165 + 12 + ldr r1, ._165 + 8 @ gMenuCallback + ldr r0, ._165 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1613,7 +1613,7 @@ debug_sub_808C408: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._167 + ldr r3, ._167 @ gUnknown_Debug_083C2A48 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1627,11 +1627,11 @@ debug_sub_808C408: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._167 + 4 + ldr r1, ._167 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._167 + 8 - ldr r0, ._167 + 12 + ldr r1, ._167 + 8 @ gMenuCallback + ldr r0, ._167 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1657,7 +1657,7 @@ debug_sub_808C460: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._169 + ldr r3, ._169 @ gUnknown_Debug_083C2B4C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1671,11 +1671,11 @@ debug_sub_808C460: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._169 + 4 + ldr r1, ._169 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._169 + 8 - ldr r0, ._169 + 12 + ldr r1, ._169 + 8 @ gMenuCallback + ldr r0, ._169 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1701,7 +1701,7 @@ debug_sub_808C4B8: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._171 + ldr r3, ._171 @ gUnknown_Debug_083C2C80 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1715,11 +1715,11 @@ debug_sub_808C4B8: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._171 + 4 + ldr r1, ._171 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._171 + 8 - ldr r0, ._171 + 12 + ldr r1, ._171 + 8 @ gMenuCallback + ldr r0, ._171 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1745,7 +1745,7 @@ debug_sub_808C510: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._173 + ldr r3, ._173 @ gUnknown_Debug_083C2D8C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1759,11 +1759,11 @@ debug_sub_808C510: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._173 + 4 + ldr r1, ._173 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._173 + 8 - ldr r0, ._173 + 12 + ldr r1, ._173 + 8 @ gMenuCallback + ldr r0, ._173 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1789,7 +1789,7 @@ debug_sub_808C568: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._175 + ldr r3, ._175 @ gUnknown_Debug_083C2EB0 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1803,11 +1803,11 @@ debug_sub_808C568: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._175 + 4 + ldr r1, ._175 + 4 @ gDebug_0300070F mov r0, #0x5 strb r0, [r1] - ldr r1, ._175 + 8 - ldr r0, ._175 + 12 + ldr r1, ._175 + 8 @ gMenuCallback + ldr r0, ._175 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1833,7 +1833,7 @@ debug_sub_808C5C0: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._177 + ldr r3, ._177 @ gUnknown_Debug_083C2FE0 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1847,11 +1847,11 @@ debug_sub_808C5C0: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._177 + 4 + ldr r1, ._177 + 4 @ gDebug_0300070F mov r0, #0x6 strb r0, [r1] - ldr r1, ._177 + 8 - ldr r0, ._177 + 12 + ldr r1, ._177 + 8 @ gMenuCallback + ldr r0, ._177 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1877,7 +1877,7 @@ debug_sub_808C618: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._179 + ldr r3, ._179 @ gUnknown_Debug_083C3100 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1891,11 +1891,11 @@ debug_sub_808C618: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._179 + 4 + ldr r1, ._179 + 4 @ gDebug_0300070F mov r0, #0x7 strb r0, [r1] - ldr r1, ._179 + 8 - ldr r0, ._179 + 12 + ldr r1, ._179 + 8 @ gMenuCallback + ldr r0, ._179 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1921,7 +1921,7 @@ debug_sub_808C670: mov r2, #0x1d mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r3, ._181 + ldr r3, ._181 @ gUnknown_Debug_083C3194 mov r0, #0x2 mov r1, #0x1 mov r2, #0x3 @@ -1935,11 +1935,11 @@ debug_sub_808C670: mov r2, #0x1 mov r3, #0x3 bl InitMenu - ldr r1, ._181 + 4 + ldr r1, ._181 + 4 @ gDebug_0300070F mov r0, #0x8 strb r0, [r1] - ldr r1, ._181 + 8 - ldr r0, ._181 + 12 + ldr r1, ._181 + 8 @ gMenuCallback + ldr r0, ._181 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1964,7 +1964,7 @@ debug_sub_808C6C8: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._186 + ldr r5, ._186 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -2005,14 +2005,14 @@ debug_sub_808C714: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._191 + ldr r0, ._191 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._190 @cond_branch - ldr r0, ._191 + 4 + ldr r0, ._191 + 4 @ gUnknown_Debug_83C31E6 lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -2050,12 +2050,12 @@ debug_sub_808C764: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._195 + ldr r0, ._195 @ gUnknown_Debug_083C31DC add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._193 @cond_branch - ldr r0, ._195 + 4 + ldr r0, ._195 + 4 @ gUnknown_Debug_83C31E6 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -2107,7 +2107,7 @@ debug_sub_808C7C8: mov r2, #0x1c mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._197 + ldr r3, ._197 @ gUnknown_Debug_083C1CE8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2121,8 +2121,8 @@ debug_sub_808C7C8: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._197 + 4 - ldr r0, ._197 + 8 + ldr r1, ._197 + 4 @ gMenuCallback + ldr r0, ._197 + 8 @ debug_sub_808C818 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2154,8 +2154,8 @@ debug_sub_808C818: neg r0, r0 cmp r1, r0 beq ._201 @cond_branch - ldr r2, ._203 - ldr r0, ._203 + 4 + ldr r2, ._203 @ gMenuCallback + ldr r0, ._203 + 4 @ gUnknown_Debug_083C1CE8 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -2187,7 +2187,7 @@ debug_sub_808C85C: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._205 + ldr r3, ._205 @ gUnknown_Debug_083C1E0C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2201,10 +2201,10 @@ debug_sub_808C85C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._205 + 4 + ldr r0, ._205 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._205 + 8 - ldr r0, ._205 + 12 + ldr r1, ._205 + 8 @ gMenuCallback + ldr r0, ._205 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2231,7 +2231,7 @@ debug_sub_808C8B4: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._207 + ldr r3, ._207 @ gUnknown_Debug_083C1F38 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2245,11 +2245,11 @@ debug_sub_808C8B4: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._207 + 4 + ldr r1, ._207 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._207 + 8 - ldr r0, ._207 + 12 + ldr r1, ._207 + 8 @ gMenuCallback + ldr r0, ._207 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2275,7 +2275,7 @@ debug_sub_808C90C: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._209 + ldr r3, ._209 @ gUnknown_Debug_083C206C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2289,11 +2289,11 @@ debug_sub_808C90C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._209 + 4 + ldr r1, ._209 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._209 + 8 - ldr r0, ._209 + 12 + ldr r1, ._209 + 8 @ gMenuCallback + ldr r0, ._209 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2319,7 +2319,7 @@ debug_sub_808C964: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._211 + ldr r3, ._211 @ gUnknown_Debug_083C2190 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2333,11 +2333,11 @@ debug_sub_808C964: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._211 + 4 + ldr r1, ._211 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._211 + 8 - ldr r0, ._211 + 12 + ldr r1, ._211 + 8 @ gMenuCallback + ldr r0, ._211 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2363,7 +2363,7 @@ debug_sub_808C9BC: mov r2, #0x1d mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._213 + ldr r3, ._213 @ gUnknown_Debug_083C2264 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -2377,11 +2377,11 @@ debug_sub_808C9BC: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._213 + 4 + ldr r1, ._213 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._213 + 8 - ldr r0, ._213 + 12 + ldr r1, ._213 + 8 @ gMenuCallback + ldr r0, ._213 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2407,7 +2407,7 @@ debug_sub_808CA14: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._215 + ldr r3, ._215 @ gUnknown_Debug_083C2370 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2421,11 +2421,11 @@ debug_sub_808CA14: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._215 + 4 + ldr r1, ._215 + 4 @ gDebug_0300070F mov r0, #0x5 strb r0, [r1] - ldr r1, ._215 + 8 - ldr r0, ._215 + 12 + ldr r1, ._215 + 8 @ gMenuCallback + ldr r0, ._215 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2451,7 +2451,7 @@ debug_sub_808CA6C: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._217 + ldr r3, ._217 @ gUnknown_Debug_083C248C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2465,11 +2465,11 @@ debug_sub_808CA6C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._217 + 4 + ldr r1, ._217 + 4 @ gDebug_0300070F mov r0, #0x6 strb r0, [r1] - ldr r1, ._217 + 8 - ldr r0, ._217 + 12 + ldr r1, ._217 + 8 @ gMenuCallback + ldr r0, ._217 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2495,7 +2495,7 @@ debug_sub_808CAC4: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._219 + ldr r3, ._219 @ gUnknown_Debug_083C259C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2509,11 +2509,11 @@ debug_sub_808CAC4: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._219 + 4 + ldr r1, ._219 + 4 @ gDebug_0300070F mov r0, #0x7 strb r0, [r1] - ldr r1, ._219 + 8 - ldr r0, ._219 + 12 + ldr r1, ._219 + 8 @ gMenuCallback + ldr r0, ._219 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2539,7 +2539,7 @@ debug_sub_808CB1C: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._221 + ldr r3, ._221 @ gUnknown_Debug_083C26C8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2553,11 +2553,11 @@ debug_sub_808CB1C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._221 + 4 + ldr r1, ._221 + 4 @ gDebug_0300070F mov r0, #0x8 strb r0, [r1] - ldr r1, ._221 + 8 - ldr r0, ._221 + 12 + ldr r1, ._221 + 8 @ gMenuCallback + ldr r0, ._221 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2582,7 +2582,7 @@ debug_sub_808CB74: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._226 + ldr r5, ._226 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -2623,14 +2623,14 @@ debug_sub_808CBC0: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._231 + ldr r0, ._231 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._230 @cond_branch - ldr r0, ._231 + 4 + ldr r0, ._231 + 4 @ gUnknown_Debug_083C271A lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -2668,12 +2668,12 @@ debug_sub_808CC10: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._235 + ldr r0, ._235 @ gUnknown_Debug_083C2710 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._233 @cond_branch - ldr r0, ._235 + 4 + ldr r0, ._235 + 4 @ gUnknown_Debug_083C271A mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -2725,7 +2725,7 @@ debug_sub_808CC74: mov r2, #0x1c mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r3, ._237 + ldr r3, ._237 @ gUnknown_Debug_083C1ADC mov r0, #0x2 mov r1, #0x1 mov r2, #0x3 @@ -2739,8 +2739,8 @@ debug_sub_808CC74: mov r2, #0x1 mov r3, #0x3 bl InitMenu - ldr r1, ._237 + 4 - ldr r0, ._237 + 8 + ldr r1, ._237 + 4 @ gMenuCallback + ldr r0, ._237 + 8 @ debug_sub_808CCC4 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2772,8 +2772,8 @@ debug_sub_808CCC4: neg r0, r0 cmp r1, r0 beq ._241 @cond_branch - ldr r2, ._243 - ldr r0, ._243 + 4 + ldr r2, ._243 @ gMenuCallback + ldr r0, ._243 + 4 @ gUnknown_Debug_083C1ADC lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -2805,7 +2805,7 @@ debug_sub_808CD08: mov r2, #0x1d mov r3, #0x11 bl Menu_DrawStdWindowFrame - ldr r3, ._245 + ldr r3, ._245 @ gUnknown_Debug_083C1B7C mov r0, #0x2 mov r1, #0x1 mov r2, #0x8 @@ -2819,10 +2819,10 @@ debug_sub_808CD08: mov r2, #0x1 mov r3, #0x8 bl InitMenu - ldr r0, ._245 + 4 + ldr r0, ._245 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._245 + 8 - ldr r0, ._245 + 12 + ldr r1, ._245 + 8 @ gMenuCallback + ldr r0, ._245 + 12 @ debug_sub_808CE10 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2849,7 +2849,7 @@ debug_sub_808CD60: mov r2, #0x1d mov r3, #0x9 bl Menu_DrawStdWindowFrame - ldr r3, ._247 + ldr r3, ._247 @ gUnknown_Debug_083C1BF0 mov r0, #0x2 mov r1, #0x1 mov r2, #0x4 @@ -2863,11 +2863,11 @@ debug_sub_808CD60: mov r2, #0x1 mov r3, #0x4 bl InitMenu - ldr r1, ._247 + 4 + ldr r1, ._247 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._247 + 8 - ldr r0, ._247 + 12 + ldr r1, ._247 + 8 @ gMenuCallback + ldr r0, ._247 + 12 @ debug_sub_808CE10 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2893,7 +2893,7 @@ debug_sub_808CDB8: mov r2, #0x1d mov r3, #0x3 bl Menu_DrawStdWindowFrame - ldr r3, ._249 + ldr r3, ._249 @ gUnknown_Debug_083C1C2C mov r0, #0x2 mov r1, #0x1 mov r2, #0x1 @@ -2907,11 +2907,11 @@ debug_sub_808CDB8: mov r2, #0x1 mov r3, #0x1 bl InitMenu - ldr r1, ._249 + 4 + ldr r1, ._249 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._249 + 8 - ldr r0, ._249 + 12 + ldr r1, ._249 + 8 @ gMenuCallback + ldr r0, ._249 + 12 @ debug_sub_808CE10 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2936,7 +2936,7 @@ debug_sub_808CE10: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._254 + ldr r5, ._254 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -2977,14 +2977,14 @@ debug_sub_808CE5C: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._259 + ldr r0, ._259 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._258 @cond_branch - ldr r0, ._259 + 4 + ldr r0, ._259 + 4 @ gUnknown_Debug_083C1C38 lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -3022,12 +3022,12 @@ debug_sub_808CEAC: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._263 + ldr r0, ._263 @ gUnknown_Debug_083C1C34 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._261 @cond_branch - ldr r0, ._263 + 4 + ldr r0, ._263 + 4 @ gUnknown_Debug_083C1C38 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -3079,7 +3079,7 @@ debug_sub_808CF10: mov r2, #0x1c mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._265 + ldr r3, ._265 @ gUnknown_Debug_083C1330 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3093,8 +3093,8 @@ debug_sub_808CF10: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._265 + 4 - ldr r0, ._265 + 8 + ldr r1, ._265 + 4 @ gMenuCallback + ldr r0, ._265 + 8 @ debug_sub_808CF60 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3126,8 +3126,8 @@ debug_sub_808CF60: neg r0, r0 cmp r1, r0 beq ._269 @cond_branch - ldr r2, ._271 - ldr r0, ._271 + 4 + ldr r2, ._271 @ gMenuCallback + ldr r0, ._271 + 4 @ gUnknown_Debug_083C1330 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -3159,7 +3159,7 @@ debug_sub_808CFA4: mov r2, #0x1d mov r3, #0x11 bl Menu_DrawStdWindowFrame - ldr r3, ._273 + ldr r3, ._273 @ gUnknown_Debug_083C13D8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x8 @@ -3173,10 +3173,10 @@ debug_sub_808CFA4: mov r2, #0x1 mov r3, #0x8 bl InitMenu - ldr r0, ._273 + 4 + ldr r0, ._273 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._273 + 8 - ldr r0, ._273 + 12 + ldr r1, ._273 + 8 @ gMenuCallback + ldr r0, ._273 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3203,7 +3203,7 @@ debug_sub_808CFFC: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._275 + ldr r3, ._275 @ gUnknown_Debug_083C1465 mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -3217,11 +3217,11 @@ debug_sub_808CFFC: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._275 + 4 + ldr r1, ._275 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._275 + 8 - ldr r0, ._275 + 12 + ldr r1, ._275 + 8 @ gMenuCallback + ldr r0, ._275 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3247,7 +3247,7 @@ debug_sub_808D054: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._277 + ldr r3, ._277 @ gUnknown_Debug_083C1503 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3261,11 +3261,11 @@ debug_sub_808D054: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._277 + 4 + ldr r1, ._277 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._277 + 8 - ldr r0, ._277 + 12 + ldr r1, ._277 + 8 @ gMenuCallback + ldr r0, ._277 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3291,7 +3291,7 @@ debug_sub_808D0AC: mov r2, #0x1d mov r3, #0x9 bl Menu_DrawStdWindowFrame - ldr r3, ._279 + ldr r3, ._279 @ gUnknown_Debug_083C158A mov r0, #0x2 mov r1, #0x1 mov r2, #0x4 @@ -3305,11 +3305,11 @@ debug_sub_808D0AC: mov r2, #0x1 mov r3, #0x4 bl InitMenu - ldr r1, ._279 + 4 + ldr r1, ._279 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._279 + 8 - ldr r0, ._279 + 12 + ldr r1, ._279 + 8 @ gMenuCallback + ldr r0, ._279 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3335,7 +3335,7 @@ debug_sub_808D104: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._281 + ldr r3, ._281 @ gUnknown_Debug_083C1647 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3349,11 +3349,11 @@ debug_sub_808D104: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._281 + 4 + ldr r1, ._281 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._281 + 8 - ldr r0, ._281 + 12 + ldr r1, ._281 + 8 @ gMenuCallback + ldr r0, ._281 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3379,7 +3379,7 @@ debug_sub_808D15C: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._283 + ldr r3, ._283 @ gUnknown_Debug_083C1712 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3393,11 +3393,11 @@ debug_sub_808D15C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._283 + 4 + ldr r1, ._283 + 4 @ gDebug_0300070F mov r0, #0x5 strb r0, [r1] - ldr r1, ._283 + 8 - ldr r0, ._283 + 12 + ldr r1, ._283 + 8 @ gMenuCallback + ldr r0, ._283 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3423,7 +3423,7 @@ debug_sub_808D1B4: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._285 + ldr r3, ._285 @ gUnknown_Debug_083C17F8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3437,11 +3437,11 @@ debug_sub_808D1B4: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._285 + 4 + ldr r1, ._285 + 4 @ gDebug_0300070F mov r0, #0x6 strb r0, [r1] - ldr r1, ._285 + 8 - ldr r0, ._285 + 12 + ldr r1, ._285 + 8 @ gMenuCallback + ldr r0, ._285 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3467,7 +3467,7 @@ debug_sub_808D20C: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._287 + ldr r3, ._287 @ gUnknown_Debug_083C18B8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -3481,11 +3481,11 @@ debug_sub_808D20C: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._287 + 4 + ldr r1, ._287 + 4 @ gDebug_0300070F mov r0, #0x7 strb r0, [r1] - ldr r1, ._287 + 8 - ldr r0, ._287 + 12 + ldr r1, ._287 + 8 @ gMenuCallback + ldr r0, ._287 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3511,7 +3511,7 @@ debug_sub_808D264: mov r2, #0x1d mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r3, ._289 + ldr r3, ._289 @ gDebug_0x83C1974 mov r0, #0x2 mov r1, #0x1 mov r2, #0x5 @@ -3525,11 +3525,11 @@ debug_sub_808D264: mov r2, #0x1 mov r3, #0x5 bl InitMenu - ldr r1, ._289 + 4 + ldr r1, ._289 + 4 @ gDebug_0300070F mov r0, #0x8 strb r0, [r1] - ldr r1, ._289 + 8 - ldr r0, ._289 + 12 + ldr r1, ._289 + 8 @ gMenuCallback + ldr r0, ._289 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3554,7 +3554,7 @@ debug_sub_808D2BC: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._294 + ldr r5, ._294 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -3595,14 +3595,14 @@ debug_sub_808D308: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._299 + ldr r0, ._299 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._298 @cond_branch - ldr r0, ._299 + 4 + ldr r0, ._299 + 4 @ gUnknown_Debug_083C19C6 lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -3640,12 +3640,12 @@ debug_sub_808D358: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._303 + ldr r0, ._303 @ gUnknown_Debug_083C19BC add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._301 @cond_branch - ldr r0, ._303 + 4 + ldr r0, ._303 + 4 @ gUnknown_Debug_083C19C6 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -3697,7 +3697,7 @@ debug_sub_808D3BC: mov r2, #0x1c mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._305 + ldr r3, ._305 @ gUnknown_Debug_083C105C mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -3711,8 +3711,8 @@ debug_sub_808D3BC: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._305 + 4 - ldr r0, ._305 + 8 + ldr r1, ._305 + 4 @ gMenuCallback + ldr r0, ._305 + 8 @ debug_sub_808D40C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3744,8 +3744,8 @@ debug_sub_808D40C: neg r0, r0 cmp r1, r0 beq ._309 @cond_branch - ldr r2, ._311 - ldr r0, ._311 + 4 + ldr r2, ._311 @ gMenuCallback + ldr r0, ._311 + 4 @ gUnknown_Debug_083C105C lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -3777,7 +3777,7 @@ debug_sub_808D450: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._313 + ldr r3, ._313 @ gUnknown_Debug_083C10BD mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3791,10 +3791,10 @@ debug_sub_808D450: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._313 + 4 + ldr r0, ._313 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._313 + 8 - ldr r0, ._313 + 12 + ldr r1, ._313 + 8 @ gMenuCallback + ldr r0, ._313 + 12 @ debug_sub_808D500 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3821,7 +3821,7 @@ debug_sub_808D4A8: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._315 + ldr r3, ._315 @ gUnknown_Debug_083C1149 mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -3835,11 +3835,11 @@ debug_sub_808D4A8: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._315 + 4 + ldr r1, ._315 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._315 + 8 - ldr r0, ._315 + 12 + ldr r1, ._315 + 8 @ gMenuCallback + ldr r0, ._315 + 12 @ debug_sub_808D500 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3864,7 +3864,7 @@ debug_sub_808D500: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._320 + ldr r5, ._320 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -3905,14 +3905,14 @@ debug_sub_808D54C: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._325 + ldr r0, ._325 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._324 @cond_branch - ldr r0, ._325 + 4 + ldr r0, ._325 + 4 @ gUnknown_Debug_083C1196 lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -3950,12 +3950,12 @@ debug_sub_808D59C: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._329 + ldr r0, ._329 @ gUnknown_Debug_083C1194 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._327 @cond_branch - ldr r0, ._329 + 4 + ldr r0, ._329 + 4 @ gUnknown_Debug_083C1196 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -4007,7 +4007,7 @@ debug_sub_808D600: mov r2, #0x1c mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._331 + ldr r3, ._331 @ gUnknown_Debug_083C11CC mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -4021,8 +4021,8 @@ debug_sub_808D600: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._331 + 4 - ldr r0, ._331 + 8 + ldr r1, ._331 + 4 @ gMenuCallback + ldr r0, ._331 + 8 @ debug_sub_808D650 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4054,8 +4054,8 @@ debug_sub_808D650: neg r0, r0 cmp r1, r0 beq ._335 @cond_branch - ldr r2, ._337 - ldr r0, ._337 + 4 + ldr r2, ._337 @ gMenuCallback + ldr r0, ._337 + 4 @ gUnknown_Debug_083C11CC lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -4087,7 +4087,7 @@ debug_sub_808D694: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._339 + ldr r3, ._339 @ gUnknown_Debug_083C1212 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4101,10 +4101,10 @@ debug_sub_808D694: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._339 + 4 + ldr r0, ._339 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._339 + 8 - ldr r0, ._339 + 12 + ldr r1, ._339 + 8 @ gMenuCallback + ldr r0, ._339 + 12 @ debug_sub_808D744 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4131,7 +4131,7 @@ debug_sub_808D6EC: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._341 + ldr r3, ._341 @ gUnknown_Debug_083C1288 mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -4145,11 +4145,11 @@ debug_sub_808D6EC: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._341 + 4 + ldr r1, ._341 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._341 + 8 - ldr r0, ._341 + 12 + ldr r1, ._341 + 8 @ gMenuCallback + ldr r0, ._341 + 12 @ debug_sub_808D744 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4174,7 +4174,7 @@ debug_sub_808D744: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._346 + ldr r5, ._346 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -4215,14 +4215,14 @@ debug_sub_808D790: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._351 + ldr r0, ._351 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._350 @cond_branch - ldr r0, ._351 + 4 + ldr r0, ._351 + 4 @ gUnknown_Debug_083C12D2 lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -4260,12 +4260,12 @@ debug_sub_808D7E0: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._355 + ldr r0, ._355 @ gUnknown_Debug_083C12D0 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._353 @cond_branch - ldr r0, ._355 + 4 + ldr r0, ._355 + 4 @ gUnknown_Debug_083C12D2 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -4317,7 +4317,7 @@ debug_sub_808D844: mov r2, #0x1c mov r3, #0x3 bl Menu_DrawStdWindowFrame - ldr r3, ._357 + ldr r3, ._357 @ gUnknown_Debug_083C1A78 mov r0, #0x2 mov r1, #0x1 mov r2, #0x1 @@ -4331,8 +4331,8 @@ debug_sub_808D844: mov r2, #0x1 mov r3, #0x1 bl InitMenu - ldr r1, ._357 + 4 - ldr r0, ._357 + 8 + ldr r1, ._357 + 4 @ gMenuCallback + ldr r0, ._357 + 8 @ debug_sub_808D894 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4364,8 +4364,8 @@ debug_sub_808D894: neg r0, r0 cmp r3, r0 beq ._361 @cond_branch - ldr r2, ._363 - ldr r1, ._363 + 4 + ldr r2, ._363 @ gMenuCallback + ldr r1, ._363 + 4 @ gUnknown_Debug_083C1A78 lsl r0, r3, #0x3 add r0, r0, r1 ldr r0, [r0, #0x4] @@ -4396,7 +4396,7 @@ debug_sub_808D8D8: mov r2, #0x1d mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._365 + ldr r3, ._365 @ gUnknown_Debug_083C1A9C mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -4410,10 +4410,10 @@ debug_sub_808D8D8: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r0, ._365 + 4 + ldr r0, ._365 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._365 + 8 - ldr r0, ._365 + 12 + ldr r1, ._365 + 8 @ gMenuCallback + ldr r0, ._365 + 12 @ debug_sub_808D930 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4439,7 +4439,7 @@ debug_sub_808D930: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._370 + ldr r5, ._370 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -4480,14 +4480,14 @@ debug_sub_808D97C: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._375 + ldr r0, ._375 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._374 @cond_branch - ldr r0, ._375 + 4 + ldr r0, ._375 + 4 @ gUnknown_Debug_083C1AAE lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -4525,12 +4525,12 @@ debug_sub_808D9CC: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._379 + ldr r0, ._379 @ gUnknown_Debug_083C1AAC add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._377 @cond_branch - ldr r0, ._379 + 4 + ldr r0, ._379 + 4 @ gUnknown_Debug_083C1AAE mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -4582,7 +4582,7 @@ debug_sub_808DA30: mov r2, #0x1d mov r3, #0x3 bl Menu_DrawStdWindowFrame - ldr r3, ._381 + ldr r3, ._381 @ gUnknown_Debug_083C103A mov r0, #0x2 mov r1, #0x1 mov r2, #0x1 @@ -4596,8 +4596,8 @@ debug_sub_808DA30: mov r2, #0x1 mov r3, #0x1 bl InitMenu - ldr r1, ._381 + 4 - ldr r0, ._381 + 8 + ldr r1, ._381 + 4 @ gMenuCallback + ldr r0, ._381 + 8 @ debug_sub_808DA80 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4648,7 +4648,7 @@ debug_sub_808DA80: thumb_func_start debug_sub_808DABC debug_sub_808DABC: push {lr} - ldr r0, ._386 + ldr r0, ._386 @ gSpecialVar_Result ldrh r2, [r0] mov r0, #0x18 mov r1, #0x1 @@ -4665,7 +4665,7 @@ debug_sub_808DABC: thumb_func_start debug_sub_808DAD4 debug_sub_808DAD4: push {lr} - ldr r0, ._390 + ldr r0, ._390 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 @@ -4684,9 +4684,9 @@ debug_sub_808DAD4: and r0, r0, r1 cmp r0, #0 beq ._392 @cond_branch - ldr r2, ._393 + ldr r2, ._393 @ 0xffff ._389: - ldr r1, ._393 + 4 + ldr r1, ._393 + 4 @ gSpecialVar_Result ldrh r0, [r1] add r0, r2, r0 strh r0, [r1] @@ -4711,7 +4711,7 @@ debug_sub_808DB0C: mov r2, #0x18 mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._395 + ldr r3, ._395 @ gUnknown_Debug_083C3D08 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4725,8 +4725,8 @@ debug_sub_808DB0C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._395 + 4 - ldr r0, ._395 + 8 + ldr r1, ._395 + 4 @ gMenuCallback + ldr r0, ._395 + 8 @ debug_sub_808DB5C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4758,8 +4758,8 @@ debug_sub_808DB5C: neg r0, r0 cmp r1, r0 beq ._399 @cond_branch - ldr r2, ._401 - ldr r0, ._401 + 4 + ldr r2, ._401 @ gMenuCallback + ldr r0, ._401 + 4 @ gUnknown_Debug_083C3D08 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -4791,7 +4791,7 @@ debug_sub_808DBA0: mov r2, #0x1d mov r3, #0x11 bl Menu_DrawStdWindowFrame - ldr r3, ._403 + ldr r3, ._403 @ gUnknown_Debug_083C432C mov r0, #0x2 mov r1, #0x1 mov r2, #0x8 @@ -4805,10 +4805,10 @@ debug_sub_808DBA0: mov r2, #0x1 mov r3, #0x8 bl InitMenu - ldr r0, ._403 + 4 + ldr r0, ._403 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._403 + 8 - ldr r0, ._403 + 12 + ldr r1, ._403 + 8 @ gMenuCallback + ldr r0, ._403 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4835,7 +4835,7 @@ debug_sub_808DBF8: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._405 + ldr r3, ._405 @ gUnknown_Debug_083C436C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4849,11 +4849,11 @@ debug_sub_808DBF8: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._405 + 4 + ldr r1, ._405 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._405 + 8 - ldr r0, ._405 + 12 + ldr r1, ._405 + 8 @ gMenuCallback + ldr r0, ._405 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4879,7 +4879,7 @@ debug_sub_808DC50: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._407 + ldr r3, ._407 @ gUnknown_Debug_083C43B4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4893,11 +4893,11 @@ debug_sub_808DC50: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._407 + 4 + ldr r1, ._407 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._407 + 8 - ldr r0, ._407 + 12 + ldr r1, ._407 + 8 @ gMenuCallback + ldr r0, ._407 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4923,7 +4923,7 @@ debug_sub_808DCA8: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._409 + ldr r3, ._409 @ gUnknown_Debug_083C43FC mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4937,11 +4937,11 @@ debug_sub_808DCA8: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._409 + 4 + ldr r1, ._409 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._409 + 8 - ldr r0, ._409 + 12 + ldr r1, ._409 + 8 @ gMenuCallback + ldr r0, ._409 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4967,7 +4967,7 @@ debug_sub_808DD00: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._411 + ldr r3, ._411 @ gUnknown_Debug_083C4444 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4981,11 +4981,11 @@ debug_sub_808DD00: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._411 + 4 + ldr r1, ._411 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._411 + 8 - ldr r0, ._411 + 12 + ldr r1, ._411 + 8 @ gMenuCallback + ldr r0, ._411 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5011,7 +5011,7 @@ debug_sub_808DD58: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._413 + ldr r3, ._413 @ gUnknown_Debug_083C448C mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -5025,11 +5025,11 @@ debug_sub_808DD58: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._413 + 4 + ldr r1, ._413 + 4 @ gDebug_0300070F mov r0, #0x5 strb r0, [r1] - ldr r1, ._413 + 8 - ldr r0, ._413 + 12 + ldr r1, ._413 + 8 @ gMenuCallback + ldr r0, ._413 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5055,7 +5055,7 @@ debug_sub_808DDB0: mov r2, #0x1d mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._415 + ldr r3, ._415 @ gUnknown_Debug_83C44C4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -5069,11 +5069,11 @@ debug_sub_808DDB0: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._415 + 4 + ldr r1, ._415 + 4 @ gDebug_0300070F mov r0, #0x6 strb r0, [r1] - ldr r1, ._415 + 8 - ldr r0, ._415 + 12 + ldr r1, ._415 + 8 @ gMenuCallback + ldr r0, ._415 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5099,7 +5099,7 @@ debug_sub_808DE08: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._417 + ldr r3, ._417 @ gUnknown_Debug_83C44EC mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -5113,11 +5113,11 @@ debug_sub_808DE08: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._417 + 4 + ldr r1, ._417 + 4 @ gDebug_0300070F mov r0, #0x7 strb r0, [r1] - ldr r1, ._417 + 8 - ldr r0, ._417 + 12 + ldr r1, ._417 + 8 @ gMenuCallback + ldr r0, ._417 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5143,7 +5143,7 @@ debug_sub_808DE60: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._419 + ldr r3, ._419 @ gUnknown_Debug_083C4534 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -5157,11 +5157,11 @@ debug_sub_808DE60: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._419 + 4 + ldr r1, ._419 + 4 @ gDebug_0300070F mov r0, #0x8 strb r0, [r1] - ldr r1, ._419 + 8 - ldr r0, ._419 + 12 + ldr r1, ._419 + 8 @ gMenuCallback + ldr r0, ._419 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5186,7 +5186,7 @@ debug_sub_808DEB8: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._424 + ldr r5, ._424 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -5228,12 +5228,12 @@ debug_sub_808DF04: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._428 + ldr r0, ._428 @ gUnknown_Debug_083C457C add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._426 @cond_branch - ldr r0, ._428 + 4 + ldr r0, ._428 + 4 @ gUnknown_Debug_083C4586 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -5280,7 +5280,7 @@ debug_sub_808DF64: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._432 + ldr r0, ._432 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 @@ -5299,9 +5299,9 @@ debug_sub_808DF64: and r0, r0, r1 cmp r0, #0 beq ._434 @cond_branch - ldr r5, ._435 + ldr r5, ._435 @ 0xffff ._431: - ldr r1, ._435 + 4 + ldr r1, ._435 + 4 @ gUnknown_Debug_083C4586 lsl r0, r2, #0x3 add r0, r0, r2 add r0, r0, r3 @@ -5338,7 +5338,7 @@ debug_sub_808DFC0: mov r2, #0x18 mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._437 + ldr r3, ._437 @ gUnknown_Debug_083C377C mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -5352,8 +5352,8 @@ debug_sub_808DFC0: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._437 + 4 - ldr r0, ._437 + 8 + ldr r1, ._437 + 4 @ gMenuCallback + ldr r0, ._437 + 8 @ debug_sub_808E010 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5385,8 +5385,8 @@ debug_sub_808E010: neg r0, r0 cmp r1, r0 beq ._441 @cond_branch - ldr r2, ._443 - ldr r0, ._443 + 4 + ldr r2, ._443 @ gMenuCallback + ldr r0, ._443 + 4 @ gUnknown_Debug_083C377C lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -5418,7 +5418,7 @@ debug_sub_808E054: mov r2, #0x1d mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._445 + ldr r3, ._445 @ gUnknown_Debug_083C3AA0 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -5432,10 +5432,10 @@ debug_sub_808E054: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r0, ._445 + 4 + ldr r0, ._445 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._445 + 8 - ldr r0, ._445 + 12 + ldr r1, ._445 + 8 @ gMenuCallback + ldr r0, ._445 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5462,7 +5462,7 @@ debug_sub_808E0AC: mov r2, #0x1d mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r3, ._447 + ldr r3, ._447 @ gUnknown_Debug_83C3AE0 mov r0, #0x2 mov r1, #0x1 mov r2, #0x5 @@ -5476,11 +5476,11 @@ debug_sub_808E0AC: mov r2, #0x1 mov r3, #0x5 bl InitMenu - ldr r1, ._447 + 4 + ldr r1, ._447 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._447 + 8 - ldr r0, ._447 + 12 + ldr r1, ._447 + 8 @ gMenuCallback + ldr r0, ._447 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5506,7 +5506,7 @@ debug_sub_808E104: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._449 + ldr r3, ._449 @ gUnknown_Debug_83C3B28 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -5520,11 +5520,11 @@ debug_sub_808E104: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._449 + 4 + ldr r1, ._449 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._449 + 8 - ldr r0, ._449 + 12 + ldr r1, ._449 + 8 @ gMenuCallback + ldr r0, ._449 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5550,7 +5550,7 @@ debug_sub_808E15C: mov r2, #0x1d mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._451 + ldr r3, ._451 @ gUnknown_Debug_83C3B70 mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -5564,11 +5564,11 @@ debug_sub_808E15C: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._451 + 4 + ldr r1, ._451 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._451 + 8 - ldr r0, ._451 + 12 + ldr r1, ._451 + 8 @ gMenuCallback + ldr r0, ._451 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5594,7 +5594,7 @@ debug_sub_808E1B4: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._453 + ldr r3, ._453 @ gUnknown_Debug_83C3BB8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -5608,11 +5608,11 @@ debug_sub_808E1B4: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._453 + 4 + ldr r1, ._453 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._453 + 8 - ldr r0, ._453 + 12 + ldr r1, ._453 + 8 @ gMenuCallback + ldr r0, ._453 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5638,7 +5638,7 @@ debug_sub_808E20C: mov r2, #0x1d mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._455 + ldr r3, ._455 @ gUnknown_Debug_83C3C00 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -5652,11 +5652,11 @@ debug_sub_808E20C: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._455 + 4 + ldr r1, ._455 + 4 @ gDebug_0300070F mov r0, #0x5 strb r0, [r1] - ldr r1, ._455 + 8 - ldr r0, ._455 + 12 + ldr r1, ._455 + 8 @ gMenuCallback + ldr r0, ._455 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5681,7 +5681,7 @@ debug_sub_808E264: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._460 + ldr r5, ._460 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -5723,12 +5723,12 @@ debug_sub_808E2B0: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._464 + ldr r0, ._464 @ gUnknown_Debug_083C3C48 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._462 @cond_branch - ldr r0, ._464 + 4 + ldr r0, ._464 + 4 @ gUnknown_Debug_83C3C4E mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -5775,7 +5775,7 @@ debug_sub_808E310: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._468 + ldr r0, ._468 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 @@ -5794,9 +5794,9 @@ debug_sub_808E310: and r0, r0, r1 cmp r0, #0 beq ._470 @cond_branch - ldr r5, ._471 + ldr r5, ._471 @ 0xffff ._467: - ldr r1, ._471 + 4 + ldr r1, ._471 + 4 @ gUnknown_Debug_83C3C4E lsl r0, r2, #0x3 add r0, r0, r2 add r0, r0, r3 @@ -5833,7 +5833,7 @@ debug_sub_808E36C: mov r2, #0x18 mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r3, ._473 + ldr r3, ._473 @ gUnknown_Debug_083C32AC mov r0, #0x2 mov r1, #0x1 mov r2, #0x5 @@ -5847,8 +5847,8 @@ debug_sub_808E36C: mov r2, #0x1 mov r3, #0x5 bl InitMenu - ldr r1, ._473 + 4 - ldr r0, ._473 + 8 + ldr r1, ._473 + 4 @ gMenuCallback + ldr r0, ._473 + 8 @ debug_sub_808E3BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5880,8 +5880,8 @@ debug_sub_808E3BC: neg r0, r0 cmp r1, r0 beq ._477 @cond_branch - ldr r2, ._479 - ldr r0, ._479 + 4 + ldr r2, ._479 @ gMenuCallback + ldr r0, ._479 + 4 @ gUnknown_Debug_083C32AC lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -5913,7 +5913,7 @@ debug_sub_808E400: mov r2, #0x1d mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r3, ._481 + ldr r3, ._481 @ gUnknown_Debug_083C347C mov r0, #0x2 mov r1, #0x1 mov r2, #0x3 @@ -5927,10 +5927,10 @@ debug_sub_808E400: mov r2, #0x1 mov r3, #0x3 bl InitMenu - ldr r0, ._481 + 4 + ldr r0, ._481 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._481 + 8 - ldr r0, ._481 + 12 + ldr r1, ._481 + 8 @ gMenuCallback + ldr r0, ._481 + 12 @ debug_sub_808E5B8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5957,7 +5957,7 @@ debug_sub_808E458: mov r2, #0x1d mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._483 + ldr r3, ._483 @ gUnknown_Debug_083C3494 mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -5971,11 +5971,11 @@ debug_sub_808E458: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._483 + 4 + ldr r1, ._483 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._483 + 8 - ldr r0, ._483 + 12 + ldr r1, ._483 + 8 @ gMenuCallback + ldr r0, ._483 + 12 @ debug_sub_808E5B8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6001,7 +6001,7 @@ debug_sub_808E4B0: mov r2, #0x1d mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._485 + ldr r3, ._485 @ gUnknown_Debug_083C34A4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -6015,11 +6015,11 @@ debug_sub_808E4B0: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._485 + 4 + ldr r1, ._485 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._485 + 8 - ldr r0, ._485 + 12 + ldr r1, ._485 + 8 @ gMenuCallback + ldr r0, ._485 + 12 @ debug_sub_808E5B8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6045,7 +6045,7 @@ debug_sub_808E508: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._487 + ldr r3, ._487 @ gUnknown_Debug_083C34D4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -6059,11 +6059,11 @@ debug_sub_808E508: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._487 + 4 + ldr r1, ._487 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._487 + 8 - ldr r0, ._487 + 12 + ldr r1, ._487 + 8 @ gMenuCallback + ldr r0, ._487 + 12 @ debug_sub_808E5B8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6089,7 +6089,7 @@ debug_sub_808E560: mov r2, #0x1d mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r3, ._489 + ldr r3, ._489 @ gUnknown_Debug_083C351C mov r0, #0x2 mov r1, #0x1 mov r2, #0x5 @@ -6103,11 +6103,11 @@ debug_sub_808E560: mov r2, #0x1 mov r3, #0x5 bl InitMenu - ldr r1, ._489 + 4 + ldr r1, ._489 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._489 + 8 - ldr r0, ._489 + 12 + ldr r1, ._489 + 8 @ gMenuCallback + ldr r0, ._489 + 12 @ debug_sub_808E5B8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6132,7 +6132,7 @@ debug_sub_808E5B8: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._494 + ldr r5, ._494 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -6173,7 +6173,7 @@ debug_sub_808E604: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._498 + ldr r0, ._498 @ gMain ldrh r1, [r0, #0x30] mov r0, #0x80 lsl r0, r0, #0x1 @@ -6192,9 +6192,9 @@ debug_sub_808E604: and r0, r0, r1 cmp r0, #0 beq ._500 @cond_branch - ldr r5, ._501 + ldr r5, ._501 @ 0xffff ._497: - ldr r1, ._501 + 4 + ldr r1, ._501 + 4 @ gUnknown_Debug_083C354A lsl r0, r2, #0x3 add r0, r0, r2 add r0, r0, r3 @@ -6229,12 +6229,12 @@ debug_sub_808E660: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._505 + ldr r0, ._505 @ gUnknown_Debug_083C3544 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._503 @cond_branch - ldr r0, ._505 + 4 + ldr r0, ._505 + 4 @ gUnknown_Debug_083C354A mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -6284,7 +6284,7 @@ debug_sub_808E6C0: mov r2, #0x18 mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._507 + ldr r3, ._507 @ gUnknown_Debug_083C4644 mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -6298,8 +6298,8 @@ debug_sub_808E6C0: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._507 + 4 - ldr r0, ._507 + 8 + ldr r1, ._507 + 4 @ gMenuCallback + ldr r0, ._507 + 8 @ debug_sub_808E710 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6331,8 +6331,8 @@ debug_sub_808E710: neg r0, r0 cmp r1, r0 beq ._511 @cond_branch - ldr r2, ._513 - ldr r0, ._513 + 4 + ldr r2, ._513 @ gMenuCallback + ldr r0, ._513 + 4 @ gUnknown_Debug_083C4644 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -6364,7 +6364,7 @@ debug_sub_808E754: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._515 + ldr r3, ._515 @ gUnknown_Debug_083C470C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -6378,10 +6378,10 @@ debug_sub_808E754: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._515 + 4 + ldr r0, ._515 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._515 + 8 - ldr r0, ._515 + 12 + ldr r1, ._515 + 8 @ gMenuCallback + ldr r0, ._515 + 12 @ debug_sub_808E804 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6408,7 +6408,7 @@ debug_sub_808E7AC: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._517 + ldr r3, ._517 @ gUnknown_Debug_083C4754C mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -6422,11 +6422,11 @@ debug_sub_808E7AC: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._517 + 4 + ldr r1, ._517 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._517 + 8 - ldr r0, ._517 + 12 + ldr r1, ._517 + 8 @ gMenuCallback + ldr r0, ._517 + 12 @ debug_sub_808E804 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6451,7 +6451,7 @@ debug_sub_808E804: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._522 + ldr r5, ._522 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -6492,7 +6492,7 @@ debug_sub_808E850: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._526 + ldr r0, ._526 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 @@ -6511,9 +6511,9 @@ debug_sub_808E850: and r0, r0, r1 cmp r0, #0 beq ._528 @cond_branch - ldr r5, ._529 + ldr r5, ._529 @ 0xffff ._525: - ldr r1, ._529 + 4 + ldr r1, ._529 + 4 @ gUnknown_Debug_083C478E lsl r0, r2, #0x3 add r0, r0, r2 add r0, r0, r3 @@ -6548,12 +6548,12 @@ debug_sub_808E8AC: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._533 + ldr r0, ._533 @ gUnknown_Debug_083C478C add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._531 @cond_branch - ldr r0, ._533 + 4 + ldr r0, ._533 + 4 @ gUnknown_Debug_083C478E mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -6603,7 +6603,7 @@ debug_sub_808E90C: mov r2, #0x18 mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._535 + ldr r3, ._535 @ gUnknown_Debug_083C35C4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -6617,8 +6617,8 @@ debug_sub_808E90C: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._535 + 4 - ldr r0, ._535 + 8 + ldr r1, ._535 + 4 @ gMenuCallback + ldr r0, ._535 + 8 @ debug_sub_808E95C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6650,8 +6650,8 @@ debug_sub_808E95C: neg r0, r0 cmp r1, r0 beq ._539 @cond_branch - ldr r2, ._541 - ldr r0, ._541 + 4 + ldr r2, ._541 @ gMenuCallback + ldr r0, ._541 + 4 @ gUnknown_Debug_083C35C4 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -6683,7 +6683,7 @@ debug_sub_808E9A0: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._543 + ldr r3, ._543 @ gUnknown_Debug_083C369C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -6697,10 +6697,10 @@ debug_sub_808E9A0: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._543 + 4 + ldr r0, ._543 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._543 + 8 - ldr r0, ._543 + 12 + ldr r1, ._543 + 8 @ gMenuCallback + ldr r0, ._543 + 12 @ debug_sub_808EA50 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6727,7 +6727,7 @@ debug_sub_808E9F8: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._545 + ldr r3, ._545 @ gUnknown_Debug_083C36E4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -6741,11 +6741,11 @@ debug_sub_808E9F8: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._545 + 4 + ldr r1, ._545 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._545 + 8 - ldr r0, ._545 + 12 + ldr r1, ._545 + 8 @ gMenuCallback + ldr r0, ._545 + 12 @ debug_sub_808EA50 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6770,7 +6770,7 @@ debug_sub_808EA50: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._550 + ldr r5, ._550 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -6812,12 +6812,12 @@ debug_sub_808EA9C: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._554 + ldr r0, ._554 @ gUnknown_Debug_083C371C add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._552 @cond_branch - ldr r0, ._554 + 4 + ldr r0, ._554 + 4 @ gUnknown_Debug_083C371E mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -6864,7 +6864,7 @@ debug_sub_808EAFC: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._558 + ldr r0, ._558 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 @@ -6883,9 +6883,9 @@ debug_sub_808EAFC: and r0, r0, r1 cmp r0, #0 beq ._560 @cond_branch - ldr r5, ._561 + ldr r5, ._561 @ 0xffff ._557: - ldr r1, ._561 + 4 + ldr r1, ._561 + 4 @ gUnknown_Debug_083C371E lsl r0, r2, #0x3 add r0, r0, r2 add r0, r0, r3 @@ -6922,11 +6922,11 @@ debug_sub_808EB58: mov r2, #0xc mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._563 + ldr r0, ._563 @ gUnknown_Debug_083C47B2 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._563 + 4 + ldr r3, ._563 + 4 @ gUnknown_Debug_083C47F0 mov r0, #0x2 mov r1, #0x3 mov r2, #0x8 @@ -6940,8 +6940,8 @@ debug_sub_808EB58: mov r2, #0x3 mov r3, #0x8 bl InitMenu - ldr r1, ._563 + 8 - ldr r0, ._563 + 12 + ldr r1, ._563 + 8 @ gMenuCallback + ldr r0, ._563 + 12 @ debug_sub_808EC10 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6967,11 +6967,11 @@ debug_sub_808EBB4: mov r2, #0xd mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r0, ._565 + ldr r0, ._565 @ gUnknown_Debug_083C4830 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._565 + 4 + ldr r3, ._565 + 4 @ gUnknown_Debug_083C4888 mov r0, #0x2 mov r1, #0x3 mov r2, #0x5 @@ -6985,8 +6985,8 @@ debug_sub_808EBB4: mov r2, #0x3 mov r3, #0x5 bl InitMenu - ldr r1, ._565 + 8 - ldr r0, ._565 + 12 + ldr r1, ._565 + 8 @ gMenuCallback + ldr r0, ._565 + 12 @ debug_sub_808EC5C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -7022,10 +7022,10 @@ debug_sub_808EC10: neg r0, r0 cmp r4, r0 beq ._568 @cond_branch - ldr r1, ._570 + ldr r1, ._570 @ gSaveBlock1 lsl r0, r2, #0x18 asr r0, r0, #0x18 - ldr r2, ._570 + 4 + ldr r2, ._570 + 4 @ 0x13c8 add r1, r1, r2 strh r0, [r1] bl CloseMenu @@ -7065,7 +7065,7 @@ debug_sub_808EC5C: neg r0, r0 cmp r4, r0 beq ._573 @cond_branch - ldr r0, ._575 + ldr r0, ._575 @ 0x40a7 lsl r1, r1, #0x18 asr r1, r1, #0x8 lsr r1, r1, #0x10 @@ -7097,8 +7097,8 @@ debug_sub_808ECA4: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r1, ._577 - ldr r0, ._577 + 4 + ldr r1, ._577 @ gMenuCallback + ldr r0, ._577 + 4 @ debug_sub_808ECD0 str r0, [r1] mov r0, #0x0 add sp, sp, #0x4 @@ -7125,10 +7125,10 @@ debug_sub_808ECD0: bl CloseMenu mov r0, #0x2 bl debug_sub_808F168 - ldr r0, ._581 + ldr r0, ._581 @ CB2_ContestPainting bl SetMainCallback2 - ldr r1, ._581 + 4 - ldr r0, ._581 + 8 + ldr r1, ._581 + 4 @ gMain + ldr r0, ._581 + 8 @ debug_sub_808B868 str r0, [r1, #0x8] mov r0, #0x1 ._580: @@ -7153,13 +7153,13 @@ TomomichiDebugMenu_Config: thumb_func_start debug_sub_808ED0C debug_sub_808ED0C: push {lr} - ldr r2, ._590 + ldr r2, ._590 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._584 @cond_branch - ldr r1, ._590 + 4 + ldr r1, ._590 + 4 @ gDebug_03000700 ldrh r0, [r1] cmp r0, #0x1 beq ._584 @cond_branch @@ -7171,9 +7171,9 @@ debug_sub_808ED0C: and r0, r0, r1 cmp r0, #0 beq ._586 @cond_branch - ldr r3, ._590 + 4 + ldr r3, ._590 + 4 @ gDebug_03000700 ldrh r1, [r3] - ldr r0, ._590 + 8 + ldr r0, ._590 + 8 @ 0x19b cmp r1, r0 beq ._586 @cond_branch add r0, r1, #1 @@ -7185,7 +7185,7 @@ debug_sub_808ED0C: and r0, r0, r1 cmp r0, #0 beq ._587 @cond_branch - ldr r1, ._590 + 4 + ldr r1, ._590 + 4 @ gDebug_03000700 ldrh r0, [r1] cmp r0, #0xa bls ._588 @cond_branch @@ -7208,9 +7208,9 @@ debug_sub_808ED0C: and r0, r0, r1 cmp r0, #0 beq ._592 @cond_branch - ldr r2, ._595 + ldr r2, ._595 @ gDebug_03000700 ldrh r1, [r2] - ldr r0, ._595 + 4 + ldr r0, ._595 + 4 @ 0x191 cmp r1, r0 bhi ._593 @cond_branch add r0, r1, #0 @@ -7222,7 +7222,7 @@ debug_sub_808ED0C: .word gDebug_03000700 .word 0x191 ._593: - ldr r1, ._597 + ldr r1, ._597 @ 0x19b add r0, r1, #0 ._594: strh r0, [r2] @@ -7239,13 +7239,13 @@ debug_sub_808ED0C: thumb_func_start debug_sub_808ED9C debug_sub_808ED9C: push {lr} - ldr r2, ._606 + ldr r2, ._606 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._600 @cond_branch - ldr r1, ._606 + 4 + ldr r1, ._606 + 4 @ gDebug_03000708 ldr r0, [r1] cmp r0, #0 beq ._600 @cond_branch @@ -7257,7 +7257,7 @@ debug_sub_808ED9C: and r0, r0, r1 cmp r0, #0 beq ._602 @cond_branch - ldr r3, ._606 + 4 + ldr r3, ._606 + 4 @ gDebug_03000708 ldr r1, [r3] mov r0, #0x1 neg r0, r0 @@ -7272,7 +7272,7 @@ debug_sub_808ED9C: and r0, r0, r1 cmp r0, #0 beq ._603 @cond_branch - ldr r1, ._606 + 4 + ldr r1, ._606 + 4 @ gDebug_03000708 ldr r0, [r1] cmp r0, #0xf bls ._604 @cond_branch @@ -7294,7 +7294,7 @@ debug_sub_808ED9C: and r0, r0, r1 cmp r0, #0 beq ._608 @cond_branch - ldr r3, ._611 + ldr r3, ._611 @ gDebug_03000708 ldr r1, [r3] mov r0, #0x11 neg r0, r0 @@ -7320,7 +7320,7 @@ debug_sub_808ED9C: and r0, r0, r2 cmp r0, r1 bne ._613 @cond_branch - ldr r1, ._614 + ldr r1, ._614 @ gDebug_03000708 mov r0, #0x1 neg r0, r0 str r0, [r1] @@ -7337,13 +7337,13 @@ debug_sub_808ED9C: thumb_func_start debug_sub_808EE3C debug_sub_808EE3C: push {lr} - ldr r2, ._622 + ldr r2, ._622 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._617 @cond_branch - ldr r1, ._622 + 4 + ldr r1, ._622 + 4 @ gDebug_0300070C ldrb r0, [r1] cmp r0, #0x1 beq ._617 @cond_branch @@ -7355,7 +7355,7 @@ debug_sub_808EE3C: and r0, r0, r1 cmp r0, #0 beq ._619 @cond_branch - ldr r1, ._622 + 4 + ldr r1, ._622 + 4 @ gDebug_0300070C ldrb r0, [r1] cmp r0, #0x5 beq ._619 @cond_branch @@ -7368,7 +7368,7 @@ debug_sub_808EE3C: and r0, r0, r1 cmp r0, #0 beq ._620 @cond_branch - ldr r1, ._622 + 4 + ldr r1, ._622 + 4 @ gDebug_0300070C mov r0, #0x1 strb r0, [r1] ._620: @@ -7378,7 +7378,7 @@ debug_sub_808EE3C: and r0, r0, r1 cmp r0, #0 beq ._621 @cond_branch - ldr r1, ._622 + 4 + ldr r1, ._622 + 4 @ gDebug_0300070C mov r0, #0x5 strb r0, [r1] ._621: @@ -7395,13 +7395,13 @@ debug_sub_808EE3C: thumb_func_start debug_sub_808EE9C debug_sub_808EE9C: push {lr} - ldr r2, ._631 + ldr r2, ._631 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._625 @cond_branch - ldr r1, ._631 + 4 + ldr r1, ._631 + 4 @ gDebug_0300070D ldrb r0, [r1] cmp r0, #0x1 beq ._625 @cond_branch @@ -7413,7 +7413,7 @@ debug_sub_808EE9C: and r0, r0, r1 cmp r0, #0 beq ._627 @cond_branch - ldr r1, ._631 + 4 + ldr r1, ._631 + 4 @ gDebug_0300070D ldrb r0, [r1] cmp r0, #0xf beq ._627 @cond_branch @@ -7426,7 +7426,7 @@ debug_sub_808EE9C: and r0, r0, r1 cmp r0, #0 beq ._628 @cond_branch - ldr r1, ._631 + 4 + ldr r1, ._631 + 4 @ gDebug_0300070D ldrb r0, [r1] cmp r0, #0xa bls ._629 @cond_branch @@ -7448,7 +7448,7 @@ debug_sub_808EE9C: and r0, r0, r1 cmp r0, #0 beq ._633 @cond_branch - ldr r1, ._636 + ldr r1, ._636 @ gDebug_0300070D ldrb r0, [r1] cmp r0, #0x5 bhi ._634 @cond_branch @@ -7471,13 +7471,13 @@ debug_sub_808EE9C: thumb_func_start debug_sub_808EF14 debug_sub_808EF14: push {lr} - ldr r2, ._645 + ldr r2, ._645 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._639 @cond_branch - ldr r1, ._645 + 4 + ldr r1, ._645 + 4 @ gDebug_0300070E ldrb r0, [r1] cmp r0, #0x1 beq ._639 @cond_branch @@ -7489,7 +7489,7 @@ debug_sub_808EF14: and r0, r0, r1 cmp r0, #0 beq ._641 @cond_branch - ldr r1, ._645 + 4 + ldr r1, ._645 + 4 @ gDebug_0300070E ldrb r0, [r1] cmp r0, #0xf beq ._641 @cond_branch @@ -7502,7 +7502,7 @@ debug_sub_808EF14: and r0, r0, r1 cmp r0, #0 beq ._642 @cond_branch - ldr r1, ._645 + 4 + ldr r1, ._645 + 4 @ gDebug_0300070E ldrb r0, [r1] cmp r0, #0xa bls ._643 @cond_branch @@ -7524,7 +7524,7 @@ debug_sub_808EF14: and r0, r0, r1 cmp r0, #0 beq ._647 @cond_branch - ldr r1, ._650 + ldr r1, ._650 @ gDebug_0300070E ldrb r0, [r1] cmp r0, #0x5 bhi ._648 @cond_branch @@ -7556,9 +7556,9 @@ debug_sub_808EF8C: cmp r6, #0 blt ._653 @cond_branch mov r3, #0x0 - ldr r0, ._656 + ldr r0, ._656 @ gDebug_03000708 mov r8, r0 - ldr r4, ._656 + 4 + ldr r4, ._656 + 4 @ gDebug_03000710 mov r7, #0x7 mov r5, #0xf ._658: @@ -7590,7 +7590,7 @@ debug_sub_808EF8C: lsr r3, r0, #0x18 cmp r3, #0x7 bls ._658 @cond_branch - ldr r0, ._666 + ldr r0, ._666 @ gDebug_03000710 mov r1, #0xff strb r1, [r0, #0x8] mov r1, #0xc @@ -7598,9 +7598,9 @@ debug_sub_808EF8C: bl Menu_PrintText ._653: mov r3, #0x0 - ldr r7, ._666 - ldr r5, ._666 + 4 - ldr r2, ._666 + 8 + ldr r7, ._666 @ gDebug_03000710 + ldr r5, ._666 + 4 @ gDebug_03000700 + ldr r2, ._666 + 8 @ gSpeciesNames mov r8, r2 add r4, r7, #0 mov r2, #0x0 @@ -7622,7 +7622,7 @@ debug_sub_808EF8C: ldrb r0, [r0] cmp r0, #0xff beq ._661 @cond_branch - ldr r0, ._666 + ldr r0, ._666 @ gDebug_03000710 mov ip, r0 mov r5, r8 add r4, r1, #0 @@ -7666,15 +7666,15 @@ debug_sub_808EF8C: .word gDebug_03000700 .word gSpeciesNames ._664: - ldr r0, ._672 + ldr r0, ._672 @ gDebug_03000710 mov r1, #0xc mov r2, #0x1 bl Menu_PrintText ._665: - ldr r5, ._672 + ldr r5, ._672 @ gDebug_03000710 mov r0, #0xff strb r0, [r5, #0x3] - ldr r4, ._672 + 4 + ldr r4, ._672 + 4 @ gDebug_03000700 ldrh r0, [r4] mov r1, #0x64 bl __udivsi3 @@ -7715,14 +7715,14 @@ debug_sub_808EF8C: beq ._674 @cond_branch b ._679 ._670: - ldr r4, ._677 + ldr r4, ._677 @ gDebug_0300070C b ._676 ._678: .align 2, 0 ._677: .word gDebug_0300070C ._668: - ldr r4, ._680 + ldr r4, ._680 @ gDebug_0300070D ._676: ldrb r0, [r4] mov r1, #0x64 @@ -7753,7 +7753,7 @@ debug_sub_808EF8C: ._680: .word gDebug_0300070D ._674: - ldr r4, ._682 + ldr r4, ._682 @ gDebug_0300070E ldrb r0, [r4] mov r1, #0x64 bl __udivsi3 @@ -7795,14 +7795,14 @@ debug_sub_808F168: push {r4, lr} lsl r0, r0, #0x18 lsr r1, r0, #0x18 - ldr r4, ._686 - ldr r0, ._686 + 4 + ldr r4, ._686 @ 0x2015de0 + ldr r0, ._686 + 4 @ gDebug_03000700 ldrh r0, [r0] strh r0, [r4, #0x8] - ldr r0, ._686 + 8 + ldr r0, ._686 + 8 @ gDebug_03000704 ldr r0, [r0] str r0, [r4, #0x4] - ldr r0, ._686 + 12 + ldr r0, ._686 + 12 @ gDebug_03000708 ldr r0, [r0] str r0, [r4] cmp r1, #0x5 @@ -7810,14 +7810,14 @@ debug_sub_808F168: b ._707 ._684: lsl r0, r1, #0x2 - ldr r1, ._686 + 16 + ldr r1, ._686 + 16 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 ._687: .align 2, 0 ._686: - .word +0x2015de0 + .word 0x2015de0 .word gDebug_03000700 .word gDebug_03000704 .word gDebug_03000708 @@ -7830,63 +7830,63 @@ debug_sub_808F168: .word ._693 .word ._694 ._689: - ldr r0, ._696 - ldr r2, ._696 + 4 + ldr r0, ._696 @ 0x2000000 + ldr r2, ._696 + 4 @ 0x15ddf add r1, r0, r2 mov r2, #0x0 strb r2, [r1] - ldr r1, ._696 + 8 + ldr r1, ._696 + 8 @ 0x15dde add r0, r0, r1 strb r2, [r0] - ldr r0, ._696 + 12 + ldr r0, ._696 + 12 @ gDebug_0300070C ldrb r0, [r0] sub r0, r0, #0x1 strb r0, [r4, #0xa] add r0, r4, #0 add r0, r0, #0x16 - ldr r1, ._696 + 16 + ldr r1, ._696 + 16 @ gUnknown_Debug_083C48BB bl StringCopy b ._704 ._697: .align 2, 0 ._696: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde .word gDebug_0300070C .word gUnknown_Debug_083C48BB ._690: - ldr r1, ._699 - ldr r0, ._699 + 4 + ldr r1, ._699 @ 0x2000000 + ldr r0, ._699 + 4 @ 0x15ddf add r2, r1, r0 mov r0, #0x0 strb r0, [r2] - ldr r2, ._699 + 8 + ldr r2, ._699 + 8 @ 0x15dde add r1, r1, r2 mov r0, #0x8 strb r0, [r1] - ldr r0, ._699 + 12 + ldr r0, ._699 + 12 @ gDebug_0300070D ldrb r0, [r0] sub r0, r0, #0x1 b ._698 ._700: .align 2, 0 ._699: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde .word gDebug_0300070D ._691: - ldr r1, ._702 - ldr r0, ._702 + 4 + ldr r1, ._702 @ 0x2000000 + ldr r0, ._702 + 4 @ 0x15ddf add r2, r1, r0 mov r0, #0x1 strb r0, [r2] - ldr r2, ._702 + 8 + ldr r2, ._702 + 8 @ 0x15dde add r1, r1, r2 mov r0, #0x8 strb r0, [r1] - ldr r0, ._702 + 12 + ldr r0, ._702 + 12 @ gDebug_0300070E ldrb r0, [r0] sub r0, r0, #0x1 strb r0, [r4, #0xa] @@ -7894,17 +7894,17 @@ debug_sub_808F168: ._703: .align 2, 0 ._702: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde .word gDebug_0300070E ._692: - ldr r1, ._705 - ldr r2, ._705 + 4 + ldr r1, ._705 @ 0x2000000 + ldr r2, ._705 + 4 @ 0x15ddf add r0, r1, r2 mov r2, #0x0 strb r2, [r0] - ldr r0, ._705 + 8 + ldr r0, ._705 + 8 @ 0x15dde add r1, r1, r0 mov r0, #0x8 strb r0, [r1] @@ -7913,16 +7913,16 @@ debug_sub_808F168: ._706: .align 2, 0 ._705: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde ._693: - ldr r1, ._708 - ldr r0, ._708 + 4 + ldr r1, ._708 @ 0x2000000 + ldr r0, ._708 + 4 @ 0x15ddf add r2, r1, r0 mov r0, #0x0 strb r0, [r2] - ldr r2, ._708 + 8 + ldr r2, ._708 + 8 @ 0x15dde add r1, r1, r2 mov r0, #0x8 strb r0, [r1] @@ -7932,23 +7932,23 @@ debug_sub_808F168: ._704: add r0, r4, #0 add r0, r0, #0xb - ldr r1, ._708 + 12 + ldr r1, ._708 + 12 @ gUnknown_Debug_083C48B0 bl StringCopy b ._707 ._709: .align 2, 0 ._708: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde .word gUnknown_Debug_083C48B0 ._694: - ldr r1, ._710 - ldr r0, ._710 + 4 + ldr r1, ._710 @ 0x2000000 + ldr r0, ._710 + 4 @ 0x15ddf add r2, r1, r0 mov r0, #0x0 strb r0, [r2] - ldr r2, ._710 + 8 + ldr r2, ._710 + 8 @ 0x15dde add r1, r1, r2 mov r0, #0x8 strb r0, [r1] @@ -7956,7 +7956,7 @@ debug_sub_808F168: strb r0, [r4, #0xa] add r0, r4, #0 add r0, r0, #0xb - ldr r1, ._710 + 12 + ldr r1, ._710 + 12 @ gUnknown_Debug_083C48B0 bl StringCopy ._707: pop {r4} @@ -7965,7 +7965,7 @@ debug_sub_808F168: ._711: .align 2, 0 ._710: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde .word gUnknown_Debug_083C48B0 @@ -7982,7 +7982,7 @@ debug_sub_808F2E0: lsl r2, r2, #0x18 cmp r2, #0 bne ._712 @cond_branch - ldr r1, ._714 + ldr r1, ._714 @ gDebug_03000710 mov r0, #0xa1 b ._713 ._715: @@ -7990,7 +7990,7 @@ debug_sub_808F2E0: ._714: .word gDebug_03000710 ._712: - ldr r1, ._716 + ldr r1, ._716 @ gDebug_03000710 mov r0, #0xa2 ._713: strb r0, [r1] @@ -8028,8 +8028,8 @@ debug_sub_808F31C: mov r9, r0 lsl r4, r4, #0x10 lsr r4, r4, #0x10 - ldr r5, ._718 - ldr r6, ._718 + 4 + ldr r5, ._718 @ gDebug_03000710 + ldr r6, ._718 + 4 @ 0x2710 add r0, r4, #0 add r1, r6, #0 bl __udivsi3 diff --git a/asm/unk_debug_menu_3.s b/asm/unk_debug_menu_3.s index e1be20589..2e4bef06c 100644 --- a/asm/unk_debug_menu_3.s +++ b/asm/unk_debug_menu_3.s @@ -9,8 +9,8 @@ debug_sub_813C404: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._1 - ldr r4, ._1 + 4 + ldr r5, ._1 @ gUnknown_Debug_845DDB2 + ldr r4, ._1 + 4 @ gUnknown_Debug_845DAE1 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -34,8 +34,8 @@ debug_sub_813C404: debug_sub_813C430: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._3 - ldr r4, ._3 + 4 + ldr r5, ._3 @ gUnknown_Debug_845E402 + ldr r4, ._3 + 4 @ gUnknown_Debug_845E3E0 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -59,8 +59,8 @@ debug_sub_813C430: debug_sub_813C45C: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._5 - ldr r4, ._5 + 4 + ldr r5, ._5 @ gUnknown_Debug_845E443 + ldr r4, ._5 + 4 @ gUnknown_Debug_845E422 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -84,8 +84,8 @@ debug_sub_813C45C: debug_sub_813C488: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._7 - ldr r4, ._7 + 4 + ldr r5, ._7 @ gUnknown_Debug_845E422 + ldr r4, ._7 + 4 @ gUnknown_Debug_845E402 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -108,8 +108,8 @@ debug_sub_813C488: thumb_func_start debug_sub_813C4B4 debug_sub_813C4B4: push {r4, lr} - ldr r4, ._9 - ldr r1, ._9 + 4 + ldr r4, ._9 @ gUnknown_Debug_845E619 + ldr r1, ._9 + 4 @ gUnknown_Debug_845E606 sub r4, r4, r1 add r2, r4, #0 bl memcpy @@ -129,8 +129,8 @@ debug_sub_813C4B4: debug_sub_813C4D4: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._11 - ldr r4, ._11 + 4 + ldr r5, ._11 @ gUnknown_Debug_845E712 + ldr r4, ._11 + 4 @ gUnknown_Debug_845E619 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -154,8 +154,8 @@ debug_sub_813C4D4: debug_sub_813C500: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._13 - ldr r4, ._13 + 4 + ldr r5, ._13 @ gUnknown_Debug_845E797 + ldr r4, ._13 + 4 @ gUnknown_Debug_845E712 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -185,14 +185,14 @@ debug_sub_813C52C: lsl r5, r1, #0x10 lsr r0, r5, #0x10 mov r9, r0 - ldr r6, ._15 - ldr r4, ._15 + 4 + ldr r6, ._15 @ gUnknown_Debug_845E7BB + ldr r4, ._15 + 4 @ gUnknown_Debug_845E797 sub r6, r6, r4 mov r0, r8 add r1, r4, #0 add r2, r6, #0 bl memcpy - ldr r0, ._15 + 8 + ldr r0, ._15 + 8 @ gUnknown_Debug_845E7B5 sub r0, r0, r4 add r0, r0, r8 add r0, r0, #0x3 @@ -252,7 +252,7 @@ debug_sub_813C598: thumb_func_start debug_sub_813C5A4 debug_sub_813C5A4: push {lr} - ldr r1, ._17 + ldr r1, ._17 @ 0x121 bl debug_sub_813C52C pop {r1} bx r1 @@ -267,19 +267,19 @@ debug_sub_813C5A4: debug_sub_813C5B4: push {r4, r5, r6, r7, lr} add r4, r0, #0 - ldr r7, ._23 - ldr r0, ._23 + 4 - ldr r1, ._23 + 8 + ldr r7, ._23 @ gSaveBlock1 + ldr r0, ._23 + 4 @ gUnknown_Debug_845DDD6 + ldr r1, ._23 + 8 @ gUnknown_Debug_845DDB2 sub r0, r0, r1 add r6, r0, r4 - ldr r0, ._23 + 12 + ldr r0, ._23 + 12 @ gUnknown_Debug_845E306 sub r5, r0, r1 - ldr r0, ._23 + 16 + ldr r0, ._23 + 16 @ Str_842E23C mov r1, #0x0 mov r2, #0x0 bl GetEnigmaBerryChecksum mov r2, #0x0 - ldr r3, ._23 + 20 + ldr r3, ._23 + 20 @ 0xfff mov r1, #0x0 ._19: add r0, r4, r2 @@ -290,7 +290,7 @@ debug_sub_813C5B4: mov r2, #0x0 cmp r2, r5 bcs ._20 @cond_branch - ldr r3, ._23 + 8 + ldr r3, ._23 + 8 @ gUnknown_Debug_845DDB2 ._21: add r0, r4, r2 add r1, r2, r3 @@ -301,7 +301,7 @@ debug_sub_813C5B4: bcc ._21 @cond_branch ._20: mov r2, #0x0 - ldr r3, ._23 + 24 + ldr r3, ._23 + 24 @ 0x52f ._22: add r0, r6, r2 add r1, r7, r2 @@ -311,7 +311,7 @@ debug_sub_813C5B4: cmp r2, r3 bls ._22 @cond_branch bl ClearEnigmaBerries - ldr r1, ._23 + 8 + ldr r1, ._23 + 8 @ gUnknown_Debug_845DDB2 add r0, r4, #0 bl unref_sub_81261B4 add r0, r5, #0 @@ -353,18 +353,18 @@ debug_sub_813C638: str r0, [sp, #0x4] mov r0, #0x1 str r0, [sp, #0x8] - ldr r0, ._25 + ldr r0, ._25 @ 0x270f str r0, [sp, #0xc] mov r0, r8 add r1, r4, #0 add r2, r5, #0 mov r3, #0x20 bl CreateMon - ldr r2, ._25 + 4 + ldr r2, ._25 + 4 @ Str_842E240 mov r0, r8 mov r1, #0x7 bl SetMonData - ldr r2, ._25 + 8 + ldr r2, ._25 + 8 @ Str_842E248 mov r0, r8 mov r1, #0x2 bl SetMonData @@ -468,10 +468,10 @@ debug_sub_813C740: push {r4, r5, r6} add sp, sp, #0xffffffd0 add r6, r0, #0 - ldr r0, ._29 + ldr r0, ._29 @ gUnknown_Debug_845E443 mov r8, r0 - ldr r1, ._29 + 4 - ldr r5, ._29 + 8 + ldr r1, ._29 + 4 @ gUnknown_Debug_845E4EF + ldr r5, ._29 + 8 @ gEnemyParty sub r1, r1, r0 mov r9, r1 add r0, r6, #0 @@ -504,7 +504,7 @@ debug_sub_813C740: mov r1, #0x23 add r2, r4, #0 bl SetMonData - ldr r1, ._29 + 12 + ldr r1, ._29 + 12 @ Str_842E238 add r0, r4, #0 mov r2, #0xb bl StringCopyN @@ -518,14 +518,14 @@ debug_sub_813C740: mov r1, #0x3 add r2, r4, #0 bl SetMonData - ldr r0, ._29 + 16 + ldr r0, ._29 + 16 @ gUnknown_Debug_845E467 add r0, r6, r0 mov r1, r8 sub r0, r0, r1 add r1, r5, #0 mov r2, #0x64 bl memcpy - ldr r0, ._29 + 20 + ldr r0, ._29 + 20 @ gUnknown_Debug_845E4CB add r6, r6, r0 mov r0, r8 sub r6, r6, r0 @@ -561,9 +561,9 @@ debug_sub_813C810: push {r6} add sp, sp, #0xffffffdc add r6, r0, #0 - ldr r5, ._31 - ldr r0, ._31 + 4 - ldr r4, ._31 + 8 + ldr r5, ._31 @ gUnknown_Debug_845E443 + ldr r0, ._31 + 4 @ gUnknown_Debug_845E4EF + ldr r4, ._31 + 8 @ gEnemyParty sub r0, r0, r5 mov r8, r0 add r0, r6, #0 @@ -578,13 +578,13 @@ debug_sub_813C810: add r0, r4, #0 mov r1, sp bl debug_sub_813C6AC - ldr r0, ._31 + 12 + ldr r0, ._31 + 12 @ gUnknown_Debug_845E467 add r0, r6, r0 sub r0, r0, r5 add r1, r4, #0 mov r2, #0x64 bl memcpy - ldr r0, ._31 + 16 + ldr r0, ._31 + 16 @ gUnknown_Debug_845E4CB add r0, r6, r0 sub r0, r0, r5 mov r1, sp @@ -618,9 +618,9 @@ debug_sub_813C888: push {r6} add sp, sp, #0xffffffdc add r6, r0, #0 - ldr r5, ._33 - ldr r0, ._33 + 4 - ldr r4, ._33 + 8 + ldr r5, ._33 @ gUnknown_Debug_845E443 + ldr r0, ._33 + 4 @ gUnknown_Debug_845E4EF + ldr r4, ._33 + 8 @ gEnemyParty sub r0, r0, r5 mov r8, r0 add r0, r6, #0 @@ -637,13 +637,13 @@ debug_sub_813C888: bl debug_sub_813C6AC mov r0, #0x0 strh r0, [r4, #0x1c] - ldr r0, ._33 + 12 + ldr r0, ._33 + 12 @ gUnknown_Debug_845E467 add r0, r6, r0 sub r0, r0, r5 add r1, r4, #0 mov r2, #0x64 bl memcpy - ldr r0, ._33 + 16 + ldr r0, ._33 + 16 @ gUnknown_Debug_845E4CB add r0, r6, r0 sub r0, r0, r5 mov r1, sp @@ -673,7 +673,7 @@ debug_sub_813C888: thumb_func_start debug_sub_813C904 debug_sub_813C904: push {r4, lr} - ldr r4, ._35 + ldr r4, ._35 @ gPlayerParty add r0, r4, #0 mov r1, #0x5 mov r2, #0x32 @@ -706,20 +706,20 @@ debug_sub_813C93C: push {r4, r5, r6, lr} add sp, sp, #0xffffff44 add r4, r0, #0 - ldr r6, ._37 - ldr r5, ._37 + 4 + ldr r6, ._37 @ gUnknown_Debug_845E4EF + ldr r5, ._37 + 4 @ gUnknown_Debug_845E606 sub r5, r5, r6 add r1, r6, #0 add r2, r5, #0 bl memcpy bl SavePlayerParty bl debug_sub_813C904 - ldr r1, ._37 + 8 - ldr r2, ._37 + 12 + ldr r1, ._37 + 8 @ Str_842E253 + ldr r2, ._37 + 12 @ 0x270f mov r0, sp bl debug_sub_8075DB4 bl LoadPlayerParty - ldr r0, ._37 + 16 + ldr r0, ._37 + 16 @ gUnknown_Debug_845E506 add r4, r4, r0 sub r4, r4, r6 add r0, r4, #0 diff --git a/asm/watanabe_debug_menu.s b/asm/watanabe_debug_menu.s index 6c56dab67..7f613b7a3 100644 --- a/asm/watanabe_debug_menu.s +++ b/asm/watanabe_debug_menu.s @@ -55,10 +55,10 @@ debug_80C35DC: mov r8, r0 mov r2, sp mov r6, #0x0 - ldr r1, ._2 + ldr r1, ._2 @ 0x40000d4 mov r5, #0x80 lsl r5, r5, #0x5 - ldr r7, ._2 + 4 + ldr r7, ._2 + 4 @ 0x81000800 mov r0, #0x81 lsl r0, r0, #0x18 mov ip, r0 @@ -88,7 +88,7 @@ debug_80C35DC: lsl r3, r3, #0x3 mov r4, #0x0 str r4, [sp, #0x4] - ldr r2, ._2 + ldr r2, ._2 @ 0x40000d4 mov r1, r8 str r1, [r2] str r0, [r2, #0x4] @@ -116,13 +116,13 @@ debug_80C35DC: bl ResetSpriteData bl ResetPaletteFade bl FreeAllSpritePalettes - ldr r0, ._2 + 8 + ldr r0, ._2 + 8 @ stru_83F8828 bl LoadSpriteSheet - ldr r0, ._2 + 12 + ldr r0, ._2 + 12 @ stru_83F8838 bl LoadSpritePalette - ldr r0, ._2 + 16 + ldr r0, ._2 + 16 @ gWindowTemplate_81E6C3C bl Text_LoadWindowTemplate - ldr r0, ._2 + 20 + ldr r0, ._2 + 20 @ gWindowTemplate_81E6CE4 bl InitMenuWindow add sp, sp, #0x8 pop {r3} @@ -157,13 +157,13 @@ debug_80C36F4: thumb_func_start debug_80C370C debug_80C370C: push {lr} - ldr r0, ._6 + ldr r0, ._6 @ gPaletteFade ldrb r1, [r0, #0x7] mov r0, #0x80 and r0, r0, r1 cmp r0, #0 bne ._4 @cond_branch - ldr r0, ._6 + 4 + ldr r0, ._6 + 4 @ debug_80C36F4 bl SetMainCallback2 b ._5 ._7: @@ -188,7 +188,7 @@ debug_80C373C: lsr r0, r0, #0x18 bl DestroyTask bl ScriptContext2_Disable - ldr r0, ._8 + ldr r0, ._8 @ sub_80546F0 bl SetMainCallback2 pop {r0} bx r0 @@ -297,7 +297,7 @@ debug_80C3800: lsl r2, r2, #0x18 lsr r5, r2, #0x18 mov r3, #0x0 - ldr r2, ._18 + ldr r2, ._18 @ gSpeciesNames mov r1, #0x0 ._14: mov r7, sp @@ -371,7 +371,7 @@ debug_80C3878: sub r0, r1, #1 b ._23 ._22: - ldr r1, ._25 + ldr r1, ._25 @ 0x19b b ._28 ._26: .align 2, 0 @@ -451,7 +451,7 @@ debug_80C38E4: lsr r5, r5, #0x18 lsl r6, r6, #0x18 lsr r6, r6, #0x18 - ldr r1, ._37 + ldr r1, ._37 @ gUnknown_Debug_083F7FD4 mov r0, sp mov r2, #0x2 bl memcpy @@ -483,7 +483,7 @@ debug_80C38E4: thumb_func_start debug_80C393C debug_80C393C: push {lr} - ldr r1, ._39 + ldr r1, ._39 @ gUnknown_Debug_083F7FD6 mov r0, #0x1e bl ProgramFlashSectorAndVerify pop {r0} @@ -498,8 +498,8 @@ debug_80C393C: thumb_func_start InitWatanabeDebugMenu InitWatanabeDebugMenu: push {r4, lr} - ldr r0, ._46 - ldr r1, ._46 + 4 + ldr r0, ._46 @ gMain + ldr r1, ._46 + 4 @ 0x43c add r4, r0, r1 ldrb r0, [r4] cmp r0, #0x1 @@ -541,7 +541,7 @@ InitWatanabeDebugMenu: cmp r0, #0 bne ._51 @cond_branch bl ScriptContext2_Disable - ldr r0, ._52 + ldr r0, ._52 @ sub_80546F0 bl SetMainCallback2 ._51: pop {r4} @@ -559,19 +559,19 @@ InitSizeComparison: push {r4, lr} add sp, sp, #0xfffffffc bl debug_80C35DC - ldr r1, ._54 + ldr r1, ._54 @ gReservedSpritePaletteCount mov r0, #0x1 strb r0, [r1] - ldr r0, ._54 + 4 + ldr r0, ._54 + 4 @ gUnknown_Debug_20389EC mov r1, #0x80 lsl r1, r1, #0x1 mov r2, #0x20 bl LoadPalette - ldr r3, ._54 + 8 + ldr r3, ._54 + 8 @ 0x4000208 ldrh r2, [r3] mov r0, #0x0 strh r0, [r3] - ldr r4, ._54 + 12 + ldr r4, ._54 + 12 @ 0x4000200 ldrh r0, [r4] mov r1, #0x1 orr r0, r0, r1 @@ -584,9 +584,9 @@ InitSizeComparison: mov r2, #0x10 mov r3, #0x0 bl BeginNormalPaletteFade - ldr r0, ._54 + 16 + ldr r0, ._54 + 16 @ debug_80C3758 bl SetVBlankCallback - ldr r0, ._54 + 20 + ldr r0, ._54 + 20 @ debug_80C370C bl SetMainCallback2 mov r1, #0x80 lsl r1, r1, #0x13 @@ -594,12 +594,12 @@ InitSizeComparison: lsl r2, r2, #0x5 add r0, r2, #0 strh r0, [r1] - ldr r0, ._54 + 24 + ldr r0, ._54 + 24 @ debug_80C3A50 mov r1, #0x0 bl CreateTask lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._54 + 28 + ldr r2, ._54 + 28 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 @@ -634,7 +634,7 @@ debug_80C3A50: add sp, sp, #0xffffffd8 lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r1, ._56 + ldr r1, ._56 @ gTasks lsl r2, r0, #0x2 add r0, r2, r0 lsl r0, r0, #0x3 @@ -649,7 +649,7 @@ debug_80C3A50: str r2, [sp, #0xc] lsr r2, r2, #0x10 mov r9, r2 - ldr r3, ._56 + 4 + ldr r3, ._56 + 4 @ gSaveBlock2 mov r8, r3 mov r0, #0x6 mov r1, #0x0 @@ -661,12 +661,12 @@ debug_80C3A50: mov r2, #0x5 mov r3, #0x9 bl Menu_DrawStdWindowFrame - ldr r5, ._56 + 8 + ldr r5, ._56 + 8 @ gUnknown_Debug_083F7FD6 add r0, r5, #0 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r4, ._56 + 12 + ldr r4, ._56 + 12 @ gUnknown_Debug_083F7FDE add r0, r4, #0 mov r1, #0x1 mov r2, #0x5 @@ -689,19 +689,19 @@ debug_80C3A50: mov r2, #0xb mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._56 + 16 + ldr r0, ._56 + 16 @ gUnknown_Debug_083F7FE2 mov r1, #0x1 mov r2, #0xb bl Menu_PrintText - ldr r0, ._56 + 20 + ldr r0, ._56 + 20 @ gUnknown_Debug_083F7FED mov r1, #0x1 mov r2, #0xd bl Menu_PrintText - ldr r0, ._56 + 24 + ldr r0, ._56 + 24 @ gUnknown_Debug_083F7FF6 mov r1, #0x1 mov r2, #0xf bl Menu_PrintText - ldr r0, ._56 + 28 + ldr r0, ._56 + 28 @ gUnknown_Debug_083F8001 mov r1, #0x1 mov r2, #0x11 bl Menu_PrintText @@ -710,11 +710,11 @@ debug_80C3A50: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r0, ._56 + 32 + ldr r0, ._56 + 32 @ gUnknown_Debug_083F800C mov r1, #0xd mov r2, #0xb bl Menu_PrintText - ldr r0, ._56 + 36 + ldr r0, ._56 + 36 @ gUnknown_Debug_083F8019 mov r1, #0xd mov r2, #0xd bl Menu_PrintText @@ -723,11 +723,11 @@ debug_80C3A50: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._56 + 40 + ldr r0, ._56 + 40 @ gUnknown_Debug_083F8022 mov r1, #0xd mov r2, #0x11 bl Menu_PrintText - ldr r0, ._56 + 44 + ldr r0, ._56 + 44 @ gUnknown_Debug_083F8028 mov r1, #0x18 mov r2, #0x11 bl Menu_PrintText @@ -751,7 +751,7 @@ debug_80C3A50: lsl r4, r0, #0x4 add r4, r4, r0 lsl r4, r4, #0x2 - ldr r1, ._56 + 48 + ldr r1, ._56 + 48 @ gSprites add r4, r4, r1 ldrb r1, [r4, #0x1] mov r2, #0x4 @@ -783,7 +783,7 @@ debug_80C3A50: lsl r0, r0, #0x10 lsr r0, r0, #0x10 bl FreeSpritePaletteByTag - ldr r0, ._56 + 52 + ldr r0, ._56 + 52 @ gPokedexEntries ldr r1, [sp, #0x4] lsl r5, r1, #0x3 add r5, r5, r1 @@ -817,7 +817,7 @@ debug_80C3A50: lsl r4, r1, #0x4 add r4, r4, r1 lsl r4, r4, #0x2 - ldr r2, ._56 + 48 + ldr r2, ._56 + 48 @ gSprites add r4, r4, r2 ldrb r0, [r4, #0x1] mov r3, sl @@ -861,14 +861,14 @@ debug_80C3A50: mov r3, #0x0 strh r3, [r7, #0x18] strh r3, [r7, #0x1a] - ldr r1, ._56 + 56 - ldr r2, ._56 + 60 + ldr r1, ._56 + 56 @ 0x4000048 + ldr r2, ._56 + 60 @ 0x3f1f add r0, r2, #0 strh r0, [r1] add r1, r1, #0x2 mov r0, #0x1f strh r0, [r1] - ldr r2, ._56 + 64 + ldr r2, ._56 + 64 @ 0x4000040 mov r3, #0x18 ldsh r1, [r7, r3] lsl r1, r1, #0x6 @@ -878,22 +878,22 @@ debug_80C3A50: add r1, r1, #0x78 add r0, r0, r1 strh r0, [r2] - ldr r1, ._56 + 68 - ldr r2, ._56 + 72 + ldr r1, ._56 + 68 @ 0x4000044 + ldr r2, ._56 + 72 @ 0x848 add r0, r2, #0 strh r0, [r1] sub r1, r1, #0x2 - ldr r3, ._56 + 76 + ldr r3, ._56 + 76 @ 0x31bf add r0, r3, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._56 + 80 + ldr r2, ._56 + 80 @ 0x14f add r0, r2, #0 strh r0, [r1] add r1, r1, #0xa mov r0, #0xe1 strh r0, [r1] - ldr r0, ._56 + 84 + ldr r0, ._56 + 84 @ 0x4000052 mov r3, #0x0 strh r3, [r0] add r1, r1, #0x4 @@ -907,7 +907,7 @@ debug_80C3A50: add r1, r3, #0 orr r0, r0, r1 strh r0, [r2] - ldr r0, ._56 + 88 + ldr r0, ._56 + 88 @ debug_80C3D2C str r0, [r7] add sp, sp, #0x28 pop {r3, r4, r5} @@ -955,7 +955,7 @@ debug_80C3D2C: lsl r0, r0, #0x18 lsr r6, r0, #0x18 add r7, r6, #0 - ldr r4, ._60 + ldr r4, ._60 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x2 and r0, r0, r1 @@ -970,14 +970,14 @@ debug_80C3D2C: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r0, ._60 + 4 + ldr r0, ._60 + 4 @ debug_80C370C bl SetMainCallback2 - ldr r1, ._60 + 8 + ldr r1, ._60 + 8 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._60 + 12 + ldr r1, ._60 + 12 @ debug_80C373C str r1, [r0] b ._117 ._61: @@ -995,7 +995,7 @@ debug_80C3D2C: beq ._62 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._64 + ldr r1, ._64 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 @@ -1015,7 +1015,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._66 @cond_branch - ldr r1, ._70 + ldr r1, ._70 @ gTasks lsl r2, r6, #0x2 add r0, r2, r6 lsl r0, r0, #0x3 @@ -1089,7 +1089,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._80 @cond_branch - ldr r1, ._84 + ldr r1, ._84 @ gTasks lsl r2, r6, #0x2 add r0, r2, r6 lsl r0, r0, #0x3 @@ -1165,7 +1165,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._94 @cond_branch - ldr r0, ._97 + ldr r0, ._97 @ gTasks lsl r1, r6, #0x2 add r1, r1, r6 lsl r1, r1, #0x3 @@ -1192,7 +1192,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._100 @cond_branch - ldr r0, ._103 + ldr r0, ._103 @ gTasks lsl r1, r6, #0x2 add r1, r1, r6 lsl r1, r1, #0x3 @@ -1219,7 +1219,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._106 @cond_branch - ldr r2, ._109 + ldr r2, ._109 @ gTasks lsl r3, r6, #0x2 add r0, r3, r6 lsl r0, r0, #0x3 @@ -1227,7 +1227,7 @@ debug_80C3D2C: ldrh r4, [r6, #0x8] mov r0, #0x8 ldsh r1, [r6, r0] - ldr r0, ._109 + 4 + ldr r0, ._109 + 4 @ 0x181 mov r8, r2 add r2, r3, #0 cmp r1, r0 @@ -1254,7 +1254,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._112 @cond_branch - ldr r1, ._115 + ldr r1, ._115 @ gTasks lsl r2, r6, #0x2 add r0, r2, r6 lsl r0, r0, #0x3 @@ -1285,7 +1285,7 @@ debug_80C3D2C: lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 - ldr r5, ._118 + ldr r5, ._118 @ gSprites add r0, r0, r5 bl DestroySprite mov r0, #0xe @@ -1295,7 +1295,7 @@ debug_80C3D2C: lsl r0, r0, #0x2 add r0, r0, r5 bl DestroySprite - ldr r0, ._118 + 4 + ldr r0, ._118 + 4 @ debug_80C3A50 str r0, [r4] b ._117 ._119: @@ -1304,7 +1304,7 @@ debug_80C3D2C: .word gSprites .word debug_80C3A50+1 ._112: - ldr r0, ._120 + ldr r0, ._120 @ gTasks lsl r5, r7, #0x2 add r5, r5, r7 lsl r5, r5, #0x3 @@ -1327,7 +1327,7 @@ debug_80C3D2C: mov r2, #0x7 mov r3, #0x4 bl debug_80C68CC - ldr r2, ._120 + 4 + ldr r2, ._120 + 4 @ gSprites mov r8, r2 mov r4, #0xc ldsh r1, [r5, r4] @@ -1361,7 +1361,7 @@ debug_80C3D2C: lsl r0, r0, #0x2 add r0, r0, r8 strh r6, [r0, #0x26] - ldr r2, ._120 + 8 + ldr r2, ._120 + 8 @ 0x4000040 mov r4, #0x18 ldsh r1, [r5, r4] lsl r1, r1, #0x6 @@ -1411,7 +1411,7 @@ debug_80C405C: cmp r5, #0 beq ._125 @cond_branch mov r2, #0x0 - ldr r3, ._127 + ldr r3, ._127 @ gSpeciesNames mov r0, #0xb add r1, r5, #0 mul r1, r1, r0 @@ -1462,7 +1462,7 @@ debug_80C40C4: mov r0, #0x64 add r1, r5, #0 mul r1, r1, r0 - ldr r0, ._132 + ldr r0, ._132 @ gEnemyParty add r4, r1, r0 add r0, r4, #0 mov r1, #0xb @@ -1488,7 +1488,7 @@ debug_80C40C4: mov r0, #0x64 add r1, r5, #0 mul r1, r1, r0 - ldr r0, ._136 + ldr r0, ._136 @ gPlayerParty add r4, r1, r0 add r0, r4, #0 mov r1, #0xb @@ -1526,8 +1526,8 @@ debug_80C40C4: InitBattleForDebug: push {lr} bl SavePlayerParty - ldr r1, ._138 - ldr r0, ._138 + 4 + ldr r1, ._138 @ gUnknown_Debug_2038A0C + ldr r0, ._138 + 4 @ gSaveBlock2 ldrb r2, [r0, #0x8] mov r0, #0x0 strb r2, [r1, #0xd] @@ -1541,13 +1541,13 @@ InitBattleForDebug: strb r0, [r1, #0x7] strb r0, [r1, #0x8] strb r0, [r1, #0xc] - ldr r1, ._138 + 8 + ldr r1, ._138 + 8 @ byte_3005E30 str r0, [r1] bl ZeroPlayerPartyMons bl ZeroEnemyPartyMons mov r0, #0x0 bl debug_80C4214 - ldr r0, ._138 + 12 + ldr r0, ._138 + 12 @ debug_80C47BC mov r1, #0x0 bl CreateTask pop {r0} @@ -1565,7 +1565,7 @@ InitBattleForDebug: thumb_func_start debug_80C41A8 debug_80C41A8: push {lr} - ldr r1, ._140 + ldr r1, ._140 @ gUnknown_Debug_2038A0C mov r0, #0x0 strb r0, [r1, #0x1] strb r0, [r1, #0x2] @@ -1573,7 +1573,7 @@ debug_80C41A8: bl ZeroEnemyPartyMons mov r0, #0x0 bl debug_80C4214 - ldr r0, ._140 + 4 + ldr r0, ._140 + 4 @ debug_80C47BC mov r1, #0x0 bl CreateTask pop {r0} @@ -1593,7 +1593,7 @@ debug_80C41D4: bl debug_80C40C4 mov r0, #0x0 bl debug_80C4214 - ldr r0, ._142 + ldr r0, ._142 @ debug_80C42B8 mov r1, #0x0 bl CreateTask pop {r0} @@ -1612,7 +1612,7 @@ debug_80C41F4: bl debug_80C40C4 mov r0, #0x1 bl debug_80C4214 - ldr r0, ._144 + ldr r0, ._144 @ debug_80C42B8 mov r1, #0x0 bl CreateTask pop {r0} @@ -1628,17 +1628,17 @@ debug_80C41F4: debug_80C4214: push {r4, r5, r6, lr} bl debug_80C35DC - ldr r6, ._146 + ldr r6, ._146 @ 0x4000040 mov r4, #0x0 strh r4, [r6] - ldr r5, ._146 + 4 + ldr r5, ._146 + 4 @ 0x4000044 strh r4, [r5] - ldr r0, ._146 + 8 + ldr r0, ._146 + 8 @ 0x4000042 strh r4, [r0] add r0, r0, #0x4 strh r4, [r0] - ldr r1, ._146 + 12 - ldr r2, ._146 + 16 + ldr r1, ._146 + 12 @ 0x4000048 + ldr r2, ._146 + 16 @ 0x1111 add r0, r2, #0 strh r0, [r1] add r1, r1, #0x2 @@ -1647,33 +1647,33 @@ debug_80C4214: add r1, r1, #0x6 mov r0, #0xe1 strh r0, [r1] - ldr r0, ._146 + 20 + ldr r0, ._146 + 20 @ 0x4000052 strh r4, [r0] add r1, r1, #0x4 mov r0, #0x7 strh r0, [r1] - ldr r3, ._146 + 24 + ldr r3, ._146 + 24 @ 0x4000208 ldrh r2, [r3] strh r4, [r3] - ldr r4, ._146 + 28 + ldr r4, ._146 + 28 @ 0x4000200 ldrh r0, [r4] mov r1, #0x1 orr r0, r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, ._146 + 32 + ldr r0, ._146 + 32 @ debug_80C3758 bl SetVBlankCallback - ldr r0, ._146 + 36 + ldr r0, ._146 + 36 @ debug_80C370C bl SetMainCallback2 mov r1, #0x80 lsl r1, r1, #0x13 - ldr r2, ._146 + 40 + ldr r2, ._146 + 40 @ 0x7140 add r0, r2, #0 strh r0, [r1] - ldr r1, ._146 + 44 + ldr r1, ._146 + 44 @ 0x1ef add r0, r1, #0 strh r0, [r6] - ldr r2, ._146 + 48 + ldr r2, ._146 + 48 @ 0x819f add r0, r2, #0 strh r0, [r5] pop {r4, r5, r6} @@ -1704,12 +1704,12 @@ debug_80C42B8: add sp, sp, #0xffffffe4 lsl r0, r0, #0x18 lsr r5, r0, #0x18 - ldr r1, ._150 + ldr r1, ._150 @ gUnknown_Debug_083F8194 mov r0, sp mov r2, #0xc bl memcpy add r4, sp, #0xc - ldr r1, ._150 + 4 + ldr r1, ._150 + 4 @ gUnknown_Debug_083F81A0 add r0, r4, #0 mov r2, #0xd bl memcpy @@ -1728,16 +1728,16 @@ debug_80C42B8: bl Menu_PrintText bl debug_80C4694 bl debug_80C4704 - ldr r0, ._150 + 8 + ldr r0, ._150 + 8 @ gUnknown_Debug_2038A0C ldrb r0, [r0] cmp r0, #0 beq ._148 @cond_branch - ldr r0, ._150 + 12 + ldr r0, ._150 + 12 @ gTasks lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._150 + 16 + ldr r0, ._150 + 16 @ debug_80C44EC b ._149 ._151: .align 2, 0 @@ -1748,12 +1748,12 @@ debug_80C42B8: .word gTasks .word debug_80C44EC+1 ._148: - ldr r0, ._152 + ldr r0, ._152 @ gTasks lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._152 + 4 + ldr r0, ._152 + 4 @ debug_80C4348 ._149: str r0, [r1] add sp, sp, #0x1c @@ -1775,7 +1775,7 @@ debug_80C4348: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._154 + ldr r0, ._154 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x1] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -1787,20 +1787,20 @@ debug_80C4348: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._154 + 4 - ldr r2, ._154 + 8 + ldr r1, ._154 + 4 @ 0x4000042 + ldr r2, ._154 + 8 @ 0x177 add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 add r2, r2, #0x8 add r0, r2, #0 strh r0, [r1] - ldr r1, ._154 + 12 + ldr r1, ._154 + 12 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._154 + 16 + ldr r1, ._154 + 16 @ debug_80C43A8 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -1823,7 +1823,7 @@ debug_80C43A8: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r1, ._158 + ldr r1, ._158 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x1 and r0, r0, r2 @@ -1832,13 +1832,13 @@ debug_80C43A8: beq ._156 @cond_branch mov r0, #0x5 bl PlaySE - ldr r0, ._158 + 4 + ldr r0, ._158 + 4 @ gUnknown_Debug_2038A0C ldrb r1, [r0, #0x1] mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._158 + 8 + ldr r1, ._158 + 8 @ gPlayerParty add r0, r0, r1 - ldr r1, ._158 + 12 + ldr r1, ._158 + 12 @ debug_80C41D4 bl debug_sub_80A433C add r0, r4, #0 bl DestroyTask @@ -1855,12 +1855,12 @@ debug_80C43A8: and r0, r0, r2 cmp r0, #0 beq ._160 @cond_branch - ldr r0, ._162 + ldr r0, ._162 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._162 + 4 + ldr r0, ._162 + 4 @ debug_80C4F48 str r0, [r1] b ._180 ._163: @@ -1883,12 +1883,12 @@ debug_80C43A8: bl PlaySE bl CalculatePlayerPartyCount bl CalculateEnemyPartyCount - ldr r0, ._167 + ldr r0, ._167 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._167 + 4 + ldr r0, ._167 + 4 @ debug_80C4D14 str r0, [r1] b ._180 ._168: @@ -1908,12 +1908,12 @@ debug_80C43A8: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r0, ._171 + ldr r0, ._171 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._171 + 4 + ldr r0, ._171 + 4 @ debug_80C44EC str r0, [r1] b ._180 ._172: @@ -1927,7 +1927,7 @@ debug_80C43A8: and r0, r0, r1 cmp r0, #0 beq ._174 @cond_branch - ldr r1, ._176 + ldr r1, ._176 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x1] cmp r0, #0 beq ._174 @cond_branch @@ -1944,14 +1944,14 @@ debug_80C43A8: and r0, r0, r1 cmp r0, #0 beq ._180 @cond_branch - ldr r5, ._181 + ldr r5, ._181 @ gUnknown_Debug_2038A0C ldrb r0, [r5, #0x1] cmp r0, #0x4 bhi ._180 @cond_branch add r1, r0, #0 mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._181 + 4 + ldr r1, ._181 + 4 @ gPlayerParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -1961,12 +1961,12 @@ debug_80C43A8: add r0, r0, #0x1 strb r0, [r5, #0x1] ._175: - ldr r1, ._181 + 8 + ldr r1, ._181 + 8 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._181 + 12 + ldr r1, ._181 + 12 @ debug_80C4348 str r1, [r0] ._180: add sp, sp, #0x4 @@ -1990,7 +1990,7 @@ debug_80C44EC: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._183 + ldr r0, ._183 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x2] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -2003,20 +2003,20 @@ debug_80C44EC: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._183 + 4 - ldr r2, ._183 + 8 + ldr r1, ._183 + 4 @ 0x4000042 + ldr r2, ._183 + 8 @ 0x79ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._183 + 12 + ldr r2, ._183 + 12 @ 0x17f add r0, r2, #0 strh r0, [r1] - ldr r1, ._183 + 16 + ldr r1, ._183 + 16 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._183 + 20 + ldr r1, ._183 + 20 @ debug_80C4550 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -2040,7 +2040,7 @@ debug_80C4550: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r1, ._187 + ldr r1, ._187 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x1 and r0, r0, r2 @@ -2049,13 +2049,13 @@ debug_80C4550: beq ._185 @cond_branch mov r0, #0x5 bl PlaySE - ldr r0, ._187 + 4 + ldr r0, ._187 + 4 @ gUnknown_Debug_2038A0C ldrb r1, [r0, #0x2] mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._187 + 8 + ldr r1, ._187 + 8 @ gEnemyParty add r0, r0, r1 - ldr r1, ._187 + 12 + ldr r1, ._187 + 12 @ debug_80C41F4 bl debug_sub_80A433C add r0, r4, #0 bl DestroyTask @@ -2072,12 +2072,12 @@ debug_80C4550: and r0, r0, r2 cmp r0, #0 beq ._189 @cond_branch - ldr r0, ._191 + ldr r0, ._191 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._191 + 4 + ldr r0, ._191 + 4 @ debug_80C4F48 str r0, [r1] b ._209 ._192: @@ -2100,12 +2100,12 @@ debug_80C4550: bl PlaySE bl CalculatePlayerPartyCount bl CalculateEnemyPartyCount - ldr r0, ._196 + ldr r0, ._196 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._196 + 4 + ldr r0, ._196 + 4 @ debug_80C4D14 str r0, [r1] b ._209 ._197: @@ -2125,12 +2125,12 @@ debug_80C4550: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r0, ._200 + ldr r0, ._200 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._200 + 4 + ldr r0, ._200 + 4 @ debug_80C4348 str r0, [r1] b ._209 ._201: @@ -2144,7 +2144,7 @@ debug_80C4550: and r0, r0, r1 cmp r0, #0 beq ._203 @cond_branch - ldr r1, ._205 + ldr r1, ._205 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x2] cmp r0, #0 beq ._203 @cond_branch @@ -2161,14 +2161,14 @@ debug_80C4550: and r0, r0, r1 cmp r0, #0 beq ._209 @cond_branch - ldr r5, ._210 + ldr r5, ._210 @ gUnknown_Debug_2038A0C ldrb r0, [r5, #0x2] cmp r0, #0x4 bhi ._209 @cond_branch add r1, r0, #0 mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._210 + 4 + ldr r1, ._210 + 4 @ gEnemyParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -2178,12 +2178,12 @@ debug_80C4550: add r0, r0, #0x1 strb r0, [r5, #0x2] ._204: - ldr r1, ._210 + 8 + ldr r1, ._210 + 8 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._210 + 12 + ldr r1, ._210 + 12 @ debug_80C44EC str r1, [r0] ._209: add sp, sp, #0x4 @@ -2204,7 +2204,7 @@ debug_80C4550: debug_80C4694: push {r4, r5, lr} add sp, sp, #0xffffffe4 - ldr r1, ._213 + ldr r1, ._213 @ gUnknown_Debug_083F81AD mov r0, sp mov r2, #0xd bl memcpy @@ -2222,7 +2222,7 @@ debug_80C4694: ._212: mov r0, #0x64 mul r0, r0, r4 - ldr r1, ._213 + 4 + ldr r1, ._213 + 4 @ gPlayerParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -2260,7 +2260,7 @@ debug_80C4694: debug_80C4704: push {r4, r5, lr} add sp, sp, #0xffffffe4 - ldr r1, ._216 + ldr r1, ._216 @ gUnknown_Debug_083F81BA mov r0, sp mov r2, #0xd bl memcpy @@ -2278,7 +2278,7 @@ debug_80C4704: ._215: mov r0, #0x64 mul r0, r0, r4 - ldr r1, ._216 + 4 + ldr r1, ._216 + 4 @ gEnemyParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -2315,7 +2315,7 @@ debug_80C4704: thumb_func_start debug_80C4774 debug_80C4774: push {r4, lr} - ldr r0, ._221 + ldr r0, ._221 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0xc] sub r0, r0, #0x1 lsl r0, r0, #0x18 @@ -2323,13 +2323,13 @@ debug_80C4774: mov r1, #0x64 add r4, r0, #0 mul r4, r4, r1 - ldr r0, ._221 + 4 + ldr r0, ._221 + 4 @ gPlayerParty add r0, r4, r0 mov r1, #0xb bl GetMonData cmp r0, #0 beq ._219 @cond_branch - ldr r0, ._221 + 8 + ldr r0, ._221 + 8 @ gEnemyParty add r0, r4, r0 mov r1, #0xb bl GetMonData @@ -2358,22 +2358,22 @@ debug_80C47BC: add sp, sp, #0xffffffc0 lsl r0, r0, #0x18 lsr r7, r0, #0x18 - ldr r1, ._224 + ldr r1, ._224 @ gUnknown_Debug_083F81C7 mov r0, sp mov r2, #0xf bl memcpy add r4, sp, #0x10 - ldr r1, ._224 + 4 + ldr r1, ._224 + 4 @ gUnknown_Debug_083F81A0 add r0, r4, #0 mov r2, #0xd bl memcpy add r6, sp, #0x20 - ldr r1, ._224 + 8 + ldr r1, ._224 + 8 @ gUnknown_Debug_083F81D6 add r0, r6, #0 mov r2, #0xf bl memcpy add r5, sp, #0x30 - ldr r1, ._224 + 12 + ldr r1, ._224 + 12 @ gUnknown_Debug_083F81E5 add r0, r5, #0 mov r2, #0x10 bl memcpy @@ -2400,7 +2400,7 @@ debug_80C47BC: mov r2, #0x1 bl Menu_PrintText mov r4, #0x0 - ldr r6, ._224 + 16 + ldr r6, ._224 + 16 @ gUnknown_Debug_083F8068 ._223: lsl r0, r4, #0x3 add r0, r0, r6 @@ -2426,15 +2426,15 @@ debug_80C47BC: mov r1, #0x11 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._224 + 20 + ldr r0, ._224 + 20 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x4] bl debug_80C4C44 - ldr r1, ._224 + 24 + ldr r1, ._224 + 24 @ gTasks lsl r0, r7, #0x2 add r0, r0, r7 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._224 + 28 + ldr r1, ._224 + 28 @ debug_80C48A0 str r1, [r0] add sp, sp, #0x40 pop {r4, r5, r6, r7} @@ -2461,7 +2461,7 @@ debug_80C48A0: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._226 + ldr r0, ._226 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x3] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -2473,20 +2473,20 @@ debug_80C48A0: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._226 + 4 - ldr r2, ._226 + 8 + ldr r1, ._226 + 4 @ 0x4000042 + ldr r2, ._226 + 8 @ 0x177 add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 add r2, r2, #0x8 add r0, r2, #0 strh r0, [r1] - ldr r1, ._226 + 12 + ldr r1, ._226 + 12 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._226 + 16 + ldr r1, ._226 + 16 @ debug_80C4900 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -2509,7 +2509,7 @@ debug_80C4900: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r5, r0, #0x18 - ldr r1, ._230 + ldr r1, ._230 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x2 and r0, r0, r2 @@ -2528,24 +2528,24 @@ debug_80C4900: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r0, ._230 + 4 + ldr r0, ._230 + 4 @ debug_80C370C bl SetMainCallback2 bl LoadPlayerParty - ldr r1, ._230 + 8 - ldr r0, ._230 + 12 + ldr r1, ._230 + 8 @ gSaveBlock2 + ldr r0, ._230 + 12 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0xd] strb r0, [r1, #0x8] - ldr r0, ._230 + 16 + ldr r0, ._230 + 16 @ gBattleTypeFlags mov r1, #0x0 strh r4, [r0] - ldr r0, ._230 + 20 + ldr r0, ._230 + 20 @ gUnknown_02023A14_50 strb r1, [r0] - ldr r1, ._230 + 24 + ldr r1, ._230 + 24 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._230 + 28 + ldr r1, ._230 + 28 @ debug_80C373C b ._229 ._231: .align 2, 0 @@ -2570,15 +2570,15 @@ debug_80C4900: ._232: mov r0, #0x5 bl PlaySE - ldr r1, ._236 - ldr r3, ._236 + 4 - ldr r2, ._236 + 8 + ldr r1, ._236 @ gBattleTypeFlags + ldr r3, ._236 + 4 @ gUnknown_Debug_083F8068 + ldr r2, ._236 + 8 @ gUnknown_Debug_2038A0C ldrb r0, [r2, #0x3] lsl r0, r0, #0x3 add r0, r0, r3 ldrb r0, [r0, #0x4] strh r0, [r1] - ldr r1, ._236 + 12 + ldr r1, ._236 + 12 @ gUnknown_02023A14_50 mov r0, #0x8 strb r0, [r1] ldrb r0, [r2, #0x3] @@ -2598,12 +2598,12 @@ debug_80C4900: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r0, ._236 + 16 + ldr r0, ._236 + 16 @ gTasks lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._236 + 20 + ldr r0, ._236 + 20 @ debug_80C4A60 str r0, [r1] b ._247 ._237: @@ -2616,12 +2616,12 @@ debug_80C4900: .word gTasks .word debug_80C4A60+1 ._234: - ldr r0, ._239 + ldr r0, ._239 @ gTasks lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._239 + 4 + ldr r0, ._239 + 4 @ debug_80C4F48 str r0, [r1] b ._247 ._240: @@ -2635,7 +2635,7 @@ debug_80C4900: and r0, r0, r1 cmp r0, #0 beq ._242 @cond_branch - ldr r1, ._244 + ldr r1, ._244 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x3] cmp r0, #0 beq ._242 @cond_branch @@ -2651,19 +2651,19 @@ debug_80C4900: and r0, r0, r1 cmp r0, #0 beq ._247 @cond_branch - ldr r1, ._248 + ldr r1, ._248 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x3] cmp r0, #0x1 bhi ._247 @cond_branch add r0, r0, #0x1 ._243: strb r0, [r1, #0x3] - ldr r1, ._248 + 4 + ldr r1, ._248 + 4 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._248 + 8 + ldr r1, ._248 + 8 @ debug_80C48A0 ._229: str r1, [r0] ._247: @@ -2687,7 +2687,7 @@ debug_80C4A60: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._250 + ldr r0, ._250 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x5] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -2700,20 +2700,20 @@ debug_80C4A60: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._250 + 4 - ldr r2, ._250 + 8 + ldr r1, ._250 + 4 @ 0x4000042 + ldr r2, ._250 + 8 @ 0x79ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._250 + 12 + ldr r2, ._250 + 12 @ 0x17f add r0, r2, #0 strh r0, [r1] - ldr r1, ._250 + 16 + ldr r1, ._250 + 16 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._250 + 20 + ldr r1, ._250 + 20 @ debug_80C4AC4 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -2739,7 +2739,7 @@ debug_80C4AC4: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r6, r0, #0x18 - ldr r7, ._255 + ldr r7, ._255 @ gUnknown_Debug_2038A0C ldrb r0, [r7, #0x4] mov ip, r0 ldrb r5, [r7, #0x5] @@ -2747,7 +2747,7 @@ debug_80C4AC4: add r0, r1, r5 lsl r0, r0, #0x18 lsr r1, r0, #0x18 - ldr r2, ._255 + 4 + ldr r2, ._255 + 4 @ gMain mov r8, r2 ldrh r2, [r2, #0x2e] mov r3, #0x1 @@ -2755,18 +2755,18 @@ debug_80C4AC4: add r4, r7, #0 cmp r3, #0 beq ._252 @cond_branch - ldr r0, ._255 + 8 + ldr r0, ._255 + 8 @ gUnknown_Debug_083F80D8 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 ldr r1, [r1] - ldr r3, ._255 + 12 + ldr r3, ._255 + 12 @ byte_3005E30 ldr r2, [r3] add r0, r2, #0 and r0, r0, r1 cmp r0, #0 beq ._253 @cond_branch - ldr r0, ._255 + 16 + ldr r0, ._255 + 16 @ 0xffff eor r1, r1, r0 and r2, r2, r1 b ._254 @@ -2784,12 +2784,12 @@ debug_80C4AC4: str r2, [r3] ldrb r0, [r4, #0x4] bl debug_80C4C44 - ldr r1, ._258 + ldr r1, ._258 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._258 + 4 + ldr r1, ._258 + 4 @ debug_80C4A60 str r1, [r0] b ._274 ._259: @@ -2810,12 +2810,12 @@ debug_80C4AC4: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r0, ._262 + ldr r0, ._262 @ gTasks lsl r1, r6, #0x2 add r1, r1, r6 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._262 + 4 + ldr r0, ._262 + 4 @ debug_80C48A0 b ._261 ._263: .align 2, 0 @@ -2829,12 +2829,12 @@ debug_80C4AC4: beq ._264 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._266 + ldr r1, ._266 @ gTrainerBattleOpponent mov r2, #0x80 lsl r2, r2, #0x3 add r0, r2, #0 strh r0, [r1] - ldr r1, ._266 + 4 + ldr r1, ._266 + 4 @ 0x2017000 ldrb r2, [r1, #0x1] mov r0, #0x11 neg r0, r0 @@ -2848,19 +2848,19 @@ debug_80C4AC4: strb r4, [r1, #0xa] strb r4, [r1, #0xb] strb r4, [r1, #0xc] - ldr r1, ._266 + 8 + ldr r1, ._266 + 8 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._266 + 12 + ldr r1, ._266 + 12 @ debug_80C4F48 str r1, [r0] b ._274 ._267: .align 2, 0 ._266: .word gTrainerBattleOpponent - .word +0x2017000 + .word 0x2017000 .word gTasks .word debug_80C4F48+1 ._264: @@ -2911,12 +2911,12 @@ debug_80C4AC4: ldrb r0, [r7, #0x4] bl debug_80C4C44 ._277: - ldr r0, ._278 + ldr r0, ._278 @ gTasks lsl r1, r6, #0x2 add r1, r1, r6 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._278 + 4 + ldr r0, ._278 + 4 @ debug_80C4A60 ._261: str r0, [r1] ._274: @@ -2956,12 +2956,12 @@ debug_80C4C44: cmp r4, #0x9 bgt ._280 @cond_branch mov r3, #0x0 - ldr r1, ._288 + ldr r1, ._288 @ gUnknown_Debug_083F80D8 lsl r0, r4, #0x3 add r0, r0, r1 ldr r0, [r0] ldrb r0, [r0] - ldr r7, ._288 + 4 + ldr r7, ._288 + 4 @ byte_3005E30 mov r9, r7 lsl r2, r2, #0x1 mov ip, r2 @@ -3057,17 +3057,17 @@ debug_80C4D14: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r1, ._291 + ldr r1, ._291 @ gUnknown_Debug_083F81C7 mov r0, sp mov r2, #0xf bl memcpy add r5, sp, #0x10 - ldr r1, ._291 + 4 + ldr r1, ._291 + 4 @ gUnknown_Debug_083F81F5 add r0, r5, #0 mov r2, #0xd bl memcpy add r6, sp, #0x20 - ldr r1, ._291 + 8 + ldr r1, ._291 + 8 @ gUnknown_Debug_083F8202 add r0, r6, #0 mov r2, #0xf bl memcpy @@ -3093,7 +3093,7 @@ debug_80C4D14: mov r1, #0x2 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._291 + 12 + ldr r0, ._291 + 12 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x6] bl debug_80C4F00 mov r0, #0xf @@ -3101,12 +3101,12 @@ debug_80C4D14: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r1, ._291 + 16 + ldr r1, ._291 + 16 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._291 + 20 + ldr r1, ._291 + 20 @ debug_80C4DB8 str r1, [r0] add sp, sp, #0x30 pop {r4, r5, r6} @@ -3131,7 +3131,7 @@ debug_80C4DB8: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._293 + ldr r0, ._293 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x7] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -3143,20 +3143,20 @@ debug_80C4DB8: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._293 + 4 - ldr r2, ._293 + 8 + ldr r1, ._293 + 4 @ 0x4000042 + ldr r2, ._293 + 8 @ 0x177 add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 add r2, r2, #0x8 add r0, r2, #0 strh r0, [r1] - ldr r1, ._293 + 12 + ldr r1, ._293 + 12 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._293 + 16 + ldr r1, ._293 + 16 @ debug_80C4E18 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -3178,24 +3178,24 @@ debug_80C4E18: push {r4, r5, r6, r7, lr} lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r5, ._297 + ldr r5, ._297 @ gUnknown_Debug_2038A0C ldrb r3, [r5, #0x6] ldrb r2, [r5, #0x7] add r0, r3, r2 lsl r0, r0, #0x18 lsr r6, r0, #0x18 - ldr r7, ._297 + 4 + ldr r7, ._297 + 4 @ gMain ldrh r1, [r7, #0x2e] mov r0, #0x2 and r0, r0, r1 cmp r0, #0 beq ._295 @cond_branch - ldr r0, ._297 + 8 + ldr r0, ._297 + 8 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._297 + 12 + ldr r0, ._297 + 12 @ debug_80C42B8 b ._296 ._298: .align 2, 0 @@ -3216,18 +3216,18 @@ debug_80C4E18: ._299: mov r0, #0x5 bl PlaySE - ldr r2, ._302 - ldr r1, ._302 + 4 + ldr r2, ._302 @ gBattleTerrain + ldr r1, ._302 + 4 @ gUnknown_Debug_083F814C lsl r0, r6, #0x3 add r0, r0, r1 ldrb r0, [r0, #0x4] strb r0, [r2] - ldr r1, ._302 + 8 + ldr r1, ._302 + 8 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._302 + 12 + ldr r1, ._302 + 12 @ debug_80C5158 str r1, [r0] b ._310 ._303: @@ -3280,12 +3280,12 @@ debug_80C4E18: ldrb r0, [r5, #0x6] bl debug_80C4F00 ._313: - ldr r0, ._314 + ldr r0, ._314 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._314 + 4 + ldr r0, ._314 + 4 @ debug_80C4DB8 ._296: str r0, [r1] ._310: @@ -3311,7 +3311,7 @@ debug_80C4F00: mov r3, #0xe bl Menu_BlankWindowRect mov r4, #0x0 - ldr r6, ._318 + ldr r6, ._318 @ gUnknown_Debug_083F814C ._317: cmp r4, #0x8 bhi ._316 @cond_branch @@ -3352,28 +3352,28 @@ debug_80C4F48: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r1, ._320 + ldr r1, ._320 @ gUnknown_Debug_083F8211 mov r0, sp mov r2, #0x11 bl memcpy add r6, sp, #0x14 - ldr r1, ._320 + 4 + ldr r1, ._320 + 4 @ gUnknown_Debug_083F81A0 add r0, r6, #0 mov r2, #0xd bl memcpy add r5, sp, #0x24 - ldr r1, ._320 + 8 + ldr r1, ._320 + 8 @ gUnknown_Debug_083F8222 add r0, r5, #0 mov r2, #0xd bl memcpy add r0, sp, #0x34 mov r9, r0 - ldr r1, ._320 + 12 + ldr r1, ._320 + 12 @ gUnknown_Debug_083F822F mov r2, #0x4 bl memcpy add r0, sp, #0x38 mov r8, r0 - ldr r1, ._320 + 16 + ldr r1, ._320 + 16 @ gUnknown_Debug_083F8233 mov r2, #0x4 bl memcpy mov r0, #0x0 @@ -3420,12 +3420,12 @@ debug_80C4F48: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r1, ._320 + 20 + ldr r1, ._320 + 20 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._320 + 24 + ldr r1, ._320 + 24 @ debug_80C5038 str r1, [r0] add sp, sp, #0x3c pop {r3, r4} @@ -3454,7 +3454,7 @@ debug_80C5038: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._322 + ldr r0, ._322 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x8] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -3466,20 +3466,20 @@ debug_80C5038: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._322 + 4 - ldr r2, ._322 + 8 + ldr r1, ._322 + 4 @ 0x4000042 + ldr r2, ._322 + 8 @ 0x177 add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 add r2, r2, #0x8 add r0, r2, #0 strh r0, [r1] - ldr r1, ._322 + 12 + ldr r1, ._322 + 12 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._322 + 16 + ldr r1, ._322 + 16 @ debug_80C5098 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -3501,19 +3501,19 @@ debug_80C5098: push {r4, lr} lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r1, ._326 + ldr r1, ._326 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x2 and r0, r0, r2 add r3, r1, #0 cmp r0, #0 beq ._324 @cond_branch - ldr r0, ._326 + 4 + ldr r0, ._326 + 4 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._326 + 8 + ldr r0, ._326 + 8 @ debug_80C47BC str r0, [r1] b ._339 ._327: @@ -3534,16 +3534,16 @@ debug_80C5098: ._328: mov r0, #0x5 bl PlaySE - ldr r1, ._331 - ldr r0, ._331 + 4 + ldr r1, ._331 @ gSaveBlock2 + ldr r0, ._331 + 4 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x8] strb r0, [r1, #0x8] - ldr r1, ._331 + 8 + ldr r1, ._331 + 8 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._331 + 12 + ldr r1, ._331 + 12 @ debug_80C42B8 b ._330 ._332: .align 2, 0 @@ -3558,7 +3558,7 @@ debug_80C5098: and r0, r0, r1 cmp r0, #0 beq ._334 @cond_branch - ldr r1, ._336 + ldr r1, ._336 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x8] cmp r0, #0 beq ._334 @cond_branch @@ -3574,19 +3574,19 @@ debug_80C5098: and r0, r0, r1 cmp r0, #0 beq ._339 @cond_branch - ldr r1, ._340 + ldr r1, ._340 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x8] cmp r0, #0 bne ._339 @cond_branch add r0, r0, #0x1 ._335: strb r0, [r1, #0x8] - ldr r1, ._340 + 4 + ldr r1, ._340 + 4 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._340 + 8 + ldr r1, ._340 + 8 @ debug_80C5038 ._330: str r1, [r0] ._339: @@ -3606,12 +3606,12 @@ debug_80C5098: debug_80C5158: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._342 + ldr r2, ._342 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._342 + 4 + ldr r0, ._342 + 4 @ debug_80C5174 str r0, [r1] bx lr ._343: @@ -3626,12 +3626,12 @@ debug_80C5158: debug_80C5174: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._344 + ldr r2, ._344 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._344 + 4 + ldr r0, ._344 + 4 @ debug_80C5190 str r0, [r1] bx lr ._345: @@ -3646,12 +3646,12 @@ debug_80C5174: debug_80C5190: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._346 + ldr r2, ._346 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._346 + 4 + ldr r0, ._346 + 4 @ debug_80C51AC str r0, [r1] bx lr ._347: @@ -3666,12 +3666,12 @@ debug_80C5190: debug_80C51AC: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._348 + ldr r2, ._348 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._348 + 4 + ldr r0, ._348 + 4 @ debug_80C51C8 str r0, [r1] bx lr ._349: @@ -3686,12 +3686,12 @@ debug_80C51AC: debug_80C51C8: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._350 + ldr r2, ._350 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._350 + 4 + ldr r0, ._350 + 4 @ debug_80C51E4 str r0, [r1] bx lr ._351: @@ -3706,10 +3706,10 @@ debug_80C51C8: debug_80C51E4: push {lr} bl sub_80408BC - ldr r0, ._352 - ldr r1, ._352 + 4 + ldr r0, ._352 @ gMain + ldr r1, ._352 + 4 @ debug_80C41A8 str r1, [r0, #0x8] - ldr r0, ._352 + 8 + ldr r0, ._352 + 8 @ unref_sub_800D684 bl SetMainCallback2 pop {r0} bx r0 @@ -3725,12 +3725,12 @@ debug_80C51E4: thumb_func_start debug_80C5208 debug_80C5208: push {r4, r5, r6, lr} - ldr r1, ._355 - ldr r0, ._355 + 4 + ldr r1, ._355 @ gUnknown_Debug_2038A1C + ldr r0, ._355 + 4 @ 0x2018000 str r0, [r1] mov r3, #0x0 add r6, r1, #0 - ldr r4, ._355 + 8 + ldr r4, ._355 + 8 @ gSaveBlock2 add r5, r6, #0 mov r2, #0x0 ._354: @@ -3778,7 +3778,7 @@ debug_80C5208: .align 2, 0 ._355: .word gUnknown_Debug_2038A1C - .word +0x2018000 + .word 0x2018000 .word gSaveBlock2 thumb_func_end debug_80C5208 @@ -3788,12 +3788,12 @@ debug_80C527C: push {r4, r5, r6, r7, lr} add r6, r0, #0 mov r5, #0x0 - ldr r7, ._359 + ldr r7, ._359 @ gPlayerPartyCount ._361: mov r0, #0x64 add r1, r5, #0 mul r1, r1, r0 - ldr r0, ._359 + 4 + ldr r0, ._359 + 4 @ gPlayerParty add r4, r1, r0 add r0, r4, #0 mov r1, #0xb @@ -3820,7 +3820,7 @@ debug_80C527C: lsr r5, r0, #0x18 cmp r5, #0x5 bls ._361 @cond_branch - ldr r0, ._362 + ldr r0, ._362 @ gUnknown_Debug_2038A1C ldr r0, [r0] bl SendMonToPC mov r0, #0x1 @@ -3839,7 +3839,7 @@ debug_80C527C: InitCreatePokemon: push {r4, r5, lr} add sp, sp, #0xffffffd4 - ldr r1, ._364 + ldr r1, ._364 @ gUnknown_Debug_083F8733 add r0, sp, #0x4 mov r2, #0x25 bl memcpy @@ -3852,30 +3852,30 @@ InitCreatePokemon: mov r2, #0x10 mov r3, #0x0 bl BeginNormalPaletteFade - ldr r0, ._364 + 4 + ldr r0, ._364 + 4 @ 0x4000050 mov r5, #0x0 strh r4, [r0] add r0, r0, #0x2 strh r4, [r0] add r0, r0, #0x2 strh r4, [r0] - ldr r3, ._364 + 8 + ldr r3, ._364 + 8 @ 0x4000208 ldrh r2, [r3] strh r4, [r3] - ldr r4, ._364 + 12 + ldr r4, ._364 + 12 @ 0x4000200 ldrh r0, [r4] mov r1, #0x1 orr r0, r0, r1 strh r0, [r4] strh r2, [r3] - ldr r2, ._364 + 16 + ldr r2, ._364 + 16 @ 0x4000004 ldrh r0, [r2] mov r1, #0x8 orr r0, r0, r1 strh r0, [r2] - ldr r0, ._364 + 20 + ldr r0, ._364 + 20 @ debug_80C3758 bl SetVBlankCallback - ldr r0, ._364 + 24 + ldr r0, ._364 + 24 @ debug_80C370C bl SetMainCallback2 mov r0, #0x0 mov r1, #0x0 @@ -3892,18 +3892,18 @@ InitCreatePokemon: lsl r2, r2, #0x5 add r0, r2, #0 strh r0, [r1] - ldr r0, ._364 + 28 + ldr r0, ._364 + 28 @ debug_80C53A4 mov r1, #0x0 bl CreateTask bl debug_80C5208 - ldr r1, ._364 + 32 + ldr r1, ._364 + 32 @ gUnknown_Debug_2038A1C ldr r0, [r1] mov r2, #0xb4 lsl r2, r2, #0x1 add r0, r0, r2 strb r5, [r0] ldr r0, [r1] - ldr r1, ._364 + 36 + ldr r1, ._364 + 36 @ 0x169 add r0, r0, r1 strb r5, [r0] add sp, sp, #0x2c @@ -3930,12 +3930,12 @@ InitCreatePokemon: debug_80C53A4: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._366 + ldr r2, ._366 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._366 + 4 + ldr r0, ._366 + 4 @ debug_80C53C0 str r0, [r1] bx lr ._367: @@ -3955,12 +3955,12 @@ debug_80C53C0: bl debug_80C6384 mov r0, #0x0 bl debug_80C627C - ldr r1, ._368 + ldr r1, ._368 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._368 + 4 + ldr r1, ._368 + 4 @ debug_80C53F0 str r1, [r0] pop {r4} pop {r0} @@ -3979,26 +3979,26 @@ debug_80C53F0: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r5, r0, #0x18 - ldr r0, ._372 + ldr r0, ._372 @ gMain ldrh r1, [r0, #0x2e] mov r2, #0x1 and r2, r2, r1 add r4, r0, #0 cmp r2, #0 beq ._370 @cond_branch - ldr r0, ._372 + 4 + ldr r0, ._372 + 4 @ gUnknown_Debug_2038A1C ldr r3, [r0] mov r0, #0xb2 lsl r0, r0, #0x1 add r2, r3, r0 - ldr r1, ._372 + 8 + ldr r1, ._372 + 8 @ gUnknown_Debug_083F8698 mov r4, #0xb4 lsl r4, r4, #0x1 add r0, r3, r4 ldrb r0, [r0] lsl r0, r0, #0x3 add r0, r0, r1 - ldr r6, ._372 + 12 + ldr r6, ._372 + 12 @ 0x169 add r1, r3, r6 ldrb r1, [r1] ldr r0, [r0] @@ -4016,12 +4016,12 @@ debug_80C53F0: mov r0, #0x0 strb r0, [r1] bl debug_80C643C - ldr r1, ._372 + 16 + ldr r1, ._372 + 16 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._372 + 20 + ldr r1, ._372 + 20 @ debug_80C55E4 b ._375 ._373: .align 2, 0 @@ -4044,14 +4044,14 @@ debug_80C53F0: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r0, ._376 + ldr r0, ._376 @ debug_80C370C bl SetMainCallback2 - ldr r1, ._376 + 4 + ldr r1, ._376 + 4 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._376 + 8 + ldr r1, ._376 + 8 @ debug_80C373C b ._375 ._377: .align 2, 0 @@ -4067,7 +4067,7 @@ debug_80C53F0: mov r0, #0x5 bl PlaySE bl debug_80C5FFC - ldr r0, ._381 + ldr r0, ._381 @ gUnknown_Debug_2038A1C ldr r0, [r0] bl debug_80C527C add r4, r0, #0 @@ -4080,7 +4080,7 @@ debug_80C53F0: bl Menu_DrawStdWindowFrame cmp r4, #0 beq ._379 @cond_branch - ldr r0, ._381 + 4 + ldr r0, ._381 + 4 @ gUnknown_Debug_083F872A mov r1, #0x4 mov r2, #0x9 bl Menu_PrintText @@ -4091,17 +4091,17 @@ debug_80C53F0: .word gUnknown_Debug_2038A1C .word gUnknown_Debug_083F872A ._379: - ldr r0, ._384 + ldr r0, ._384 @ gUnknown_Debug_083F8720 mov r1, #0x4 mov r2, #0x9 bl Menu_PrintText ._380: - ldr r0, ._384 + 4 + ldr r0, ._384 + 4 @ gTasks lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._384 + 8 + ldr r0, ._384 + 8 @ debug_80C5708 str r0, [r1] b ._400 ._385: @@ -4115,7 +4115,7 @@ debug_80C53F0: and r0, r0, r1 cmp r0, #0 beq ._386 @cond_branch - ldr r0, ._388 + ldr r0, ._388 @ gUnknown_Debug_2038A1C ldr r0, [r0] ldr r4, [r0, #0x64] lsl r4, r4, #0x10 @@ -4157,7 +4157,7 @@ debug_80C53F0: and r0, r0, r1 cmp r0, #0 beq ._395 @cond_branch - ldr r2, ._397 + ldr r2, ._397 @ gUnknown_Debug_2038A1C ldr r0, [r2] mov r6, #0xb4 lsl r6, r6, #0x1 @@ -4168,7 +4168,7 @@ debug_80C53F0: sub r0, r0, #0x1 strb r0, [r1] ldr r0, [r2] - ldr r1, ._397 + 4 + ldr r1, ._397 + 4 @ 0x169 add r0, r0, r1 strb r3, [r0] b ._396 @@ -4184,7 +4184,7 @@ debug_80C53F0: and r0, r0, r1 cmp r0, #0 beq ._400 @cond_branch - ldr r3, ._401 + ldr r3, ._401 @ gUnknown_Debug_2038A1C ldr r0, [r3] mov r4, #0xb4 lsl r4, r4, #0x1 @@ -4196,16 +4196,16 @@ debug_80C53F0: mov r1, #0x0 strb r0, [r2] ldr r0, [r3] - ldr r6, ._401 + 4 + ldr r6, ._401 + 4 @ 0x169 add r0, r0, r6 strb r1, [r0] ._396: - ldr r1, ._401 + 8 + ldr r1, ._401 + 8 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._401 + 12 + ldr r1, ._401 + 12 @ debug_80C53C0 ._375: str r1, [r0] ._400: @@ -4231,8 +4231,8 @@ debug_80C55E4: lsl r0, r0, #0x18 lsr r3, r0, #0x18 add r6, r3, #0 - ldr r1, ._405 - ldr r2, ._405 + 4 + ldr r1, ._405 @ gUnknown_Debug_083F8698 + ldr r2, ._405 + 4 @ gUnknown_Debug_2038A1C ldr r0, [r2] mov ip, r0 mov r0, #0xb4 @@ -4241,14 +4241,14 @@ debug_80C55E4: ldrb r0, [r0] lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._405 + 8 + ldr r1, ._405 + 8 @ 0x169 add r1, r1, ip ldrb r1, [r1] ldr r0, [r0] add r0, r0, r1 ldrb r5, [r0] add r7, r5, #0 - ldr r1, ._405 + 12 + ldr r1, ._405 + 12 @ gMain ldrh r4, [r1, #0x2e] mov r0, #0x1 and r0, r0, r4 @@ -4256,12 +4256,12 @@ debug_80C55E4: add r2, r1, #0 cmp r0, #0 beq ._403 @cond_branch - ldr r0, ._405 + 16 + ldr r0, ._405 + 16 @ gTasks lsl r1, r3, #0x2 add r1, r1, r3 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._405 + 20 + ldr r0, ._405 + 20 @ debug_80C53C0 str r0, [r1] b ._422 ._406: @@ -4287,12 +4287,12 @@ debug_80C55E4: add r1, r1, ip ldr r1, [r1] str r1, [r0] - ldr r1, ._409 + ldr r1, ._409 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._409 + 4 + ldr r1, ._409 + 4 @ debug_80C53C0 str r1, [r0] b ._422 ._410: @@ -4319,7 +4319,7 @@ debug_80C55E4: bl debug_80C643C b ._422 ._413: - ldr r0, ._419 + ldr r0, ._419 @ gUnknown_Debug_083F8554 lsl r1, r7, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -4380,18 +4380,18 @@ debug_80C5708: push {lr} lsl r0, r0, #0x18 lsr r2, r0, #0x18 - ldr r0, ._424 + ldr r0, ._424 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._423 @cond_branch - ldr r0, ._424 + 4 + ldr r0, ._424 + 4 @ gTasks lsl r1, r2, #0x2 add r1, r1, r2 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._424 + 8 + ldr r0, ._424 + 8 @ debug_80C53C0 str r0, [r1] ._423: pop {r0} @@ -4419,11 +4419,11 @@ debug_80C5738: mov r8, r2 cmp r4, #0xfe bne ._426 @cond_branch - ldr r1, ._428 + ldr r1, ._428 @ gUnknown_Debug_083F850A mov r2, #0x7 bl debug_80C689C add r0, r6, #7 - ldr r7, ._428 + 4 + ldr r7, ._428 + 4 @ gUnknown_Debug_2038A1C ldr r1, [r7] add r1, r1, #0xf0 ldr r1, [r1] @@ -4435,7 +4435,7 @@ debug_80C5738: strb r4, [r6, #0x14] add r0, r6, #0 add r0, r0, #0x15 - ldr r1, ._428 + 8 + ldr r1, ._428 + 8 @ gUnknown_Debug_083F8514 mov r2, #0x7 bl debug_80C689C add r0, r6, #0 @@ -4452,7 +4452,7 @@ debug_80C5738: add r0, r0, #0x1 strb r4, [r0] add r0, r0, #0x1 - ldr r1, ._428 + 12 + ldr r1, ._428 + 12 @ gUnknown_Debug_083F851C mov r2, #0x9 bl debug_80C689C add r0, r6, #0 @@ -4475,13 +4475,13 @@ debug_80C5738: ._426: cmp r4, #0xfd bne ._430 @cond_branch - ldr r1, ._432 + ldr r1, ._432 @ gUnknown_Debug_083F8524 add r0, r6, #0 mov r2, #0x9 bl debug_80C689C add r0, r6, #0 add r0, r0, #0x9 - ldr r7, ._432 + 4 + ldr r7, ._432 + 4 @ gUnknown_Debug_2038A1C ldr r1, [r7] add r1, r1, #0xfc ldr r1, [r1] @@ -4493,7 +4493,7 @@ debug_80C5738: strb r4, [r6, #0x16] add r0, r6, #0 add r0, r0, #0x17 - ldr r1, ._432 + 8 + ldr r1, ._432 + 8 @ gUnknown_Debug_083F852D mov r2, #0x9 bl debug_80C689C add r0, r6, #0 @@ -4512,7 +4512,7 @@ debug_80C5738: add r0, r0, #0x1 strb r4, [r0] add r0, r0, #0x1 - ldr r1, ._432 + 12 + ldr r1, ._432 + 12 @ gUnknown_Debug_083F8537 mov r2, #0x9 bl debug_80C689C add r0, r6, #0 @@ -4541,7 +4541,7 @@ debug_80C5738: lsr r1, r0, #0x10 cmp r1, #0xb bls ._434 @cond_branch - ldr r0, ._437 + ldr r0, ._437 @ gUnknown_Debug_083F8554 add r0, r5, r0 ldr r1, [r0] add r0, r6, #0 @@ -4557,7 +4557,7 @@ debug_80C5738: lsr r1, r0, #0x10 cmp r1, #0xff bls ._435 @cond_branch - ldr r0, ._437 + ldr r0, ._437 @ gUnknown_Debug_083F8554 add r0, r0, #0x4 add r0, r5, r0 ldr r0, [r0] @@ -4567,7 +4567,7 @@ debug_80C5738: cmp r4, #0x22 bhi ._436 @cond_branch lsl r0, r4, #0x2 - ldr r1, ._437 + 4 + ldr r1, ._437 + 4 @ add r1, r0, r1 ldr r1, [r1] add r7, r0, #0 @@ -4620,7 +4620,7 @@ debug_80C5738: ._440: add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._477 + ldr r1, ._477 @ gUnknown_Debug_2038A1C mov r9, r1 ldr r1, [r1] add r1, r1, #0x64 @@ -4650,7 +4650,7 @@ debug_80C5738: lsr r0, r0, #0x10 mov r1, #0xb mul r1, r1, r0 - ldr r0, ._477 + 4 + ldr r0, ._477 + 4 @ gSpeciesNames add r1, r1, r0 add r0, r4, #0 mov r2, #0xa @@ -4662,7 +4662,7 @@ debug_80C5738: .word gUnknown_Debug_2038A1C .word gSpeciesNames ._445: - ldr r0, ._483 + ldr r0, ._483 @ gUnknown_Debug_2038A1C ldr r0, [r0] add r0, r0, #0x64 add r0, r0, r7 @@ -4681,7 +4681,7 @@ debug_80C5738: ._480: add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._486 + ldr r1, ._486 @ gUnknown_Debug_083F8546 b ._488 ._487: .align 2, 0 @@ -4690,7 +4690,7 @@ debug_80C5738: ._479: add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._489 + ldr r1, ._489 @ gUnknown_Debug_083F8541 b ._488 ._490: .align 2, 0 @@ -4699,7 +4699,7 @@ debug_80C5738: ._481: add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._492 + ldr r1, ._492 @ gUnknown_Debug_083F8544 ._488: mov r2, #0x2 bl debug_80C689C @@ -4711,7 +4711,7 @@ debug_80C5738: ._450: add r0, r6, #0 add r0, r0, #0xa - ldr r4, ._495 + ldr r4, ._495 @ gUnknown_Debug_2038A1C ldr r1, [r4] add r1, r1, #0x64 add r1, r1, r7 @@ -4736,7 +4736,7 @@ debug_80C5738: ldr r2, [r1] mov r1, #0xd mul r1, r1, r2 - ldr r2, ._495 + 4 + ldr r2, ._495 + 4 @ gMoveNames add r1, r1, r2 b ._494 ._496: @@ -4747,7 +4747,7 @@ debug_80C5738: ._451: add r0, r6, #0 add r0, r0, #0xa - ldr r4, ._499 + ldr r4, ._499 @ gUnknown_Debug_2038A1C ldr r1, [r4] add r1, r1, #0x64 add r1, r1, r7 @@ -4786,7 +4786,7 @@ debug_80C5738: add r0, r5, #0 add r0, r0, #0xe add r0, r6, r0 - ldr r1, ._502 + ldr r1, ._502 @ gUnknown_Debug_083F8541 ._498: mov r2, #0x9 bl debug_80C689C @@ -4797,7 +4797,7 @@ debug_80C5738: .word gUnknown_Debug_083F8541 ._452: add r6, r6, #0xc - ldr r4, ._505 + ldr r4, ._505 @ gUnknown_Debug_2038A1C ldr r0, [r4] ldr r0, [r0, #0x64] lsl r0, r0, #0x10 @@ -4814,7 +4814,7 @@ debug_80C5738: lsr r0, r0, #0x18 mov r1, #0xd mul r1, r1, r0 - ldr r0, ._505 + 4 + ldr r0, ._505 + 4 @ gAbilityNames add r1, r1, r0 add r0, r6, #0 ._494: @@ -4829,8 +4829,8 @@ debug_80C5738: ._474: add r0, r6, #0 add r0, r0, #0xa - ldr r2, ._508 - ldr r1, ._508 + 4 + ldr r2, ._508 @ gUnknown_Debug_083F86E8 + ldr r1, ._508 + 4 @ gUnknown_Debug_2038A1C ldr r1, [r1] add r1, r1, #0x64 add r1, r1, r7 @@ -4847,7 +4847,7 @@ debug_80C5738: ._472: add r0, r6, #0 add r0, r0, #0xc - ldr r1, ._511 + ldr r1, ._511 @ gUnknown_Debug_2038A1C ldr r1, [r1] add r1, r1, #0x64 add r1, r1, r7 @@ -4860,7 +4860,7 @@ debug_80C5738: ._511: .word gUnknown_Debug_2038A1C ._473: - ldr r0, ._515 + ldr r0, ._515 @ gUnknown_Debug_2038A1C ldr r0, [r0] add r0, r0, #0x64 add r0, r0, r7 @@ -4869,7 +4869,7 @@ debug_80C5738: beq ._513 @cond_branch add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._515 + 4 + ldr r1, ._515 + 4 @ gUnknown_Debug_083F854A b ._514 ._516: .align 2, 0 @@ -4879,7 +4879,7 @@ debug_80C5738: ._513: add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._518 + ldr r1, ._518 @ gUnknown_Debug_083F854D ._514: mov r2, #0x4 bl debug_80C689C @@ -4891,8 +4891,8 @@ debug_80C5738: ._446: add r0, r6, #0 add r0, r0, #0xa - ldr r2, ._520 - ldr r1, ._520 + 4 + ldr r2, ._520 @ gNatureNames + ldr r1, ._520 + 4 @ gUnknown_Debug_2038A1C ldr r1, [r1] add r1, r1, #0x64 add r1, r1, r7 @@ -4921,7 +4921,7 @@ debug_80C5738: thumb_func_start debug_80C5B60 debug_80C5B60: lsl r0, r0, #0x18 - ldr r1, ._522 + ldr r1, ._522 @ gUnknown_Debug_2038A1C ldr r1, [r1] lsr r0, r0, #0x16 add r1, r1, #0x64 @@ -4944,7 +4944,7 @@ debug_80C5B74: cmp r2, #0x18 bhi ._540 @cond_branch lsl r0, r2, #0x2 - ldr r1, ._526 + ldr r1, ._526 @ add r1, r0, r1 ldr r1, [r1] add r3, r0, #0 @@ -4980,7 +4980,7 @@ debug_80C5B74: .word ._552 .word ._552 ._540: - ldr r0, ._554 + ldr r0, ._554 @ gUnknown_Debug_2038A1C ldr r0, [r0] lsl r1, r2, #0x2 add r0, r0, #0x64 @@ -4992,7 +4992,7 @@ debug_80C5B74: ._554: .word gUnknown_Debug_2038A1C ._532: - ldr r0, ._557 + ldr r0, ._557 @ gUnknown_Debug_2038A1C ldr r0, [r0] add r0, r0, #0x64 add r0, r0, r3 @@ -5004,7 +5004,7 @@ debug_80C5B74: ._557: .word gUnknown_Debug_2038A1C ._529: - ldr r4, ._560 + ldr r4, ._560 @ gUnknown_Debug_2038A1C ldr r1, [r4] add r0, r1, #0 add r0, r0, #0x64 @@ -5015,9 +5015,9 @@ debug_80C5B74: lsr r0, r0, #0x10 bl NationalPokedexNumToSpecies ldr r5, [r4] - ldr r4, ._560 + 4 + ldr r4, ._560 + 4 @ gExperienceTables lsl r2, r6, #0x2 - ldr r3, ._560 + 8 + ldr r3, ._560 + 8 @ gBaseStats lsl r0, r0, #0x10 lsr r0, r0, #0x10 lsl r1, r0, #0x3 @@ -5041,7 +5041,7 @@ debug_80C5B74: .word gExperienceTables .word gBaseStats ._530: - ldr r0, ._563 + ldr r0, ._563 @ gUnknown_Debug_2038A1C ldr r0, [r0] add r0, r0, #0x64 add r0, r0, r3 @@ -5053,7 +5053,7 @@ debug_80C5B74: ._563: .word gUnknown_Debug_2038A1C ._552: - ldr r0, ._565 + ldr r0, ._565 @ gUnknown_Debug_2038A1C ldr r0, [r0] add r0, r0, #0x64 add r0, r0, r3 @@ -5074,7 +5074,7 @@ debug_80C5B74: debug_80C5C94: push {r4, r5, r6, lr} add sp, sp, #0xfffffff0 - ldr r6, ._567 + ldr r6, ._567 @ gUnknown_Debug_2038A1C ldr r2, [r6] add r0, r2, #0 add r0, r0, #0x98 @@ -5239,7 +5239,7 @@ debug_80C5DEC: add sp, sp, #0xfffffffc mov r0, #0x0 str r0, [sp] - ldr r4, ._569 + ldr r4, ._569 @ gUnknown_Debug_2038A1C ldr r0, [r4] add r2, r0, #0 add r2, r2, #0x6c @@ -5356,7 +5356,7 @@ debug_80C5DEC: thumb_func_start debug_80C5EF4 debug_80C5EF4: push {r4, lr} - ldr r4, ._571 + ldr r4, ._571 @ gUnknown_Debug_2038A1C ldr r0, [r4] add r2, r0, #0 add r2, r2, #0x98 @@ -5477,16 +5477,16 @@ debug_80C5EF4: debug_80C5FFC: push {r4, r5, r6, r7, lr} add sp, sp, #0xffffffe0 - ldr r1, ._578 + ldr r1, ._578 @ gUnknown_Debug_083F8758 add r0, sp, #0x10 mov r2, #0x4 bl memcpy add r7, sp, #0x14 - ldr r1, ._578 + 4 + ldr r1, ._578 + 4 @ gUnknown_Debug_083F875C add r0, r7, #0 mov r2, #0x8 bl memcpy - ldr r5, ._578 + 8 + ldr r5, ._578 + 8 @ gUnknown_Debug_2038A1C ldr r2, [r5] add r0, r2, #0 add r0, r0, #0x98 @@ -5712,7 +5712,7 @@ debug_80C5FFC: add r1, r1, #0xec ldr r2, [r1] lsl r2, r2, #0x3 - ldr r1, ._578 + 12 + ldr r1, ._578 + 12 @ gUnknown_Debug_083F86E8 add r2, r2, r1 mov r1, #0x37 bl SetMonData @@ -5771,12 +5771,12 @@ debug_80C627C: lsl r0, r0, #0x18 lsr r4, r0, #0x18 add r6, r4, #0 - ldr r1, ._584 + ldr r1, ._584 @ gUnknown_Debug_083F7FD4 mov r0, sp mov r2, #0x2 bl memcpy add r5, sp, #0x4 - ldr r1, ._584 + 4 + ldr r1, ._584 + 4 @ gUnknown_Debug_083F8764 add r0, r5, #0 mov r2, #0x2 bl memcpy @@ -5797,9 +5797,9 @@ debug_80C627C: beq ._586 @cond_branch b ._595 ._582: - ldr r0, ._589 + ldr r0, ._589 @ gUnknown_Debug_2038A1C ldr r0, [r0] - ldr r1, ._589 + 4 + ldr r1, ._589 + 4 @ 0x169 add r0, r0, r1 b ._588 ._590: @@ -5808,12 +5808,12 @@ debug_80C627C: .word gUnknown_Debug_2038A1C .word 0x169 ._580: - ldr r4, ._593 + ldr r4, ._593 @ gUnknown_Debug_2038A1C ldr r3, [r4] - ldr r1, ._593 + 4 + ldr r1, ._593 + 4 @ 0x169 add r0, r3, r1 ldrb r2, [r0] - ldr r1, ._593 + 8 + ldr r1, ._593 + 8 @ gUnknown_Debug_083F8698 mov r6, #0xb4 lsl r6, r6, #0x1 add r0, r3, r6 @@ -5833,7 +5833,7 @@ debug_80C627C: mov r1, #0x1 bl Menu_PrintText ldr r0, [r4] - ldr r2, ._593 + 4 + ldr r2, ._593 + 4 @ 0x169 add r1, r0, r2 ldrb r0, [r1] add r0, r0, #0x1 @@ -5858,9 +5858,9 @@ debug_80C627C: .word 0x169 .word gUnknown_Debug_083F8698 ._586: - ldr r4, ._596 + ldr r4, ._596 @ gUnknown_Debug_2038A1C ldr r0, [r4] - ldr r2, ._596 + 4 + ldr r2, ._596 + 4 @ 0x169 add r1, r0, r2 ldrb r0, [r1] cmp r0, #0 @@ -5875,7 +5875,7 @@ debug_80C627C: mov r1, #0x1 bl Menu_PrintText ldr r0, [r4] - ldr r2, ._596 + 4 + ldr r2, ._596 + 4 @ 0x169 add r1, r0, r2 ldrb r0, [r1] sub r0, r0, #0x1 @@ -5914,8 +5914,8 @@ debug_80C6384: mov r3, #0x13 bl Menu_DrawStdWindowFrame mov r5, #0x0 - ldr r3, ._600 - ldr r1, ._600 + 4 + ldr r3, ._600 @ gUnknown_Debug_083F8698 + ldr r1, ._600 + 4 @ gUnknown_Debug_2038A1C ldr r0, [r1] mov r2, #0xb4 lsl r2, r2, #0x1 @@ -5928,7 +5928,7 @@ debug_80C6384: cmp r0, #0xff beq ._598 @cond_branch add r4, r1, #0 - ldr r0, ._600 + 8 + ldr r0, ._600 + 8 @ 0x16b mov r9, r0 mov r8, r3 add r7, r2, #0 @@ -5943,7 +5943,7 @@ debug_80C6384: add r0, r0, r1 strb r6, [r0] ldr r0, [r4] - ldr r2, ._600 + 12 + ldr r2, ._600 + 12 @ 0x16d add r0, r0, r2 strb r6, [r0] ldr r1, [r4] @@ -6008,8 +6008,8 @@ debug_80C643C: mov r3, #0x12 bl Menu_BlankWindowRect mov r5, #0x0 - ldr r6, ._605 - ldr r1, ._605 + 4 + ldr r6, ._605 @ gUnknown_Debug_083F8698 + ldr r1, ._605 + 4 @ gUnknown_Debug_2038A1C ldr r0, [r1] mov r3, #0xb4 lsl r3, r3, #0x1 @@ -6026,7 +6026,7 @@ debug_80C643C: mov r8, r0 ._607: ldr r0, [r4] - ldr r7, ._605 + 8 + ldr r7, ._605 + 8 @ 0x16b add r2, r0, r7 mov r0, #0xfc strb r0, [r2] @@ -6037,12 +6037,12 @@ debug_80C643C: mov r7, r8 strb r7, [r0] ldr r2, [r4] - ldr r7, ._605 + 12 + ldr r7, ._605 + 12 @ 0x169 add r0, r2, r7 ldrb r0, [r0] cmp r5, r0 bne ._603 @cond_branch - ldr r0, ._605 + 16 + ldr r0, ._605 + 16 @ 0x16d add r2, r2, r0 mov r0, #0x2 strb r0, [r2] @@ -6069,7 +6069,7 @@ debug_80C643C: .word 0x169 .word 0x16d ._603: - ldr r3, ._608 + ldr r3, ._608 @ 0x16d add r0, r2, r3 mov r7, r8 strb r7, [r0] @@ -6077,7 +6077,7 @@ debug_80C643C: mov r2, #0xb7 lsl r2, r2, #0x1 add r0, r1, r2 - ldr r2, ._608 + 4 + ldr r2, ._608 + 4 @ gUnknown_Debug_083F8698 sub r3, r3, #0x5 add r1, r1, r3 ldrb r1, [r1] @@ -6090,7 +6090,7 @@ debug_80C643C: bl debug_80C5738 ._604: ldr r0, [r4] - ldr r7, ._608 + 8 + ldr r7, ._608 + 8 @ 0x16b add r0, r0, r7 lsl r2, r5, #0x19 mov r1, #0xa0 @@ -6102,7 +6102,7 @@ debug_80C643C: add r0, r5, #1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 - ldr r6, ._608 + 4 + ldr r6, ._608 + 4 @ gUnknown_Debug_083F8698 add r1, r4, #0 ldr r0, [r4] mov r3, #0xb4 @@ -6140,9 +6140,9 @@ debug_80C6544: lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r9, r0 - ldr r0, ._614 + ldr r0, ._614 @ gUnknown_Debug_083F8698 mov r8, r0 - ldr r6, ._614 + 4 + ldr r6, ._614 + 4 @ gUnknown_Debug_2038A1C ldr r1, [r6] mov r5, #0xb4 lsl r5, r5, #0x1 @@ -6150,7 +6150,7 @@ debug_80C6544: ldrb r0, [r0] lsl r0, r0, #0x3 add r0, r0, r8 - ldr r4, ._614 + 8 + ldr r4, ._614 + 8 @ 0x169 add r1, r1, r4 ldrb r1, [r1] ldr r0, [r0] @@ -6158,7 +6158,7 @@ debug_80C6544: ldrb r0, [r0] bl debug_80C5B60 add r7, r0, #0 - ldr r2, ._614 + 12 + ldr r2, ._614 + 12 @ gUnknown_Debug_083F8554 ldr r3, [r6] add r5, r3, r5 ldrb r0, [r5] @@ -6175,7 +6175,7 @@ debug_80C6544: ldr r1, [r0] ldr r5, [r1] ldr r4, [r1, #0x4] - ldr r2, ._614 + 16 + ldr r2, ._614 + 16 @ gUnknown_Debug_083F8768 mov r6, #0xb5 lsl r6, r6, #0x1 add r0, r3, r6 @@ -6225,8 +6225,8 @@ debug_80C6544: ._622: add r7, r4, #0 ._623: - ldr r1, ._624 - ldr r0, ._624 + 4 + ldr r1, ._624 @ gUnknown_Debug_083F8698 + ldr r0, ._624 + 4 @ gUnknown_Debug_2038A1C ldr r2, [r0] mov r3, #0xb4 lsl r3, r3, #0x1 @@ -6234,7 +6234,7 @@ debug_80C6544: ldrb r0, [r0] lsl r0, r0, #0x3 add r0, r0, r1 - ldr r6, ._624 + 8 + ldr r6, ._624 + 8 @ 0x169 add r1, r2, r6 ldrb r1, [r1] ldr r0, [r0] @@ -6275,7 +6275,7 @@ debug_80C6630: add r4, r4, #0x1 cmp r2, #0x2 bne ._626 @cond_branch - ldr r0, ._629 + ldr r0, ._629 @ gUnknown_Debug_2038A1C ldr r0, [r0] mov r5, #0xb5 lsl r5, r5, #0x1 @@ -6321,7 +6321,7 @@ debug_80C6678: cmp r0, #0x9 bhi ._644 @cond_branch lsl r0, r0, #0x2 - ldr r1, ._633 + ldr r1, ._633 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -6343,7 +6343,7 @@ debug_80C6678: ._644: mov r0, r9 add r4, r0, r7 - ldr r5, ._645 + ldr r5, ._645 @ 0x3b9aca00 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6364,7 +6364,7 @@ debug_80C6678: ._643: mov r1, r9 add r4, r1, r7 - ldr r5, ._645 + 4 + ldr r5, ._645 + 4 @ 0x5f5e100 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6385,7 +6385,7 @@ debug_80C6678: ._642: mov r0, r9 add r4, r0, r7 - ldr r5, ._645 + 8 + ldr r5, ._645 + 8 @ 0x989680 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6406,7 +6406,7 @@ debug_80C6678: ._641: mov r1, r9 add r4, r1, r7 - ldr r5, ._645 + 12 + ldr r5, ._645 + 12 @ 0xf4240 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6427,7 +6427,7 @@ debug_80C6678: ._640: mov r0, r9 add r4, r0, r7 - ldr r5, ._645 + 16 + ldr r5, ._645 + 16 @ 0x186a0 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6448,7 +6448,7 @@ debug_80C6678: ._639: mov r1, r9 add r4, r1, r7 - ldr r5, ._645 + 20 + ldr r5, ._645 + 20 @ 0x2710 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6683,19 +6683,19 @@ InitSeePokemonGraphics: push {r4, r5, r6, lr} add sp, sp, #0xfffffff8 bl debug_80C35DC - ldr r1, ._659 - ldr r2, ._659 + 4 - ldr r0, ._659 + 8 + ldr r1, ._659 @ byte_83F88EC + ldr r2, ._659 + 4 @ 0x600e000 + ldr r0, ._659 + 8 @ 0x40000d4 str r1, [r0] str r2, [r0, #0x4] - ldr r1, ._659 + 12 + ldr r1, ._659 + 12 @ 0x80000400 str r1, [r0, #0x8] ldr r0, [r0, #0x8] - ldr r0, ._659 + 16 + ldr r0, ._659 + 16 @ word_83F888C mov r1, #0x80 mov r2, #0x60 bl LoadPalette - ldr r1, ._659 + 20 + ldr r1, ._659 + 20 @ 0x7fff add r0, sp, #0x4 strh r1, [r0] mov r1, #0x0 @@ -6709,7 +6709,7 @@ InitSeePokemonGraphics: mov r2, #0x10 mov r3, #0x0 bl BeginNormalPaletteFade - ldr r0, ._659 + 24 + ldr r0, ._659 + 24 @ 0x4000040 mov r6, #0x0 strh r5, [r0] add r0, r0, #0x4 @@ -6718,7 +6718,7 @@ InitSeePokemonGraphics: strh r5, [r0] add r0, r0, #0x4 strh r5, [r0] - ldr r1, ._659 + 28 + ldr r1, ._659 + 28 @ 0x4000048 mov r0, #0x3f strh r0, [r1] add r1, r1, #0x2 @@ -6727,31 +6727,31 @@ InitSeePokemonGraphics: add r1, r1, #0x6 mov r0, #0xf1 strh r0, [r1] - ldr r0, ._659 + 32 + ldr r0, ._659 + 32 @ 0x4000052 strh r5, [r0] add r1, r1, #0x4 mov r0, #0x7 strh r0, [r1] - ldr r3, ._659 + 36 + ldr r3, ._659 + 36 @ 0x4000208 ldrh r2, [r3] strh r5, [r3] - ldr r4, ._659 + 40 + ldr r4, ._659 + 40 @ 0x4000200 ldrh r0, [r4] mov r1, #0x1 orr r0, r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, ._659 + 44 + ldr r0, ._659 + 44 @ debug_80C3758 bl SetVBlankCallback - ldr r0, ._659 + 48 + ldr r0, ._659 + 48 @ debug_80C370C bl SetMainCallback2 bl sub_809D51C - ldr r1, ._659 + 52 - ldr r2, ._659 + 56 + ldr r1, ._659 + 52 @ 0x4000008 + ldr r2, ._659 + 56 @ 0x1f0b add r0, r2, #0 strh r0, [r1] add r1, r1, #0x2 - ldr r2, ._659 + 60 + ldr r2, ._659 + 60 @ 0x1e0a add r0, r2, #0 strh r0, [r1] sub r1, r1, #0xa @@ -6759,13 +6759,13 @@ InitSeePokemonGraphics: lsl r2, r2, #0x6 add r0, r2, #0 strh r0, [r1] - ldr r0, ._659 + 64 + ldr r0, ._659 + 64 @ debug_80C6B00 mov r1, #0x0 bl CreateTask - ldr r1, ._659 + 68 - ldr r0, ._659 + 72 + ldr r1, ._659 + 68 @ gUnknown_Debug_2038A20 + ldr r0, ._659 + 72 @ 0x2018000 str r0, [r1] - ldr r1, ._659 + 76 + ldr r1, ._659 + 76 @ 0x115 strh r1, [r0] strb r6, [r0, #0x2] strb r6, [r0, #0x3] @@ -6773,7 +6773,7 @@ InitSeePokemonGraphics: strb r6, [r0, #0x7] strb r6, [r0, #0xa] strb r6, [r0, #0x8] - ldr r4, ._659 + 80 + ldr r4, ._659 + 80 @ gSpriteTemplate_83F8874 add r0, r4, #0 mov r1, #0x6c mov r2, #0x74 @@ -6782,7 +6782,7 @@ InitSeePokemonGraphics: add r1, r0, #0 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - ldr r6, ._659 + 84 + ldr r6, ._659 + 84 @ gSprites lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 @@ -6845,7 +6845,7 @@ InitSeePokemonGraphics: .word 0x1e0a .word debug_80C6B00+1 .word gUnknown_Debug_2038A20 - .word +0x2018000 + .word 0x2018000 .word 0x115 .word gSpriteTemplate_83F8874 .word gSprites @@ -6860,7 +6860,7 @@ debug_80C6B00: add sp, sp, #0xffffffec lsl r0, r0, #0x18 lsr r7, r0, #0x18 - ldr r1, ._666 + ldr r1, ._666 @ gUnknown_Debug_083F8815 mov r0, sp mov r2, #0x12 bl memcpy @@ -6884,15 +6884,15 @@ debug_80C6B00: mov r2, #0x1d mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r0, ._666 + 4 + ldr r0, ._666 + 4 @ gUnknown_Debug_083F87D0 mov r1, #0x11 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._666 + 8 + ldr r0, ._666 + 8 @ gUnknown_Debug_083F87D8 mov r1, #0x1b mov r2, #0x1 bl Menu_PrintText - ldr r0, ._666 + 12 + ldr r0, ._666 + 12 @ gUnknown_Debug_083F87E0 mov r1, #0x11 mov r2, #0x5 bl Menu_PrintText @@ -6902,8 +6902,8 @@ debug_80C6B00: mov r3, #0xc bl Menu_DrawStdWindowFrame mov r2, #0x0 - ldr r4, ._666 + 16 - ldr r0, ._666 + 20 + ldr r4, ._666 + 16 @ 0x600fa56 + ldr r0, ._666 + 20 @ 0xa311 add r3, r0, #0 ._661: lsl r0, r2, #0x1 @@ -6916,11 +6916,11 @@ debug_80C6B00: cmp r2, #0xe bls ._661 @cond_branch mov r2, #0x0 - ldr r5, ._666 + 24 + ldr r5, ._666 + 24 @ gUnknown_Debug_083F87F4 lsl r6, r7, #0x2 mov r8, r6 - ldr r4, ._666 + 28 - ldr r0, ._666 + 32 + ldr r4, ._666 + 28 @ 0x600f256 + ldr r0, ._666 + 32 @ 0x8301 add r3, r0, #0 ._662: lsl r0, r2, #0x1 @@ -6945,7 +6945,7 @@ debug_80C6B00: mov r0, #0x23 strb r0, [r1] mov r2, #0x0 - ldr r4, ._666 + 36 + ldr r4, ._666 + 36 @ 0x600f396 mov r5, #0x93 lsl r5, r5, #0x8 add r3, r5, #0 @@ -6966,8 +6966,8 @@ debug_80C6B00: mov r0, #0x24 strb r0, [r1] mov r2, #0x0 - ldr r5, ._666 + 40 - ldr r4, ._666 + 44 + ldr r5, ._666 + 40 @ gUnknown_Debug_083F8801 + ldr r4, ._666 + 44 @ 0x600f3d6 mov r0, #0x93 lsl r0, r0, #0x8 add r3, r0, #0 @@ -6988,7 +6988,7 @@ debug_80C6B00: mov r0, #0x25 strb r0, [r1] mov r2, #0x0 - ldr r4, ._666 + 48 + ldr r4, ._666 + 48 @ 0x600f416 mov r0, #0x93 lsl r0, r0, #0x8 add r3, r0, #0 @@ -7009,20 +7009,20 @@ debug_80C6B00: mov r1, #0xf mov r2, #0x11 bl Menu_PrintText - ldr r1, ._666 + 52 - ldr r2, ._666 + 56 + ldr r1, ._666 + 52 @ 0x4000040 + ldr r2, ._666 + 56 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r5, ._666 + 60 + ldr r5, ._666 + 60 @ 0x699f add r0, r5, #0 strh r0, [r1] - ldr r1, ._666 + 64 + ldr r1, ._666 + 64 @ gTasks mov r6, r8 add r0, r6, r7 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._666 + 68 + ldr r1, ._666 + 68 @ debug_80C6CB8 str r1, [r0] add sp, sp, #0x14 pop {r3} @@ -7066,18 +7066,18 @@ debug_80C6CB8: lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov sl, r0 - ldr r5, ._668 + ldr r5, ._668 @ gUnknown_Debug_2038A20 ldr r4, [r5] ldrh r2, [r4] lsl r0, r2, #0x3 - ldr r1, ._668 + 4 + ldr r1, ._668 + 4 @ gMonFrontPicTable add r0, r0, r1 - ldr r1, ._668 + 8 + ldr r1, ._668 + 8 @ gMonFrontPicCoords lsl r2, r2, #0x2 add r2, r2, r1 ldrb r1, [r2] ldrb r2, [r2, #0x1] - ldr r3, ._668 + 12 + ldr r3, ._668 + 12 @ gUnknown_081FAF4C mov r8, r3 ldr r6, [r3] str r6, [sp, #0x8] @@ -7090,14 +7090,14 @@ debug_80C6CB8: ldr r0, [r5] ldrh r0, [r0] lsl r0, r0, #0x3 - ldr r7, ._668 + 16 + ldr r7, ._668 + 16 @ gMonPaletteTable add r0, r0, r7 bl LoadCompressedObjectPalette ldr r0, [r5] ldrh r0, [r0] mov r1, #0x1 bl GetMonSpriteTemplate_803C56C - ldr r0, ._668 + 20 + ldr r0, ._668 + 20 @ gUnknown_02024E8C mov r1, #0x28 mov r2, #0x28 mov r3, #0x0 @@ -7109,16 +7109,16 @@ debug_80C6CB8: lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 - ldr r1, ._668 + 24 + ldr r1, ._668 + 24 @ gSprites add r0, r0, r1 - ldr r3, ._668 + 28 + ldr r3, ._668 + 28 @ debug_69 mov r9, r3 str r3, [r0] ldrb r0, [r2, #0x2] lsl r1, r0, #0x4 add r1, r1, r0 lsl r1, r1, #0x2 - ldr r6, ._668 + 32 + ldr r6, ._668 + 32 @ gSprites add r1, r1, r6 ldrb r2, [r1, #0x5] mov r6, #0xd @@ -7129,9 +7129,9 @@ debug_80C6CB8: ldr r4, [r5] ldrh r2, [r4] lsl r0, r2, #0x3 - ldr r1, ._668 + 36 + ldr r1, ._668 + 36 @ gMonBackPicTable add r0, r0, r1 - ldr r1, ._668 + 40 + ldr r1, ._668 + 40 @ gMonBackPicCoords lsl r2, r2, #0x2 add r2, r2, r1 ldrb r1, [r2] @@ -7146,14 +7146,14 @@ debug_80C6CB8: ldr r0, [r5] ldrh r0, [r0] lsl r0, r0, #0x3 - ldr r1, ._668 + 16 + ldr r1, ._668 + 16 @ gMonPaletteTable add r0, r0, r1 bl LoadCompressedObjectPalette ldr r0, [r5] ldrh r0, [r0] mov r1, #0x2 bl GetMonSpriteTemplate_803C56C - ldr r0, ._668 + 20 + ldr r0, ._668 + 20 @ gUnknown_02024E8C mov r1, #0x28 mov r2, #0x78 mov r3, #0x0 @@ -7165,7 +7165,7 @@ debug_80C6CB8: lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 - ldr r3, ._668 + 24 + ldr r3, ._668 + 24 @ gSprites add r0, r0, r3 mov r7, r9 str r7, [r0] @@ -7173,14 +7173,14 @@ debug_80C6CB8: lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 - ldr r1, ._668 + 32 + ldr r1, ._668 + 32 @ gSprites add r0, r0, r1 ldrb r1, [r0, #0x5] and r6, r6, r1 strb r6, [r0, #0x5] ldr r0, [r5] ldrh r0, [r0] - ldr r1, ._668 + 44 + ldr r1, ._668 + 44 @ sub_809D62C mov r2, #0x0 str r2, [sp] str r2, [sp, #0x4] @@ -7198,20 +7198,20 @@ debug_80C6CB8: lsl r2, r2, #0x2 mov r1, #0x2 bl sub_8091738 - ldr r1, ._668 + 48 - ldr r3, ._668 + 52 + ldr r1, ._668 + 48 @ 0x600f858 + ldr r3, ._668 + 52 @ 0xf3fc add r0, r3, #0 strh r0, [r1] add r1, r1, #0x2 - ldr r6, ._668 + 56 + ldr r6, ._668 + 56 @ 0xf3fd add r0, r6, #0 strh r0, [r1] add r1, r1, #0x3e - ldr r7, ._668 + 60 + ldr r7, ._668 + 60 @ 0xf3fe add r0, r7, #0 strh r0, [r1] add r1, r1, #0x2 - ldr r2, ._668 + 64 + ldr r2, ._668 + 64 @ 0xf3ff add r0, r2, #0 strh r0, [r1] ldr r0, [r5] @@ -7229,7 +7229,7 @@ debug_80C6CB8: lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 - ldr r3, ._668 + 32 + ldr r3, ._668 + 32 @ gSprites add r0, r0, r3 ldrb r0, [r0, #0x5] lsr r0, r0, #0x4 @@ -7237,9 +7237,9 @@ debug_80C6CB8: ldr r0, [r5] ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 - ldr r4, ._668 + 68 + ldr r4, ._668 + 68 @ gPlttBufferUnfaded add r0, r0, r4 - ldr r6, ._668 + 72 + ldr r6, ._668 + 72 @ 0xffffff00 add r1, r4, r6 mov r2, #0x10 bl CpuSet @@ -7247,16 +7247,16 @@ debug_80C6CB8: ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 add r0, r0, r4 - ldr r1, ._668 + 76 + ldr r1, ._668 + 76 @ gPlttBufferFaded mov r2, #0x10 bl CpuSet - ldr r1, ._668 + 80 + ldr r1, ._668 + 80 @ gTasks mov r7, sl lsl r0, r7, #0x2 add r0, r0, sl lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._668 + 84 + ldr r1, ._668 + 84 @ debug_80C6EE8 str r1, [r0] ldr r0, [r5] mov r1, #0x0 @@ -7308,14 +7308,14 @@ debug_80C6EE8: add r6, r0, #0 lsl r6, r6, #0x18 lsr r6, r6, #0x18 - ldr r4, ._670 - ldr r5, ._670 + 4 + ldr r4, ._670 @ gPlttBufferUnfaded + ldr r5, ._670 + 4 @ gUnknown_Debug_2038A20 ldr r1, [r5] add r1, r1, #0x10 add r0, r4, #0 mov r2, #0x10 bl CpuSet - ldr r0, ._670 + 8 + ldr r0, ._670 + 8 @ 0xffffff00 add r4, r4, r0 ldr r3, [r5] ldrb r0, [r3, #0x7] @@ -7336,7 +7336,7 @@ debug_80C6EE8: lsl r1, r1, #0x2 and r1, r1, r4 ldrh r2, [r3, #0xc] - ldr r0, ._670 + 12 + ldr r0, ._670 + 12 @ 0xfffffc1f and r0, r0, r2 orr r0, r0, r1 strh r0, [r3, #0xc] @@ -7362,7 +7362,7 @@ debug_80C6EE8: mov r2, #0xa mov r3, #0x2 bl debug_80C68CC - ldr r0, ._670 + 16 + ldr r0, ._670 + 16 @ gUnknown_Debug_083F8813 mov r1, #0xd mov r2, #0xa bl Menu_PrintText @@ -7371,12 +7371,12 @@ debug_80C6EE8: mov r2, #0xa mov r3, #0x4 bl debug_80C68CC - ldr r1, ._670 + 20 + ldr r1, ._670 + 20 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._670 + 24 + ldr r1, ._670 + 24 @ debug_80C6FA8 str r1, [r0] pop {r4, r5, r6} pop {r0} @@ -7400,7 +7400,7 @@ debug_80C6FA8: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r6, r0, #0x18 - ldr r1, ._674 + ldr r1, ._674 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x2 and r0, r0, r2 @@ -7416,14 +7416,14 @@ debug_80C6FA8: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r0, ._674 + 4 + ldr r0, ._674 + 4 @ debug_80C370C bl SetMainCallback2 - ldr r1, ._674 + 8 + ldr r1, ._674 + 8 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._674 + 12 + ldr r1, ._674 + 12 @ debug_80C373C str r1, [r0] b ._703 ._675: @@ -7440,7 +7440,7 @@ debug_80C6FA8: and r0, r0, r1 cmp r0, #0 beq ._676 @cond_branch - ldr r4, ._678 + ldr r4, ._678 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrh r1, [r0] mov r0, #0x0 @@ -7455,7 +7455,7 @@ debug_80C6FA8: and r0, r0, r1 cmp r0, #0 beq ._680 @cond_branch - ldr r4, ._682 + ldr r4, ._682 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrh r1, [r0] mov r0, #0x1 @@ -7463,12 +7463,12 @@ debug_80C6FA8: bl debug_80C3878 ldr r1, [r4] strh r0, [r1] - ldr r1, ._682 + 4 + ldr r1, ._682 + 4 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._682 + 8 + ldr r1, ._682 + 8 @ debug_80C71FC str r1, [r0] b ._703 ._683: @@ -7482,24 +7482,24 @@ debug_80C6FA8: and r3, r3, r2 cmp r3, #0 beq ._684 @cond_branch - ldr r0, ._686 + ldr r0, ._686 @ gUnknown_Debug_2038A20 ldr r1, [r0] mov r0, #0x1 strb r0, [r1, #0x5] - ldr r1, ._686 + 4 - ldr r2, ._686 + 8 + ldr r1, ._686 + 4 @ 0x4000040 + ldr r2, ._686 + 8 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._686 + 12 + ldr r2, ._686 + 12 @ 0x4167 add r0, r2, #0 strh r0, [r1] - ldr r1, ._686 + 16 + ldr r1, ._686 + 16 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._686 + 20 + ldr r1, ._686 + 20 @ debug_80C7294 str r1, [r0] b ._703 ._687: @@ -7516,13 +7516,13 @@ debug_80C6FA8: and r0, r0, r1 cmp r0, #0 beq ._689 @cond_branch - ldr r1, ._691 + ldr r1, ._691 @ gUnknown_Debug_2038A20 ldr r2, [r1] ldrb r0, [r2, #0x7] cmp r0, #0xd bhi ._689 @cond_branch lsl r0, r0, #0x1 - ldr r2, ._691 + 4 + ldr r2, ._691 + 4 @ 0x5000102 add r0, r0, r2 strh r3, [r0] ldr r1, [r1] @@ -7541,13 +7541,13 @@ debug_80C6FA8: and r0, r0, r1 cmp r0, #0 beq ._694 @cond_branch - ldr r2, ._696 + ldr r2, ._696 @ gUnknown_Debug_2038A20 ldr r1, [r2] ldrb r0, [r1, #0x7] cmp r0, #0 beq ._694 @cond_branch lsl r0, r0, #0x1 - ldr r1, ._696 + 4 + ldr r1, ._696 + 4 @ 0x5000102 add r0, r0, r1 mov r1, #0x0 strh r1, [r0] @@ -7567,7 +7567,7 @@ debug_80C6FA8: and r0, r0, r1 cmp r0, #0 beq ._698 @cond_branch - ldr r4, ._701 + ldr r4, ._701 @ gUnknown_Debug_2038A20 ldr r2, [r4] ldrb r0, [r2, #0x9] mov r1, #0x1 @@ -7610,13 +7610,13 @@ debug_80C6FA8: mov r2, #0x20 bl LoadCompressedPalette ._700: - ldr r5, ._704 + ldr r5, ._704 @ gUnknown_Debug_2038A20 ldr r0, [r5] ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 - ldr r4, ._704 + 4 + ldr r4, ._704 + 4 @ gPlttBufferUnfaded add r0, r0, r4 - ldr r2, ._704 + 8 + ldr r2, ._704 + 8 @ 0xffffff00 add r1, r4, r2 mov r2, #0x10 bl CpuSet @@ -7624,16 +7624,16 @@ debug_80C6FA8: ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 add r0, r0, r4 - ldr r1, ._704 + 12 + ldr r1, ._704 + 12 @ gPlttBufferFaded mov r2, #0x10 bl CpuSet ._695: - ldr r1, ._704 + 16 + ldr r1, ._704 + 16 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._704 + 20 + ldr r1, ._704 + 20 @ debug_80C6EE8 str r1, [r0] b ._703 ._705: @@ -7651,13 +7651,13 @@ debug_80C6FA8: cmp r0, #0 beq ._706 @cond_branch bl StopCryAndClearCrySongs - ldr r0, ._707 + ldr r0, ._707 @ gUnknown_Debug_2038A20 ldr r0, [r0] ldrh r0, [r0] mov r1, #0x0 bl PlayCry1 ._706: - ldr r2, ._707 + ldr r2, ._707 @ gUnknown_Debug_2038A20 ldr r1, [r2] ldrb r0, [r1, #0x8] add r0, r0, #0x4 @@ -7670,9 +7670,9 @@ debug_80C6FA8: ldr r0, [r2] ldrb r1, [r0, #0x7] lsl r1, r1, #0x1 - ldr r2, ._707 + 4 + ldr r2, ._707 + 4 @ 0x5000142 add r1, r1, r2 - ldr r2, ._707 + 8 + ldr r2, ._707 + 8 @ gUnknown_Debug_083F8790 ldrb r0, [r0, #0x8] lsl r0, r0, #0x1 add r0, r0, r2 @@ -7698,8 +7698,8 @@ debug_80C71FC: add r5, r0, #0 lsl r5, r5, #0x18 lsr r5, r5, #0x18 - ldr r6, ._709 - ldr r4, ._709 + 4 + ldr r6, ._709 @ gSprites + ldr r4, ._709 + 4 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrb r1, [r0, #0x2] lsl r0, r1, #0x4 @@ -7745,12 +7745,12 @@ debug_80C71FC: lsl r0, r0, #0x2 add r0, r0, r6 bl sub_809D510 - ldr r1, ._709 + 8 + ldr r1, ._709 + 8 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._709 + 12 + ldr r1, ._709 + 12 @ debug_80C6CB8 str r1, [r0] pop {r4, r5, r6} pop {r0} @@ -7770,23 +7770,23 @@ debug_80C7294: push {r4, r5, r6, r7, lr} lsl r0, r0, #0x18 lsr r7, r0, #0x18 - ldr r0, ._713 + ldr r0, ._713 @ gMain ldrh r2, [r0, #0x2e] mov r1, #0x1 and r1, r1, r2 add r3, r0, #0 cmp r1, #0 beq ._711 @cond_branch - ldr r0, ._713 + 4 + ldr r0, ._713 + 4 @ gUnknown_Debug_2038A20 ldr r1, [r0] mov r0, #0x0 strb r0, [r1, #0x5] - ldr r1, ._713 + 8 - ldr r2, ._713 + 12 + ldr r1, ._713 + 8 @ 0x4000040 + ldr r2, ._713 + 12 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._713 + 16 + ldr r2, ._713 + 16 @ 0x699f add r0, r2, #0 strh r0, [r1] b ._712 @@ -7803,26 +7803,26 @@ debug_80C7294: and r0, r0, r2 cmp r0, #0 beq ._715 @cond_branch - ldr r6, ._717 + ldr r6, ._717 @ gUnknown_Debug_2038A20 ldr r0, [r6] strb r1, [r0, #0x5] - ldr r1, ._717 + 4 - ldr r2, ._717 + 8 + ldr r1, ._717 + 4 @ 0x4000040 + ldr r2, ._717 + 8 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._717 + 12 + ldr r2, ._717 + 12 @ 0x699f add r0, r2, #0 strh r0, [r1] ldr r0, [r6] add r0, r0, #0x10 - ldr r4, ._717 + 16 + ldr r4, ._717 + 16 @ gPlttBufferUnfaded add r1, r4, #0 mov r2, #0x10 bl CpuSet ldr r0, [r6] add r0, r0, #0x10 - ldr r5, ._717 + 20 + ldr r5, ._717 + 20 @ gPlttBufferFaded add r1, r5, #0 mov r2, #0x10 bl CpuSet @@ -7849,12 +7849,12 @@ debug_80C7294: mov r2, #0x10 bl CpuSet ._712: - ldr r1, ._717 + 24 + ldr r1, ._717 + 24 @ gTasks lsl r0, r7, #0x2 add r0, r0, r7 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._717 + 28 + ldr r1, ._717 + 28 @ debug_80C6EE8 str r1, [r0] b ._754 ._718: @@ -7874,7 +7874,7 @@ debug_80C7294: and r0, r0, r1 cmp r0, #0 beq ._720 @cond_branch - ldr r0, ._722 + ldr r0, ._722 @ gUnknown_Debug_2038A20 ldr r1, [r0] ldrb r0, [r1, #0xa] cmp r0, #0x1 @@ -7892,7 +7892,7 @@ debug_80C7294: and r0, r0, r1 cmp r0, #0 beq ._725 @cond_branch - ldr r0, ._727 + ldr r0, ._727 @ gUnknown_Debug_2038A20 ldr r1, [r0] ldrb r0, [r1, #0xa] cmp r0, #0 @@ -7910,7 +7910,7 @@ debug_80C7294: and r0, r0, r1 cmp r0, #0 beq ._729 @cond_branch - ldr r0, ._734 + ldr r0, ._734 @ gUnknown_Debug_2038A20 ldr r2, [r0] ldrb r0, [r2, #0xa] cmp r0, #0x1 @@ -7953,7 +7953,7 @@ debug_80C7294: mov r1, #0x1f and r0, r0, r1 lsl r0, r0, #0x5 - ldr r1, ._742 + ldr r1, ._742 @ 0xfffffc1f and r1, r1, r3 orr r1, r1, r0 strh r1, [r2, #0xc] @@ -7983,7 +7983,7 @@ debug_80C7294: and r0, r0, r1 cmp r0, #0 beq ._754 @cond_branch - ldr r0, ._751 + ldr r0, ._751 @ gUnknown_Debug_2038A20 ldr r3, [r0] ldrb r0, [r3, #0xa] cmp r0, #0x1 @@ -8031,7 +8031,7 @@ debug_80C7294: mov r1, #0x1f and r0, r0, r1 lsl r0, r0, #0x5 - ldr r1, ._759 + ldr r1, ._759 @ 0xfffffc1f and r1, r1, r2 orr r1, r1, r0 strh r1, [r3, #0xc] @@ -8058,12 +8058,12 @@ debug_80C7294: orr r1, r1, r0 strb r1, [r3, #0xd] ._761: - ldr r0, ._762 + ldr r0, ._762 @ gTasks lsl r1, r7, #0x2 add r1, r1, r7 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._762 + 4 + ldr r0, ._762 + 4 @ debug_80C74E4 str r0, [r1] ._754: pop {r4, r5, r6, r7} @@ -8085,7 +8085,7 @@ debug_80C74E4: add r5, r0, #0 lsl r5, r5, #0x18 lsr r5, r5, #0x18 - ldr r0, ._764 + ldr r0, ._764 @ gUnknown_Debug_2038A20 ldr r3, [r0] ldrb r0, [r3, #0xc] lsl r0, r0, #0x1b @@ -8100,13 +8100,13 @@ debug_80C74E4: lsr r1, r1, #0x1b lsl r1, r1, #0xa add r0, r0, r1 - ldr r6, ._764 + 4 + ldr r6, ._764 + 4 @ gPlttBufferUnfaded ldrb r1, [r3, #0x7] add r1, r1, #0x81 lsl r1, r1, #0x1 add r1, r1, r6 strh r0, [r1] - ldr r1, ._764 + 8 + ldr r1, ._764 + 8 @ gPlttBufferFaded mov r8, r1 ldrb r1, [r3, #0x7] add r1, r1, #0x81 @@ -8116,7 +8116,7 @@ debug_80C74E4: ldrb r1, [r3, #0x6] lsl r1, r1, #0x4 ldrb r2, [r3, #0x7] - ldr r4, ._764 + 12 + ldr r4, ._764 + 12 @ 0x101 add r2, r2, r4 add r1, r1, r2 lsl r1, r1, #0x1 @@ -8134,12 +8134,12 @@ debug_80C74E4: mov r2, #0xa mov r3, #0x4 bl debug_80C68CC - ldr r1, ._764 + 16 + ldr r1, ._764 + 16 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._764 + 20 + ldr r1, ._764 + 20 @ debug_80C7294 str r1, [r0] pop {r3} mov r8, r3 @@ -8162,7 +8162,7 @@ debug_80C74E4: debug_80C7584: push {r4, lr} add r2, r0, #0 - ldr r0, ._771 + ldr r0, ._771 @ gUnknown_Debug_2038A20 ldr r3, [r0] ldrb r1, [r3, #0x5] add r4, r0, #0 @@ -8239,15 +8239,15 @@ InitSeeTrainers: push {r4, r5, r6, lr} add sp, sp, #0xfffffffc bl debug_80C35DC - ldr r1, ._777 - ldr r2, ._777 + 4 - ldr r0, ._777 + 8 + ldr r1, ._777 @ byte_83F88EC + ldr r2, ._777 + 4 @ 0x600e000 + ldr r0, ._777 + 8 @ 0x40000d4 str r1, [r0] str r2, [r0, #0x4] - ldr r1, ._777 + 12 + ldr r1, ._777 + 12 @ 0x80000400 str r1, [r0, #0x8] ldr r0, [r0, #0x8] - ldr r0, ._777 + 16 + ldr r0, ._777 + 16 @ word_83F888C mov r1, #0x80 mov r2, #0x60 bl LoadPalette @@ -8259,7 +8259,7 @@ InitSeeTrainers: mov r2, #0x10 mov r3, #0x0 bl BeginNormalPaletteFade - ldr r0, ._777 + 20 + ldr r0, ._777 + 20 @ 0x4000040 mov r6, #0x0 strh r5, [r0] add r0, r0, #0x4 @@ -8268,7 +8268,7 @@ InitSeeTrainers: strh r5, [r0] add r0, r0, #0x4 strh r5, [r0] - ldr r1, ._777 + 24 + ldr r1, ._777 + 24 @ 0x4000048 mov r0, #0x3f strh r0, [r1] add r1, r1, #0x2 @@ -8277,30 +8277,30 @@ InitSeeTrainers: add r1, r1, #0x6 mov r0, #0xf1 strh r0, [r1] - ldr r0, ._777 + 28 + ldr r0, ._777 + 28 @ 0x4000052 strh r5, [r0] add r1, r1, #0x4 mov r0, #0x7 strh r0, [r1] - ldr r3, ._777 + 32 + ldr r3, ._777 + 32 @ 0x4000208 ldrh r2, [r3] strh r5, [r3] - ldr r4, ._777 + 36 + ldr r4, ._777 + 36 @ 0x4000200 ldrh r0, [r4] mov r1, #0x1 orr r0, r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, ._777 + 40 + ldr r0, ._777 + 40 @ debug_80C3758 bl SetVBlankCallback - ldr r0, ._777 + 44 + ldr r0, ._777 + 44 @ debug_80C370C bl SetMainCallback2 - ldr r1, ._777 + 48 - ldr r2, ._777 + 52 + ldr r1, ._777 + 48 @ 0x4000008 + ldr r2, ._777 + 52 @ 0x1f0b add r0, r2, #0 strh r0, [r1] add r1, r1, #0x2 - ldr r2, ._777 + 56 + ldr r2, ._777 + 56 @ 0x1e0a add r0, r2, #0 strh r0, [r1] sub r1, r1, #0xa @@ -8308,11 +8308,11 @@ InitSeeTrainers: lsl r2, r2, #0x6 add r0, r2, #0 strh r0, [r1] - ldr r0, ._777 + 60 + ldr r0, ._777 + 60 @ debug_80C777C mov r1, #0x0 bl CreateTask - ldr r1, ._777 + 64 - ldr r0, ._777 + 68 + ldr r1, ._777 + 64 @ gUnknown_Debug_2038A20 + ldr r0, ._777 + 68 @ 0x2018000 str r0, [r1] strh r5, [r0] strb r6, [r0, #0x2] @@ -8321,7 +8321,7 @@ InitSeeTrainers: strb r6, [r0, #0x7] strb r6, [r0, #0xa] strb r6, [r0, #0x8] - ldr r4, ._777 + 72 + ldr r4, ._777 + 72 @ gSpriteTemplate_83F8874 add r0, r4, #0 mov r1, #0x6c mov r2, #0x74 @@ -8330,7 +8330,7 @@ InitSeeTrainers: add r1, r0, #0 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - ldr r6, ._777 + 76 + ldr r6, ._777 + 76 @ gSprites lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 @@ -8392,7 +8392,7 @@ InitSeeTrainers: .word 0x1e0a .word debug_80C777C+1 .word gUnknown_Debug_2038A20 - .word +0x2018000 + .word 0x2018000 .word gSpriteTemplate_83F8874 .word gSprites @@ -8406,7 +8406,7 @@ debug_80C777C: add sp, sp, #0xffffffec lsl r0, r0, #0x18 lsr r7, r0, #0x18 - ldr r1, ._784 + ldr r1, ._784 @ gUnknown_Debug_083F8815 mov r0, sp mov r2, #0x12 bl memcpy @@ -8430,15 +8430,15 @@ debug_80C777C: mov r2, #0x1d mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r0, ._784 + 4 + ldr r0, ._784 + 4 @ gUnknown_Debug_083F87D0 mov r1, #0xf mov r2, #0x1 bl Menu_PrintText - ldr r0, ._784 + 8 + ldr r0, ._784 + 8 @ gUnknown_Debug_083F87D8 mov r1, #0x19 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._784 + 12 + ldr r0, ._784 + 12 @ gUnknown_Debug_083F87E0 mov r1, #0xf mov r2, #0x5 bl Menu_PrintText @@ -8448,8 +8448,8 @@ debug_80C777C: mov r3, #0xc bl Menu_DrawStdWindowFrame mov r2, #0x0 - ldr r4, ._784 + 16 - ldr r0, ._784 + 20 + ldr r4, ._784 + 16 @ 0x600fa56 + ldr r0, ._784 + 20 @ 0xa311 add r3, r0, #0 ._779: lsl r0, r2, #0x1 @@ -8462,11 +8462,11 @@ debug_80C777C: cmp r2, #0xe bls ._779 @cond_branch mov r2, #0x0 - ldr r5, ._784 + 24 + ldr r5, ._784 + 24 @ gUnknown_Debug_083F87F4 lsl r6, r7, #0x2 mov r8, r6 - ldr r4, ._784 + 28 - ldr r0, ._784 + 32 + ldr r4, ._784 + 28 @ 0x600f256 + ldr r0, ._784 + 32 @ 0x8301 add r3, r0, #0 ._780: lsl r0, r2, #0x1 @@ -8491,7 +8491,7 @@ debug_80C777C: mov r0, #0x23 strb r0, [r1] mov r2, #0x0 - ldr r4, ._784 + 36 + ldr r4, ._784 + 36 @ 0x600f396 mov r5, #0x93 lsl r5, r5, #0x8 add r3, r5, #0 @@ -8512,8 +8512,8 @@ debug_80C777C: mov r0, #0x24 strb r0, [r1] mov r2, #0x0 - ldr r5, ._784 + 40 - ldr r4, ._784 + 44 + ldr r5, ._784 + 40 @ gUnknown_Debug_083F8801 + ldr r4, ._784 + 44 @ 0x600f3d6 mov r0, #0x93 lsl r0, r0, #0x8 add r3, r0, #0 @@ -8534,7 +8534,7 @@ debug_80C777C: mov r0, #0x25 strb r0, [r1] mov r2, #0x0 - ldr r4, ._784 + 48 + ldr r4, ._784 + 48 @ 0x600f416 mov r0, #0x93 lsl r0, r0, #0x8 add r3, r0, #0 @@ -8555,20 +8555,20 @@ debug_80C777C: mov r1, #0xf mov r2, #0x11 bl Menu_PrintText - ldr r1, ._784 + 52 - ldr r2, ._784 + 56 + ldr r1, ._784 + 52 @ 0x4000040 + ldr r2, ._784 + 56 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r5, ._784 + 60 + ldr r5, ._784 + 60 @ 0x699f add r0, r5, #0 strh r0, [r1] - ldr r1, ._784 + 64 + ldr r1, ._784 + 64 @ gTasks mov r6, r8 add r0, r6, r7 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._784 + 68 + ldr r1, ._784 + 68 @ debug_80C7934 str r1, [r0] add sp, sp, #0x14 pop {r3} @@ -8610,18 +8610,18 @@ debug_80C7934: lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r8, r0 - ldr r5, ._786 + ldr r5, ._786 @ gUnknown_Debug_2038A20 ldr r6, [r5] ldrh r2, [r6] lsl r0, r2, #0x3 - ldr r1, ._786 + 4 + ldr r1, ._786 + 4 @ gTrainerFrontPicTable add r0, r0, r1 - ldr r1, ._786 + 8 + ldr r1, ._786 + 8 @ gTrainerFrontPicCoords lsl r2, r2, #0x2 add r2, r2, r1 ldrb r1, [r2] ldrb r2, [r2, #0x1] - ldr r4, ._786 + 12 + ldr r4, ._786 + 12 @ gUnknown_081FAF4C ldr r3, [r4] ldr r4, [r4, #0x4] str r4, [sp] @@ -8631,14 +8631,14 @@ debug_80C7934: ldr r0, [r5] ldrh r0, [r0] lsl r0, r0, #0x3 - ldr r1, ._786 + 16 + ldr r1, ._786 + 16 @ gTrainerFrontPicPaletteTable add r0, r0, r1 bl LoadCompressedObjectPalette ldr r0, [r5] ldrh r0, [r0] mov r1, #0x1 bl GetMonSpriteTemplate_803C5A0 - ldr r0, ._786 + 20 + ldr r0, ._786 + 20 @ gUnknown_02024E8C mov r1, #0x28 mov r2, #0x28 mov r3, #0x0 @@ -8646,7 +8646,7 @@ debug_80C7934: ldr r1, [r5] mov r6, #0x0 strb r0, [r1, #0x2] - ldr r4, ._786 + 24 + ldr r4, ._786 + 24 @ gSprites ldr r2, [r5] ldrb r1, [r2, #0x2] lsl r0, r1, #0x4 @@ -8655,7 +8655,7 @@ debug_80C7934: add r1, r4, #0 add r1, r1, #0x1c add r0, r0, r1 - ldr r1, ._786 + 28 + ldr r1, ._786 + 28 @ debug_69 str r1, [r0] ldrb r0, [r2, #0x2] lsl r1, r0, #0x4 @@ -8684,9 +8684,9 @@ debug_80C7934: ldr r0, [r5] ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 - ldr r4, ._786 + 32 + ldr r4, ._786 + 32 @ gPlttBufferUnfaded add r0, r0, r4 - ldr r2, ._786 + 36 + ldr r2, ._786 + 36 @ 0xffffff00 add r1, r4, r2 mov r2, #0x10 bl CpuSet @@ -8694,16 +8694,16 @@ debug_80C7934: ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 add r0, r0, r4 - ldr r1, ._786 + 40 + ldr r1, ._786 + 40 @ gPlttBufferFaded mov r2, #0x10 bl CpuSet - ldr r1, ._786 + 44 + ldr r1, ._786 + 44 @ gTasks mov r2, r8 lsl r0, r2, #0x2 add r0, r0, r8 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._786 + 48 + ldr r1, ._786 + 48 @ debug_80C7A54 str r1, [r0] ldr r0, [r5] strb r6, [r0, #0x9] @@ -8738,14 +8738,14 @@ debug_80C7A54: add r6, r0, #0 lsl r6, r6, #0x18 lsr r6, r6, #0x18 - ldr r4, ._788 - ldr r5, ._788 + 4 + ldr r4, ._788 @ gPlttBufferUnfaded + ldr r5, ._788 + 4 @ gUnknown_Debug_2038A20 ldr r1, [r5] add r1, r1, #0x10 add r0, r4, #0 mov r2, #0x10 bl CpuSet - ldr r0, ._788 + 8 + ldr r0, ._788 + 8 @ 0xffffff00 add r4, r4, r0 ldr r3, [r5] ldrb r0, [r3, #0x7] @@ -8766,7 +8766,7 @@ debug_80C7A54: lsl r1, r1, #0x2 and r1, r1, r4 ldrh r2, [r3, #0xc] - ldr r0, ._788 + 12 + ldr r0, ._788 + 12 @ 0xfffffc1f and r0, r0, r2 orr r0, r0, r1 strh r0, [r3, #0xc] @@ -8792,7 +8792,7 @@ debug_80C7A54: mov r2, #0xa mov r3, #0x2 bl debug_80C68CC - ldr r0, ._788 + 16 + ldr r0, ._788 + 16 @ gUnknown_Debug_083F8813 mov r1, #0xd mov r2, #0xa bl Menu_PrintText @@ -8801,12 +8801,12 @@ debug_80C7A54: mov r2, #0xa mov r3, #0x4 bl debug_80C68CC - ldr r1, ._788 + 20 + ldr r1, ._788 + 20 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._788 + 24 + ldr r1, ._788 + 24 @ debug_80C7B14 str r1, [r0] pop {r4, r5, r6} pop {r0} @@ -8830,7 +8830,7 @@ debug_80C7B14: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r6, r0, #0x18 - ldr r1, ._792 + ldr r1, ._792 @ gMain ldrh r3, [r1, #0x2e] mov r0, #0x2 and r0, r0, r3 @@ -8846,14 +8846,14 @@ debug_80C7B14: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r0, ._792 + 4 + ldr r0, ._792 + 4 @ debug_80C370C bl SetMainCallback2 - ldr r1, ._792 + 8 + ldr r1, ._792 + 8 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._792 + 12 + ldr r1, ._792 + 12 @ debug_80C373C str r1, [r0] b ._821 ._793: @@ -8870,7 +8870,7 @@ debug_80C7B14: and r0, r0, r1 cmp r0, #0 beq ._794 @cond_branch - ldr r4, ._796 + ldr r4, ._796 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrh r1, [r0] mov r0, #0x0 @@ -8885,7 +8885,7 @@ debug_80C7B14: and r0, r0, r1 cmp r0, #0 beq ._798 @cond_branch - ldr r4, ._800 + ldr r4, ._800 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrh r1, [r0] mov r0, #0x1 @@ -8893,12 +8893,12 @@ debug_80C7B14: bl debug_80C38B4 ldr r1, [r4] strh r0, [r1] - ldr r1, ._800 + 4 + ldr r1, ._800 + 4 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._800 + 8 + ldr r1, ._800 + 8 @ debug_80C7D44 str r1, [r0] b ._821 ._801: @@ -8912,24 +8912,24 @@ debug_80C7B14: and r2, r2, r3 cmp r2, #0 beq ._802 @cond_branch - ldr r0, ._804 + ldr r0, ._804 @ gUnknown_Debug_2038A20 ldr r1, [r0] mov r0, #0x1 strb r0, [r1, #0x5] - ldr r1, ._804 + 4 - ldr r2, ._804 + 8 + ldr r1, ._804 + 4 @ 0x4000040 + ldr r2, ._804 + 8 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._804 + 12 + ldr r2, ._804 + 12 @ 0x4167 add r0, r2, #0 strh r0, [r1] - ldr r1, ._804 + 16 + ldr r1, ._804 + 16 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._804 + 20 + ldr r1, ._804 + 20 @ debug_80C7DDC str r1, [r0] b ._821 ._805: @@ -8944,7 +8944,7 @@ debug_80C7B14: ._802: mov r0, #0x10 and r0, r0, r1 - ldr r3, ._809 + ldr r3, ._809 @ gUnknown_Debug_2038A20 cmp r0, #0 beq ._807 @cond_branch ldr r1, [r3] @@ -8952,7 +8952,7 @@ debug_80C7B14: cmp r0, #0xd bhi ._807 @cond_branch lsl r0, r0, #0x1 - ldr r1, ._809 + 4 + ldr r1, ._809 + 4 @ 0x5000102 add r0, r0, r1 strh r2, [r0] ldr r1, [r3] @@ -8976,7 +8976,7 @@ debug_80C7B14: cmp r0, #0 beq ._812 @cond_branch lsl r0, r0, #0x1 - ldr r2, ._814 + ldr r2, ._814 @ 0x5000102 add r0, r0, r2 mov r1, #0x0 strh r1, [r0] @@ -8995,7 +8995,7 @@ debug_80C7B14: and r0, r0, r1 cmp r0, #0 beq ._816 @cond_branch - ldr r4, ._819 + ldr r4, ._819 @ gUnknown_Debug_2038A20 ldr r2, [r4] ldrb r0, [r2, #0x9] mov r1, #0x1 @@ -9038,13 +9038,13 @@ debug_80C7B14: mov r2, #0x20 bl LoadCompressedPalette ._818: - ldr r5, ._822 + ldr r5, ._822 @ gUnknown_Debug_2038A20 ldr r0, [r5] ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 - ldr r4, ._822 + 4 + ldr r4, ._822 + 4 @ gPlttBufferUnfaded add r0, r0, r4 - ldr r2, ._822 + 8 + ldr r2, ._822 + 8 @ 0xffffff00 add r1, r4, r2 mov r2, #0x10 bl CpuSet @@ -9052,16 +9052,16 @@ debug_80C7B14: ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 add r0, r0, r4 - ldr r1, ._822 + 12 + ldr r1, ._822 + 12 @ gPlttBufferFaded mov r2, #0x10 bl CpuSet ._813: - ldr r1, ._822 + 16 + ldr r1, ._822 + 16 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._822 + 20 + ldr r1, ._822 + 20 @ debug_80C7A54 str r1, [r0] b ._821 ._823: @@ -9086,9 +9086,9 @@ debug_80C7B14: ldr r0, [r3] ldrb r1, [r0, #0x7] lsl r1, r1, #0x1 - ldr r2, ._824 + ldr r2, ._824 @ 0x5000142 add r1, r1, r2 - ldr r2, ._824 + 4 + ldr r2, ._824 + 4 @ gUnknown_Debug_083F8790 ldrb r0, [r0, #0x8] lsl r0, r0, #0x1 add r0, r0, r2 @@ -9113,8 +9113,8 @@ debug_80C7D44: add r5, r0, #0 lsl r5, r5, #0x18 lsr r5, r5, #0x18 - ldr r6, ._826 - ldr r4, ._826 + 4 + ldr r6, ._826 @ gSprites + ldr r4, ._826 + 4 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrb r1, [r0, #0x2] lsl r0, r1, #0x4 @@ -9160,12 +9160,12 @@ debug_80C7D44: lsl r0, r0, #0x2 add r0, r0, r6 bl sub_809D510 - ldr r1, ._826 + 8 + ldr r1, ._826 + 8 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._826 + 12 + ldr r1, ._826 + 12 @ debug_80C7934 str r1, [r0] pop {r4, r5, r6} pop {r0} @@ -9185,23 +9185,23 @@ debug_80C7DDC: push {r4, r5, r6, r7, lr} lsl r0, r0, #0x18 lsr r7, r0, #0x18 - ldr r0, ._830 + ldr r0, ._830 @ gMain ldrh r2, [r0, #0x2e] mov r1, #0x1 and r1, r1, r2 add r3, r0, #0 cmp r1, #0 beq ._828 @cond_branch - ldr r0, ._830 + 4 + ldr r0, ._830 + 4 @ gUnknown_Debug_2038A20 ldr r1, [r0] mov r0, #0x0 strb r0, [r1, #0x5] - ldr r1, ._830 + 8 - ldr r2, ._830 + 12 + ldr r1, ._830 + 8 @ 0x4000040 + ldr r2, ._830 + 12 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._830 + 16 + ldr r2, ._830 + 16 @ 0x699f add r0, r2, #0 strh r0, [r1] b ._829 @@ -9218,26 +9218,26 @@ debug_80C7DDC: and r0, r0, r2 cmp r0, #0 beq ._832 @cond_branch - ldr r6, ._834 + ldr r6, ._834 @ gUnknown_Debug_2038A20 ldr r0, [r6] strb r1, [r0, #0x5] - ldr r1, ._834 + 4 - ldr r2, ._834 + 8 + ldr r1, ._834 + 4 @ 0x4000040 + ldr r2, ._834 + 8 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._834 + 12 + ldr r2, ._834 + 12 @ 0x699f add r0, r2, #0 strh r0, [r1] ldr r0, [r6] add r0, r0, #0x10 - ldr r4, ._834 + 16 + ldr r4, ._834 + 16 @ gPlttBufferUnfaded add r1, r4, #0 mov r2, #0x10 bl CpuSet ldr r0, [r6] add r0, r0, #0x10 - ldr r5, ._834 + 20 + ldr r5, ._834 + 20 @ gPlttBufferFaded add r1, r5, #0 mov r2, #0x10 bl CpuSet @@ -9264,12 +9264,12 @@ debug_80C7DDC: mov r2, #0x10 bl CpuSet ._829: - ldr r1, ._834 + 24 + ldr r1, ._834 + 24 @ gTasks lsl r0, r7, #0x2 add r0, r0, r7 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._834 + 28 + ldr r1, ._834 + 28 @ debug_80C7A54 str r1, [r0] b ._871 ._835: @@ -9289,7 +9289,7 @@ debug_80C7DDC: and r0, r0, r1 cmp r0, #0 beq ._837 @cond_branch - ldr r0, ._839 + ldr r0, ._839 @ gUnknown_Debug_2038A20 ldr r1, [r0] ldrb r0, [r1, #0xa] cmp r0, #0x1 @@ -9307,7 +9307,7 @@ debug_80C7DDC: and r0, r0, r1 cmp r0, #0 beq ._842 @cond_branch - ldr r0, ._844 + ldr r0, ._844 @ gUnknown_Debug_2038A20 ldr r1, [r0] ldrb r0, [r1, #0xa] cmp r0, #0 @@ -9325,7 +9325,7 @@ debug_80C7DDC: and r0, r0, r1 cmp r0, #0 beq ._846 @cond_branch - ldr r0, ._851 + ldr r0, ._851 @ gUnknown_Debug_2038A20 ldr r2, [r0] ldrb r0, [r2, #0xa] cmp r0, #0x1 @@ -9368,7 +9368,7 @@ debug_80C7DDC: mov r1, #0x1f and r0, r0, r1 lsl r0, r0, #0x5 - ldr r1, ._859 + ldr r1, ._859 @ 0xfffffc1f and r1, r1, r3 orr r1, r1, r0 strh r1, [r2, #0xc] @@ -9398,7 +9398,7 @@ debug_80C7DDC: and r0, r0, r1 cmp r0, #0 beq ._871 @cond_branch - ldr r0, ._868 + ldr r0, ._868 @ gUnknown_Debug_2038A20 ldr r3, [r0] ldrb r0, [r3, #0xa] cmp r0, #0x1 @@ -9446,7 +9446,7 @@ debug_80C7DDC: mov r1, #0x1f and r0, r0, r1 lsl r0, r0, #0x5 - ldr r1, ._876 + ldr r1, ._876 @ 0xfffffc1f and r1, r1, r2 orr r1, r1, r0 strh r1, [r3, #0xc] @@ -9473,12 +9473,12 @@ debug_80C7DDC: orr r1, r1, r0 strb r1, [r3, #0xd] ._878: - ldr r0, ._879 + ldr r0, ._879 @ gTasks lsl r1, r7, #0x2 add r1, r1, r7 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._879 + 4 + ldr r0, ._879 + 4 @ debug_80C802C str r0, [r1] ._871: pop {r4, r5, r6, r7} @@ -9500,7 +9500,7 @@ debug_80C802C: add r5, r0, #0 lsl r5, r5, #0x18 lsr r5, r5, #0x18 - ldr r0, ._881 + ldr r0, ._881 @ gUnknown_Debug_2038A20 ldr r3, [r0] ldrb r0, [r3, #0xc] lsl r0, r0, #0x1b @@ -9515,13 +9515,13 @@ debug_80C802C: lsr r1, r1, #0x1b lsl r1, r1, #0xa add r0, r0, r1 - ldr r6, ._881 + 4 + ldr r6, ._881 + 4 @ gPlttBufferUnfaded ldrb r1, [r3, #0x7] add r1, r1, #0x81 lsl r1, r1, #0x1 add r1, r1, r6 strh r0, [r1] - ldr r1, ._881 + 8 + ldr r1, ._881 + 8 @ gPlttBufferFaded mov r8, r1 ldrb r1, [r3, #0x7] add r1, r1, #0x81 @@ -9531,7 +9531,7 @@ debug_80C802C: ldrb r1, [r3, #0x6] lsl r1, r1, #0x4 ldrb r2, [r3, #0x7] - ldr r4, ._881 + 12 + ldr r4, ._881 + 12 @ 0x101 add r2, r2, r4 add r1, r1, r2 lsl r1, r1, #0x1 @@ -9549,12 +9549,12 @@ debug_80C802C: mov r2, #0xa mov r3, #0x4 bl debug_80C68CC - ldr r1, ._881 + 16 + ldr r1, ._881 + 16 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._881 + 20 + ldr r1, ._881 + 20 @ debug_80C7DDC str r1, [r0] pop {r3} mov r8, r3 diff --git a/src/roulette.c b/src/roulette.c index 5a8d35647..ffdbc2c26 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -607,7 +607,7 @@ void sub_8115384(void) .align 2, 0\n\ ._35:\n\ .word gUnknown_Debug_03005FB8\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word gMain\n\ .word 0x43c\n\ .word ._37\n\ @@ -718,7 +718,7 @@ void sub_8115384(void) .align 2, 0\n\ ._56:\n\ .word gUnknown_083F88BC\n\ - .word +0x2018800\n\ + .word 0x2018800\n\ .word gUnknown_083F8A60\n\ .word 0x6003000\n\ .word gMain\n\ @@ -870,7 +870,7 @@ void sub_8115384(void) .word 0x4000004\n\ .word sub_8115124+1\n\ .word sub_81156BC+1\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word gTasks\n\ .word gSaveBlock1\n\ .word 0x494\n\ @@ -1063,7 +1063,7 @@ void sub_8115634(u8 unused) ._76:\n\ .align 2, 0\n\ ._75:\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word unk_203955C\n\ .word gMain\n\ .word gTasks\n\ @@ -2067,7 +2067,7 @@ void sub_8116B40(u8 taskid) // end roulette ? ._382:\n\ .align 2, 0\n\ ._381:\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word gSpriteCoordOffsetX\n\ .word gSpriteCoordOffsetY\n\ .word 0x4000050\n\ @@ -4499,7 +4499,7 @@ void debug_sub_812E698() ._840:\n\ .align 2, 0\n\ ._839:\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word 0x0\n\ .word gUnknown_083F8DF4\n\ ._837:\n\ @@ -4546,7 +4546,7 @@ void debug_sub_812E698() ._842:\n\ .align 2, 0\n\ ._841:\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word gUnknown_083F8DF4\n\ .word 0x3dae147b\n\ .word sub_8118D2C+1"); @@ -4902,7 +4902,7 @@ void sub_8118F8C(struct Sprite *sprite) ._869:\n\ .align 2, 0\n\ ._868:\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word 0x3f000000\n\ .word 0x0\n\ .word gUnknown_083F8DF4\n\ |