diff options
Diffstat (limited to 'src/engine/mystery_event_menu.c')
| -rw-r--r-- | src/engine/mystery_event_menu.c | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index 116b60477..bc14c760d 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -350,7 +350,7 @@ void debug_sub_815D04C() " push {r4, r5, r6, lr}\n" " lsl r0, r0, #0x18\n" " lsr r5, r0, #0x18\n" - " ldr r1, ._125\n" + " ldr r1, ._125 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -364,7 +364,7 @@ void debug_sub_815D04C() " mov r2, #0xd\n" " mov r3, #0x7\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r1, ._125 + 4\n" + " ldr r1, ._125 + 4 @ gUnknown_Debug_842E2D0\n" " mov r2, #0xa\n" " ldsh r0, [r4, r2]\n" " lsl r0, r0, #0x3\n" @@ -377,7 +377,7 @@ void debug_sub_815D04C() " add r0, r0, #0x1\n" " strh r0, [r4, #0x8]\n" "._121:\n" - " ldr r2, ._125 + 8\n" + " ldr r2, ._125 + 8 @ gMain\n" " ldrh r1, [r2, #0x2e]\n" " mov r0, #0x20\n" " and r0, r0, r1\n" @@ -389,7 +389,7 @@ void debug_sub_815D04C() " ldsh r0, [r4, r2]\n" " cmp r0, #0\n" " bne ._123 @cond_branch\n" - " ldr r0, ._125 + 12\n" + " ldr r0, ._125 + 12 @ gUnknown_Debug_842E350\n" " ldrb r0, [r0]\n" " sub r0, r0, #0x1\n" " b ._124\n" @@ -404,7 +404,7 @@ void debug_sub_815D04C() " sub r0, r1, #1\n" "._124:\n" " strh r0, [r4, #0xa]\n" - " ldr r0, ._130\n" + " ldr r0, ._130 @ gTasks\n" " lsl r1, r5, #0x2\n" " add r1, r1, r5\n" " lsl r1, r1, #0x3\n" @@ -417,14 +417,14 @@ void debug_sub_815D04C() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._127 @cond_branch\n" - " ldr r1, ._130\n" + " ldr r1, ._130 @ gTasks\n" " lsl r2, r5, #0x2\n" " add r0, r2, r5\n" " lsl r0, r0, #0x3\n" " add r4, r0, r1\n" " mov r0, #0xa\n" " ldsh r3, [r4, r0]\n" - " ldr r0, ._130 + 4\n" + " ldr r0, ._130 + 4 @ gUnknown_Debug_842E350\n" " ldrb r0, [r0]\n" " sub r0, r0, #0x1\n" " cmp r3, r0\n" @@ -452,7 +452,7 @@ void debug_sub_815D04C() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._132 @cond_branch\n" - " ldr r1, ._133\n" + " ldr r1, ._133 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -460,13 +460,13 @@ void debug_sub_815D04C() " mov r2, #0xa\n" " ldsh r1, [r0, r2]\n" " lsl r1, r1, #0x3\n" - " ldr r0, ._133 + 4\n" + " ldr r0, ._133 + 4 @ gUnknown_Debug_842E2D0\n" " add r0, r0, #0x4\n" " add r1, r1, r0\n" - " ldr r0, ._133 + 8\n" + " ldr r0, ._133 + 8 @ \n" " ldr r1, [r1]\n" " bl _call_via_r1\n" - " ldr r0, ._133 + 12\n" + " ldr r0, ._133 + 12 @ \n" " add r1, r6, r0\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" @@ -516,8 +516,8 @@ void debug_sub_815D1D8() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffffc\n" - " ldr r1, ._139\n" - " ldr r2, ._139 + 4\n" + " ldr r1, ._139 @ gMain\n" + " ldr r2, ._139 + 4 @ 0x43c\n" " add r0, r1, r2\n" " ldrb r0, [r0]\n" " add r4, r1, #0\n" @@ -526,7 +526,7 @@ void debug_sub_815D1D8() " b ._196\n" "._137:\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._139 + 8\n" + " ldr r1, ._139 + 8 @ \n" " add r0, r0, r1\n" " ldr r0, [r0]\n" " mov pc, r0\n" @@ -562,8 +562,8 @@ void debug_sub_815D1D8() " mov r2, #0x10\n" " mov r3, #0x0\n" " bl BeginNormalPaletteFade\n" - " ldr r1, ._155\n" - " ldr r0, ._155 + 4\n" + " ldr r1, ._155 @ gMain\n" + " ldr r0, ._155 + 4 @ 0x43c\n" " add r1, r1, r0\n" " b ._189\n" "._156:\n" @@ -572,7 +572,7 @@ void debug_sub_815D1D8() " .word gMain\n" " .word 0x43c\n" "._143:\n" - " ldr r0, ._161\n" + " ldr r0, ._161 @ gPaletteFade\n" " ldrb r1, [r0, #0x7]\n" " mov r0, #0x80\n" " and r0, r0, r1\n" @@ -586,16 +586,16 @@ void debug_sub_815D1D8() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._159 @cond_branch\n" - " ldr r1, ._161 + 4\n" + " ldr r1, ._161 + 4 @ gUnknown_Debug_30030E0\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" " strb r0, [r1]\n" "._159:\n" - " ldr r0, ._161 + 8\n" + " ldr r0, ._161 + 8 @ Str_843DA70\n" " mov r1, #0x4\n" " mov r2, #0xf\n" " bl MenuPrintMessage\n" - " ldr r2, ._161 + 12\n" + " ldr r2, ._161 + 12 @ 0x43c\n" " add r1, r4, r2\n" " b ._189\n" "._162:\n" @@ -612,14 +612,14 @@ void debug_sub_815D1D8() " bne ._163 @cond_branch\n" " b ._196\n" "._163:\n" - " ldr r1, ._166\n" - " ldr r0, ._166 + 4\n" + " ldr r1, ._166 @ gMain\n" + " ldr r0, ._166 + 4 @ 0x43c\n" " add r1, r1, r0\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" " strb r0, [r1]\n" - " ldr r1, ._166 + 8\n" - " ldr r2, ._166 + 12\n" + " ldr r1, ._166 + 8 @ gLinkType\n" + " ldr r2, ._166 + 12 @ 0x5501\n" " add r0, r2, #0\n" " strh r0, [r1]\n" " bl OpenLink\n" @@ -632,18 +632,18 @@ void debug_sub_815D1D8() " .word gLinkType\n" " .word 0x5501\n" "._145:\n" - " ldr r0, ._171\n" + " ldr r0, ._171 @ gReceivedRemoteLinkPlayers\n" " ldrb r0, [r0]\n" " cmp r0, #0\n" " bne ._168 @cond_branch\n" " b ._196\n" "._168:\n" - " ldr r1, ._171 + 4\n" + " ldr r1, ._171 + 4 @ 0x43c\n" " add r0, r4, r1\n" " ldrb r1, [r0]\n" " add r1, r1, #0x1\n" " strb r1, [r0]\n" - " ldr r0, ._171 + 8\n" + " ldr r0, ._171 + 8 @ Str_843DA84\n" " mov r1, #0x4\n" " mov r2, #0xf\n" " bl MenuPrintMessage\n" @@ -661,11 +661,11 @@ void debug_sub_815D1D8() " bne ._173 @cond_branch\n" " b ._196\n" "._173:\n" - " ldr r0, ._176\n" + " ldr r0, ._176 @ debug_sub_815D04C\n" " mov r1, #0xa\n" " bl CreateTask\n" - " ldr r1, ._176 + 4\n" - " ldr r2, ._176 + 8\n" + " ldr r1, ._176 + 4 @ gMain\n" + " ldr r2, ._176 + 8 @ 0x43c\n" " add r1, r1, r2\n" " b ._189\n" "._177:\n" @@ -675,16 +675,16 @@ void debug_sub_815D1D8() " .word gMain\n" " .word 0x43c\n" "._148:\n" - " ldr r0, ._179\n" + " ldr r0, ._179 @ Str_843DA98\n" " mov r1, #0x4\n" " mov r2, #0xf\n" " bl MenuPrintMessage\n" - " ldr r1, ._179 + 4\n" - " ldr r2, ._179 + 8\n" + " ldr r1, ._179 + 4 @ 0x2004000\n" + " ldr r2, ._179 + 8 @ 0x2004\n" " mov r0, #0x0\n" " bl SendBlock\n" - " ldr r1, ._179 + 12\n" - " ldr r0, ._179 + 16\n" + " ldr r1, ._179 + 12 @ gMain\n" + " ldr r0, ._179 + 16 @ 0x43c\n" " add r1, r1, r0\n" " b ._189\n" "._180:\n" @@ -701,8 +701,8 @@ void debug_sub_815D1D8() " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " beq ._196 @cond_branch\n" - " ldr r1, ._183\n" - " ldr r2, ._183 + 4\n" + " ldr r1, ._183 @ gMain\n" + " ldr r2, ._183 + 4 @ 0x43c\n" " add r1, r1, r2\n" " b ._189\n" "._184:\n" @@ -712,8 +712,8 @@ void debug_sub_815D1D8() " .word 0x43c\n" "._150:\n" " bl sub_800832C\n" - " ldr r1, ._186\n" - " ldr r0, ._186 + 4\n" + " ldr r1, ._186 @ gMain\n" + " ldr r0, ._186 + 4 @ 0x43c\n" " add r1, r1, r0\n" " b ._189\n" "._187:\n" @@ -722,7 +722,7 @@ void debug_sub_815D1D8() " .word gMain\n" " .word 0x43c\n" "._151:\n" - " ldr r0, ._190\n" + " ldr r0, ._190 @ gReceivedRemoteLinkPlayers\n" " ldrb r0, [r0]\n" " cmp r0, #0\n" " bne ._196 @cond_branch\n" @@ -731,12 +731,12 @@ void debug_sub_815D1D8() " mov r2, #0x1a\n" " mov r3, #0x12\n" " bl Menu_BlankWindowRect\n" - " ldr r0, ._190 + 4\n" + " ldr r0, ._190 + 4 @ Str_843DAA3\n" " mov r1, #0x4\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" - " ldr r1, ._190 + 8\n" - " ldr r2, ._190 + 12\n" + " ldr r1, ._190 + 8 @ gMain\n" + " ldr r2, ._190 + 12 @ 0x43c\n" " add r1, r1, r2\n" " b ._189\n" "._191:\n" @@ -759,7 +759,7 @@ void debug_sub_815D1D8() " mov r2, #0x0\n" " mov r3, #0x10\n" " bl BeginNormalPaletteFade\n" - " ldr r0, ._194\n" + " ldr r0, ._194 @ 0x43c\n" " add r1, r4, r0\n" "._189:\n" " ldrb r0, [r1]\n" @@ -771,13 +771,13 @@ void debug_sub_815D1D8() "._194:\n" " .word 0x43c\n" "._153:\n" - " ldr r0, ._197\n" + " ldr r0, ._197 @ gPaletteFade\n" " ldrb r1, [r0, #0x7]\n" " mov r0, #0x80\n" " and r0, r0, r1\n" " cmp r0, #0\n" " bne ._196 @cond_branch\n" - " ldr r0, ._197 + 4\n" + " ldr r0, ._197 + 4 @ CB2_InitTitleScreen\n" " bl SetMainCallback2\n" "._196:\n" " bl RunTasks\n" |