summaryrefslogtreecommitdiff
path: root/src/field
diff options
context:
space:
mode:
authorCameron Hall <cameronghall@cox.net>2018-01-27 17:03:40 -0600
committerCameron Hall <cameronghall@cox.net>2018-01-27 17:03:40 -0600
commitfe400f60b6609d37d2b8a0c2aec75321adc3e95f (patch)
treef7286ace15509d8ca5b4171d7d2e7bad45447776 /src/field
parent2d5fdddf69bbbe524a32b6b6f104aeb60bb1cebd (diff)
add comments for pool loads in C files
Diffstat (limited to 'src/field')
-rw-r--r--src/field/berry.c100
-rw-r--r--src/field/choose_party.c4
-rw-r--r--src/field/field_map_obj.c28
-rw-r--r--src/field/field_player_avatar.c20
-rw-r--r--src/field/field_weather.c26
-rw-r--r--src/field/fldeff_cut.c10
-rw-r--r--src/field/fldeff_flash.c4
-rw-r--r--src/field/fldeff_secretpower.c10
-rw-r--r--src/field/item_menu.c102
-rw-r--r--src/field/mauville_man.c6
-rw-r--r--src/field/party_menu.c106
-rw-r--r--src/field/secret_base.c14
-rw-r--r--src/field/shop.c2
-rw-r--r--src/field/slot_machine.c108
-rw-r--r--src/field/start_menu.c54
15 files changed, 297 insertions, 297 deletions
diff --git a/src/field/berry.c b/src/field/berry.c
index 5c1ecd699..588807755 100644
--- a/src/field/berry.c
+++ b/src/field/berry.c
@@ -1009,7 +1009,7 @@ void debug_sub_80C2B04()
" bl sub_80B47D8\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
- " ldr r2, ._1\n"
+ " ldr r2, ._1 @ gTasks\n"
" lsl r1, r0, #0x2\n"
" add r1, r1, r0\n"
" lsl r1, r1, #0x3\n"
@@ -1038,7 +1038,7 @@ void debug_sub_80C2B30()
" bl sub_80B47D8\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
- " ldr r2, ._3\n"
+ " ldr r2, ._3 @ gTasks\n"
" lsl r1, r0, #0x2\n"
" add r1, r1, r0\n"
" lsl r1, r1, #0x3\n"
@@ -1088,8 +1088,8 @@ void debug_sub_80C2BD0()
{
asm(
" push {r4, r5, r6, r7, lr}\n"
- " ldr r3, ._11\n"
- " ldr r1, ._11 + 4\n"
+ " ldr r3, ._11 @ gSaveBlock1\n"
+ " ldr r1, ._11 + 4 @ 0x316c\n"
" add r4, r3, r1\n"
" ldr r6, [r4]\n"
" add r1, r1, #0x4\n"
@@ -1100,7 +1100,7 @@ void debug_sub_80C2BD0()
" str r1, [r2]\n"
" add r4, r0, #0\n"
" mov r2, #0x0\n"
- " ldr r5, ._11 + 8\n"
+ " ldr r5, ._11 + 8 @ 0x52b\n"
"._10:\n"
" add r0, r4, r1\n"
" ldrb r0, [r0]\n"
@@ -1108,7 +1108,7 @@ void debug_sub_80C2BD0()
" add r1, r1, #0x1\n"
" cmp r1, r5\n"
" bls ._10 @cond_branch\n"
- " ldr r1, ._11 + 4\n"
+ " ldr r1, ._11 + 4 @ 0x316c\n"
" add r0, r3, r1\n"
" str r6, [r0]\n"
" add r1, r1, #0x4\n"
@@ -1145,11 +1145,11 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
" lsl r2, r2, #0x18\n"
" lsr r2, r2, #0x18\n"
" mov r8, r2\n"
- " ldr r4, ._16\n"
- " ldr r1, ._16 + 4\n"
+ " ldr r4, ._16 @ gSaveBlock1\n"
+ " ldr r1, ._16 + 4 @ 0x3160\n"
" add r0, r4, r1\n"
" add r2, r0, #0\n"
- " ldr r1, ._16 + 8\n"
+ " ldr r1, ._16 + 8 @ gBerries\n"
" ldmia r1!, {r5, r6, r7}\n"
" stmia r2!, {r5, r6, r7}\n"
" ldmia r1!, {r5, r6, r7}\n"
@@ -1158,27 +1158,27 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
" str r1, [r2]\n"
" add r1, r3, #0\n"
" bl StringCopy\n"
- " ldr r0, ._16 + 12\n"
+ " ldr r0, ._16 + 12 @ 0x361c\n"
" add r6, r4, r0\n"
- " ldr r1, ._16 + 16\n"
+ " ldr r1, ._16 + 16 @ gUnknown_Debug_083F7F84\n"
" add r0, r6, #0\n"
" bl StringCopy\n"
- " ldr r1, ._16 + 20\n"
+ " ldr r1, ._16 + 20 @ 0x3649\n"
" add r5, r4, r1\n"
- " ldr r1, ._16 + 24\n"
+ " ldr r1, ._16 + 24 @ gUnknown_Debug_083F7F90\n"
" add r0, r5, #0\n"
" bl StringCopy\n"
- " ldr r2, ._16 + 28\n"
+ " ldr r2, ._16 + 28 @ 0x316c\n"
" add r0, r4, r2\n"
" str r6, [r0]\n"
- " ldr r6, ._16 + 32\n"
+ " ldr r6, ._16 + 32 @ 0x3170\n"
" add r0, r4, r6\n"
" str r5, [r0]\n"
" mov r2, #0x0\n"
- " ldr r6, ._16 + 36\n"
- " ldr r7, ._16 + 40\n"
+ " ldr r6, ._16 + 36 @ 0x47f\n"
+ " ldr r7, ._16 + 40 @ 0x317c\n"
" add r5, r4, r7\n"
- " ldr r3, ._16 + 44\n"
+ " ldr r3, ._16 + 44 @ gSpriteImage_UnusedCherry\n"
"._13:\n"
" add r0, r2, r5\n"
" add r1, r2, r3\n"
@@ -1187,9 +1187,9 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
" add r2, r2, #0x1\n"
" cmp r2, r6\n"
" ble ._13 @cond_branch\n"
- " ldr r0, ._16\n"
- " ldr r3, ._16 + 48\n"
- " ldr r2, ._16 + 52\n"
+ " ldr r0, ._16 @ gSaveBlock1\n"
+ " ldr r3, ._16 + 48 @ gSpritePalette_UnusedCherry\n"
+ " ldr r2, ._16 + 52 @ 0x35fc\n"
" add r1, r0, r2\n"
" mov r2, #0xf\n"
"._14:\n"
@@ -1201,8 +1201,8 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
" cmp r2, #0\n"
" bge ._14 @cond_branch\n"
" mov r2, #0x0\n"
- " ldr r5, ._16 + 56\n"
- " ldr r3, ._16 + 60\n"
+ " ldr r5, ._16 + 56 @ gSaveBlock1\n"
+ " ldr r3, ._16 + 60 @ gUnknown_Debug_839B6CE\n"
"._15:\n"
" add r0, r2, r5\n"
" add r1, r2, r3\n"
@@ -1211,15 +1211,15 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
" add r2, r2, #0x1\n"
" cmp r2, #0x11\n"
" ble ._15 @cond_branch\n"
- " ldr r5, ._16 + 64\n"
+ " ldr r5, ._16 + 64 @ 0x3688\n"
" add r0, r4, r5\n"
" mov r6, r9\n"
" strb r6, [r0]\n"
- " ldr r7, ._16 + 68\n"
+ " ldr r7, ._16 + 68 @ 0x3689\n"
" add r0, r4, r7\n"
" mov r1, r8\n"
" strb r1, [r0]\n"
- " ldr r2, ._16 + 4\n"
+ " ldr r2, ._16 + 4 @ 0x3160\n"
" add r0, r4, r2\n"
" bl debug_sub_80C2BD0\n"
" add r5, r5, #0x4\n"
@@ -1298,17 +1298,17 @@ void debug_sub_80C2D24()
" ldr r6, [sp, #0x18]\n"
" ldr r4, [sp, #0x1c]\n"
" mov r8, r4\n"
- " ldr r5, ._18\n"
- " ldr r7, ._18 + 4\n"
+ " ldr r5, ._18 @ gSaveBlock1\n"
+ " ldr r7, ._18 + 4 @ 0x3175\n"
" add r4, r5, r7\n"
" strb r0, [r4]\n"
- " ldr r4, ._18 + 8\n"
+ " ldr r4, ._18 + 8 @ 0x3176\n"
" add r0, r5, r4\n"
" strb r1, [r0]\n"
" add r7, r7, #0x2\n"
" add r0, r5, r7\n"
" strb r2, [r0]\n"
- " ldr r1, ._18 + 12\n"
+ " ldr r1, ._18 + 12 @ 0x3178\n"
" add r0, r5, r1\n"
" strb r3, [r0]\n"
" add r4, r4, #0x3\n"
@@ -1321,7 +1321,7 @@ void debug_sub_80C2D24()
" sub r4, r4, #0x19\n"
" add r0, r5, r4\n"
" bl debug_sub_80C2BD0\n"
- " ldr r7, ._18 + 16\n"
+ " ldr r7, ._18 + 16 @ 0x368c\n"
" add r5, r5, r7\n"
" str r0, [r5]\n"
" pop {r3}\n"
@@ -1350,21 +1350,21 @@ bool32 IsEnigmaBerryValid()
{
asm(
" push {r4, lr}\n"
- " ldr r4, ._24\n"
- " ldr r1, ._24 + 4\n"
+ " ldr r4, ._24 @ gSaveBlock1\n"
+ " ldr r1, ._24 + 4 @ 0x3174\n"
" add r0, r4, r1\n"
" ldrb r0, [r0]\n"
" cmp r0, #0\n"
" beq ._22 @cond_branch\n"
- " ldr r2, ._24 + 8\n"
+ " ldr r2, ._24 + 8 @ 0x316a\n"
" add r0, r4, r2\n"
" ldrb r0, [r0]\n"
" cmp r0, #0\n"
" beq ._22 @cond_branch\n"
- " ldr r1, ._24 + 12\n"
+ " ldr r1, ._24 + 12 @ 0x3160\n"
" add r0, r4, r1\n"
" bl debug_sub_80C2BD0\n"
- " ldr r2, ._24 + 16\n"
+ " ldr r2, ._24 + 16 @ 0x368c\n"
" add r1, r4, r2\n"
" ldr r1, [r1]\n"
" cmp r0, r1\n"
@@ -1810,7 +1810,7 @@ void DebugOpenBerryInfo()
asm(
" push {r4, r5, r6, r7, lr}\n"
" bl GetFieldObjectScriptPointerPlayerFacing\n"
- " ldr r1, ._138\n"
+ " ldr r1, ._138 @ S_BerryTree\n"
" cmp r0, r1\n"
" beq ._136 @cond_branch\n"
" mov r0, #0x0\n"
@@ -1820,7 +1820,7 @@ void DebugOpenBerryInfo()
"._138:\n"
" .word S_BerryTree\n"
"._136:\n"
- " ldr r0, ._141\n"
+ " ldr r0, ._141 @ gSelectedMapObject\n"
" ldrb r0, [r0]\n"
" bl FieldObjectGetBerryTreeId\n"
" lsl r0, r0, #0x18\n"
@@ -1829,8 +1829,8 @@ void DebugOpenBerryInfo()
" bl GetBerryTreeInfo\n"
" add r5, r0, #0\n"
" mov r2, #0x0\n"
- " ldr r7, ._141 + 4\n"
- " ldr r4, ._141 + 8\n"
+ " ldr r7, ._141 + 4 @ 0x1f3\n"
+ " ldr r4, ._141 + 8 @ gStringVar4\n"
" mov r3, #0xff\n"
"._140:\n"
" add r1, r2, r4\n"
@@ -1840,46 +1840,46 @@ void DebugOpenBerryInfo()
" add r2, r2, #0x1\n"
" cmp r2, r7\n"
" ble ._140 @cond_branch\n"
- " ldr r0, ._141 + 12\n"
+ " ldr r0, ._141 + 12 @ gUnknown_Debug_083F7F9D\n"
" add r1, r6, #0\n"
" mov r2, #0x3\n"
" bl debug_sub_80C33FC\n"
- " ldr r0, ._141 + 16\n"
+ " ldr r0, ._141 + 16 @ gUnknown_Debug_083F7FA2\n"
" ldrb r1, [r5]\n"
" mov r2, #0x2\n"
" bl debug_sub_80C33FC\n"
- " ldr r0, ._141 + 20\n"
+ " ldr r0, ._141 + 20 @ gUnknown_Debug_083F7FA9\n"
" ldrb r1, [r5, #0x1]\n"
" lsl r1, r1, #0x19\n"
" lsr r1, r1, #0x19\n"
" mov r2, #0x2\n"
" bl debug_sub_80C33FC\n"
- " ldr r0, ._141 + 24\n"
+ " ldr r0, ._141 + 24 @ gUnknown_Debug_083F7FB0\n"
" ldrh r1, [r5, #0x2]\n"
" mov r2, #0x5\n"
" bl debug_sub_80C33FC\n"
- " ldr r0, ._141 + 28\n"
+ " ldr r0, ._141 + 28 @ gUnknown_Debug_083F7FB7\n"
" ldrb r1, [r5, #0x4]\n"
" mov r2, #0x2\n"
" bl debug_sub_80C33FC\n"
- " ldr r0, ._141 + 32\n"
+ " ldr r0, ._141 + 32 @ gUnknown_Debug_083F7FBE\n"
" ldrb r1, [r5, #0x5]\n"
" lsl r1, r1, #0x1c\n"
" lsr r1, r1, #0x1c\n"
" mov r2, #0x3\n"
" bl debug_sub_80C33FC\n"
- " ldr r0, ._141 + 36\n"
+ " ldr r0, ._141 + 36 @ gUnknown_Debug_083F7FC5\n"
" ldrb r1, [r5, #0x1]\n"
" lsr r1, r1, #0x7\n"
" mov r2, #0x1\n"
" bl debug_sub_80C33FC\n"
- " ldr r0, ._141 + 40\n"
+ " ldr r0, ._141 + 40 @ gUnknown_Debug_083F7FCC\n"
" ldrb r1, [r5, #0x5]\n"
" lsl r1, r1, #0x1b\n"
" lsr r1, r1, #0x1f\n"
" mov r2, #0x1\n"
" bl debug_sub_80C33FC\n"
- " ldr r4, ._141 + 44\n"
+ " ldr r4, ._141 + 44 @ gUnknown_Debug_083F7FD3\n"
" ldrb r1, [r5, #0x5]\n"
" lsl r1, r1, #0x1a\n"
" lsr r1, r1, #0x1f\n"
@@ -1897,7 +1897,7 @@ void DebugOpenBerryInfo()
" add r0, r4, #0\n"
" mov r2, #0x1\n"
" bl debug_sub_80C33FC\n"
- " ldr r0, ._141 + 8\n"
+ " ldr r0, ._141 + 8 @ gStringVar4\n"
"._137:\n"
" pop {r4, r5, r6, r7}\n"
" pop {r1}\n"
diff --git a/src/field/choose_party.c b/src/field/choose_party.c
index b2d950e35..696f7cf4f 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -536,7 +536,7 @@ void debug_sub_81381B4()
" mov r7, r9\n"
" mov r6, r8\n"
" push {r6, r7}\n"
- " ldr r4, ._189\n"
+ " ldr r4, ._189 @ gUnknown_02023A00\n"
" add r0, r4, #0\n"
" mov r1, #0x0\n"
" mov r2, #0x60\n"
@@ -550,7 +550,7 @@ void debug_sub_81381B4()
" mov r0, #0x64\n"
" add r1, r7, #0\n"
" mul r1, r1, r0\n"
- " ldr r0, ._189 + 4\n"
+ " ldr r0, ._189 + 4 @ gPlayerParty\n"
" add r5, r1, r0\n"
" add r0, r5, #0\n"
" mov r1, #0x41\n"
diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c
index c255d3013..13d8ebb5b 100644
--- a/src/field/field_map_obj.c
+++ b/src/field/field_map_obj.c
@@ -1927,7 +1927,7 @@ void npcs_clear_ids_and_state()
asm(
" push {r4, r5, lr}\n"
" mov r4, #0x0\n"
- " ldr r5, ._2\n"
+ " ldr r5, ._2 @ gMapObjects\n"
"._1:\n"
" lsl r0, r4, #0x3\n"
" add r0, r0, r4\n"
@@ -1939,7 +1939,7 @@ void npcs_clear_ids_and_state()
" lsr r4, r0, #0x18\n"
" cmp r4, #0xf\n"
" bls ._1 @cond_branch\n"
- " ldr r1, ._2 + 4\n"
+ " ldr r1, ._2 + 4 @ gUnknown_Debug_03004BC0\n"
" mov r0, #0x0\n"
" strb r0, [r1]\n"
" pop {r4, r5}\n"
@@ -2086,7 +2086,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8
" lsl r0, r1, #0x3\n"
" add r0, r0, r1\n"
" lsl r0, r0, #0x2\n"
- " ldr r1, ._40\n"
+ " ldr r1, ._40 @ gMapObjects\n"
" add r4, r0, r1\n"
" add r0, r4, #0\n"
" bl npc_clear_ids_and_state\n"
@@ -2154,7 +2154,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8
" strb r0, [r4, #0x7]\n"
" ldrh r0, [r5, #0xe]\n"
" strb r0, [r4, #0x1d]\n"
- " ldr r1, ._40 + 4\n"
+ " ldr r1, ._40 + 4 @ gUnknown_0836DC09\n"
" ldrb r0, [r5, #0x9]\n"
" add r0, r0, r1\n"
" ldrb r1, [r0]\n"
@@ -2166,7 +2166,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8
" bl FieldObjectSetDirection\n"
" add r0, r4, #0\n"
" bl FieldObjectHandleDynamicGraphicsId\n"
- " ldr r1, ._40 + 8\n"
+ " ldr r1, ._40 + 8 @ gUnknown_0836DBBC\n"
" ldrb r0, [r4, #0x6]\n"
" add r0, r0, r1\n"
" ldrb r0, [r0]\n"
@@ -2200,7 +2200,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8
" orr r0, r0, r1\n"
" strb r0, [r4, #0x19]\n"
"._39:\n"
- " ldr r1, ._40 + 12\n"
+ " ldr r1, ._40 + 12 @ gUnknown_Debug_03004BC0\n"
" ldrb r0, [r1]\n"
" add r0, r0, #0x1\n"
" strb r0, [r1]\n"
@@ -2487,7 +2487,7 @@ void RemoveFieldObject(struct MapObject *mapObject)
" and r1, r1, r2\n"
" strb r1, [r0]\n"
" bl RemoveFieldObjectInternal\n"
- " ldr r1, ._72\n"
+ " ldr r1, ._72 @ gUnknown_Debug_03004BC0\n"
" ldrb r0, [r1]\n"
" sub r0, r0, #0x1\n"
" strb r0, [r1]\n"
@@ -2577,7 +2577,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *
" lsl r4, r0, #0x3\n"
" add r0, r4, r0\n"
" lsl r0, r0, #0x2\n"
- " ldr r1, ._87\n"
+ " ldr r1, ._87 @ gMapObjects\n"
" add r5, r0, r1\n"
" ldrb r0, [r5, #0x5]\n"
" bl GetFieldObjectGraphicsInfo\n"
@@ -2612,7 +2612,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *
" orr r0, r0, r1\n"
" strb r0, [r5, #0x1]\n"
"._90:\n"
- " ldr r1, ._93\n"
+ " ldr r1, ._93 @ 0xffff\n"
" add r0, r1, #0\n"
" strh r0, [r7, #0x2]\n"
" add r0, r7, #0\n"
@@ -2624,11 +2624,11 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *
" lsr r7, r0, #0x18\n"
" cmp r7, #0x40\n"
" bne ._91 @cond_branch\n"
- " ldr r1, ._93 + 4\n"
+ " ldr r1, ._93 + 4 @ gUnknown_Debug_03004BC0\n"
" ldrb r0, [r1]\n"
" sub r0, r0, #0x1\n"
" strb r0, [r1]\n"
- " ldr r0, ._93 + 8\n"
+ " ldr r0, ._93 + 8 @ gMapObjects\n"
" mov r2, r8\n"
" add r1, r4, r2\n"
" lsl r1, r1, #0x2\n"
@@ -2650,7 +2650,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *
" lsl r0, r7, #0x4\n"
" add r0, r0, r7\n"
" lsl r0, r0, #0x2\n"
- " ldr r1, ._96\n"
+ " ldr r1, ._96 @ gSprites\n"
" add r4, r0, r1\n"
" mov r1, r9\n"
" lsl r0, r1, #0x10\n"
@@ -3045,12 +3045,12 @@ void sub_805B710(u16 u161, u16 u162)
" lsr r4, r4, #0x10\n"
" lsl r5, r5, #0x10\n"
" lsr r5, r5, #0x10\n"
- " ldr r6, ._153\n"
+ " ldr r6, ._153 @ gUnknown_Debug_03004BC0\n"
" mov r0, #0x0\n"
" strb r0, [r6]\n"
" bl ClearPlayerAvatarInfo\n"
" mov r7, #0x0\n"
- " ldr r0, ._153 + 4\n"
+ " ldr r0, ._153 + 4 @ gMapObjects\n"
" mov r8, r0\n"
" lsl r4, r4, #0x10\n"
" lsl r5, r5, #0x10\n"
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index c382db19f..a7594372d 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -266,11 +266,11 @@ u8 TryDoMetatileBehaviorForcedMovement()
{
asm(
" push {r4, lr}\n"
- " ldr r0, ._27\n"
+ " ldr r0, ._27 @ gUnknown_020297ED\n"
" ldrb r0, [r0]\n"
" cmp r0, #0\n"
" beq ._25 @cond_branch\n"
- " ldr r0, ._27 + 4\n"
+ " ldr r0, ._27 + 4 @ gMain\n"
" ldrh r1, [r0, #0x2c]\n"
" mov r0, #0x80\n"
" lsl r0, r0, #0x1\n"
@@ -285,7 +285,7 @@ u8 TryDoMetatileBehaviorForcedMovement()
" .word gUnknown_020297ED\n"
" .word gMain\n"
"._25:\n"
- " ldr r4, ._29\n"
+ " ldr r4, ._29 @ gUnknown_0830FBA0\n"
" bl GetForcedMovementByMetatileBehavior\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x16\n"
@@ -494,7 +494,7 @@ void MovePlayerNotOnBike(u8 u81, u16 u161)
" add r5, r2, #0\n"
" lsl r1, r1, #0x10\n"
" lsr r6, r1, #0x10\n"
- " ldr r0, ._84\n"
+ " ldr r0, ._84 @ gUnknown_020297ED\n"
" ldrb r0, [r0]\n"
" cmp r0, #0\n"
" beq ._82 @cond_branch\n"
@@ -504,7 +504,7 @@ void MovePlayerNotOnBike(u8 u81, u16 u161)
" cmp r0, #0\n"
" bne ._83 @cond_branch\n"
"._82:\n"
- " ldr r4, ._84 + 4\n"
+ " ldr r4, ._84 + 4 @ gUnknown_0830FBEC\n"
" add r0, r5, #0\n"
" bl CheckMovementInputNotOnBike\n"
" lsl r0, r0, #0x18\n"
@@ -1864,7 +1864,7 @@ void debug_sub_805F2B0()
" push {lr}\n"
" lsl r0, r0, #0x18\n"
" lsr r2, r0, #0x18\n"
- " ldr r0, ._422\n"
+ " ldr r0, ._422 @ gMain\n"
" ldrh r1, [r0, #0x2c]\n"
" mov r0, #0x80\n"
" lsl r0, r0, #0x1\n"
@@ -1898,8 +1898,8 @@ void debug_sub_805F2DC()
" lsr r4, r0, #0x18\n"
" cmp r4, #0\n"
" bne ._424 @cond_branch\n"
- " ldr r2, ._426\n"
- " ldr r0, ._426 + 4\n"
+ " ldr r2, ._426 @ gMapObjects\n"
+ " ldr r0, ._426 + 4 @ gPlayerAvatar\n"
" ldrb r1, [r0, #0x5]\n"
" lsl r0, r1, #0x3\n"
" add r0, r0, r1\n"
@@ -1915,8 +1915,8 @@ void debug_sub_805F2DC()
" .word gMapObjects\n"
" .word gPlayerAvatar\n"
"._424:\n"
- " ldr r2, ._431\n"
- " ldr r0, ._431 + 4\n"
+ " ldr r2, ._431 @ gMapObjects\n"
+ " ldr r0, ._431 + 4 @ gPlayerAvatar\n"
" ldrb r1, [r0, #0x5]\n"
" lsl r0, r1, #0x3\n"
" add r0, r0, r1\n"
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index c411bf20b..fbc5431ae 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -1264,14 +1264,14 @@ u8 debug_sub_8085564(void)
asm("\
push {lr}\n\
mov r2, #0x0\n\
- ldr r0, ._375\n\
+ ldr r0, ._375 @ gMain\n\
ldrh r1, [r0, #0x2e]\n\
mov r0, #0x80\n\
lsl r0, r0, #0x1\n\
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._370 @cond_branch\n\
- ldr r1, ._375 + 4\n\
+ ldr r1, ._375 + 4 @ gUnknown_Debug_20301FE\n\
ldrb r0, [r1]\n\
add r0, r0, #0x1\n\
strb r0, [r1]\n\
@@ -1283,14 +1283,14 @@ u8 debug_sub_8085564(void)
._371:\n\
mov r2, #0x1\n\
._370:\n\
- ldr r0, ._375\n\
+ ldr r0, ._375 @ gMain\n\
ldrh r1, [r0, #0x2e]\n\
mov r0, #0x80\n\
lsl r0, r0, #0x2\n\
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._372 @cond_branch\n\
- ldr r1, ._375 + 4\n\
+ ldr r1, ._375 + 4 @ gUnknown_Debug_20301FE\n\
ldrb r0, [r1]\n\
cmp r0, #0\n\
beq ._373 @cond_branch\n\
@@ -1314,8 +1314,8 @@ u8 debug_sub_8085564(void)
mov r2, #0x1c\n\
mov r3, #0x2\n\
bl Menu_BlankWindowRect\n\
- ldr r1, ._380\n\
- ldr r0, ._380 + 4\n\
+ ldr r1, ._380 @ gDebugText_Weather\n\
+ ldr r0, ._380 + 4 @ gUnknown_Debug_20301FE\n\
ldrb r0, [r0]\n\
lsl r0, r0, #0x2\n\
add r0, r0, r1\n\
@@ -1324,7 +1324,7 @@ u8 debug_sub_8085564(void)
mov r2, #0x1\n\
bl Menu_PrintText\n\
._377:\n\
- ldr r0, ._380 + 8\n\
+ ldr r0, ._380 + 8 @ gMain\n\
ldrh r1, [r0, #0x2e]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\
@@ -1339,7 +1339,7 @@ u8 debug_sub_8085564(void)
.word gUnknown_Debug_20301FE\n\
.word gMain\n\
._378:\n\
- ldr r0, ._382\n\
+ ldr r0, ._382 @ gUnknown_Debug_20301FE\n\
ldrb r0, [r0]\n\
bl ChangeWeather\n\
bl CloseMenu\n\
@@ -1358,8 +1358,8 @@ u8 debug_sub_808560C(void)
{
asm("\
push {r4, lr}\n\
- ldr r4, ._384\n\
- ldr r0, ._384 + 4\n\
+ ldr r4, ._384 @ gUnknown_Debug_20301FE\n\
+ ldr r0, ._384 + 4 @ gWeather\n\
mov r1, #0xda\n\
lsl r1, r1, #0x3\n\
add r0, r0, r1\n\
@@ -1371,7 +1371,7 @@ u8 debug_sub_808560C(void)
mov r2, #0x1c\n\
mov r3, #0x2\n\
bl Menu_BlankWindowRect\n\
- ldr r1, ._384 + 8\n\
+ ldr r1, ._384 + 8 @ gDebugText_Weather\n\
ldrb r0, [r4]\n\
lsl r0, r0, #0x2\n\
add r0, r0, r1\n\
@@ -1379,8 +1379,8 @@ u8 debug_sub_808560C(void)
mov r1, #0x17\n\
mov r2, #0x1\n\
bl Menu_PrintText\n\
- ldr r1, ._384 + 12\n\
- ldr r0, ._384 + 16\n\
+ ldr r1, ._384 + 12 @ gMenuCallback\n\
+ ldr r0, ._384 + 16 @ debug_sub_8085564\n\
str r0, [r1]\n\
mov r0, #0x0\n\
pop {r4}\n\
diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c
index 522fb01d6..5d39b87a9 100644
--- a/src/field/fldeff_cut.c
+++ b/src/field/fldeff_cut.c
@@ -86,7 +86,7 @@ void debug_sub_80AFEE4()
" lsr r0, r0, #0x18\n"
" cmp r0, #0x1\n"
" bne ._1 @cond_branch\n"
- " ldr r1, ._3\n"
+ " ldr r1, ._3 @ gLastFieldPokeMenuOpened\n"
" mov r0, #0x0\n"
" strb r0, [r1]\n"
" bl sub_80A2634\n"
@@ -96,14 +96,14 @@ void debug_sub_80AFEE4()
"._3:\n"
" .word gLastFieldPokeMenuOpened\n"
"._1:\n"
- " ldr r4, ._9\n"
+ " ldr r4, ._9 @ gUnknown_0203923C\n"
" add r1, r4, #2\n"
" add r0, r4, #0\n"
" bl PlayerGetDestCoords\n"
" mov r7, #0x0\n"
" mov r8, r4\n"
"._12:\n"
- " ldr r1, ._9 + 4\n"
+ " ldr r1, ._9 + 4 @ 0xffff\n"
" add r0, r7, r1\n"
" mov r2, r8\n"
" ldrh r2, [r2, #0x2]\n"
@@ -112,7 +112,7 @@ void debug_sub_80AFEE4()
" lsl r0, r0, #0x10\n"
" asr r5, r0, #0x10\n"
"._11:\n"
- " ldr r1, ._9 + 4\n"
+ " ldr r1, ._9 + 4 @ 0xffff\n"
" add r0, r6, r1\n"
" mov r2, r8\n"
" ldrh r2, [r2]\n"
@@ -147,7 +147,7 @@ void debug_sub_80AFEE4()
" cmp r0, #0x1\n"
" bne ._7 @cond_branch\n"
"._6:\n"
- " ldr r1, ._9 + 8\n"
+ " ldr r1, ._9 + 8 @ gLastFieldPokeMenuOpened\n"
" mov r0, #0x0\n"
" strb r0, [r1]\n"
" bl sub_80A25E8\n"
diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c
index d8f70200c..8c0f09bd9 100644
--- a/src/field/fldeff_flash.c
+++ b/src/field/fldeff_flash.c
@@ -77,11 +77,11 @@ void debug_sub_8122080(void)
{
asm("\
push {lr}\n\
- ldr r0, ._4\n\
+ ldr r0, ._4 @ gMapHeader\n\
ldrb r0, [r0, #0x15]\n\
cmp r0, #0x1\n\
bne ._2 @cond_branch\n\
- ldr r0, ._4 + 4\n\
+ ldr r0, ._4 + 4 @ 0x828\n\
bl FlagGet\n\
lsl r0, r0, #0x18\n\
cmp r0, #0\n\
diff --git a/src/field/fldeff_secretpower.c b/src/field/fldeff_secretpower.c
index 3f539fc6e..0e91bb55c 100644
--- a/src/field/fldeff_secretpower.c
+++ b/src/field/fldeff_secretpower.c
@@ -251,7 +251,7 @@ void debug_sub_80D93F4()
asm("\
push {r4, lr}\n\
bl sub_80BB63C\n\
- ldr r0, ._98\n\
+ ldr r0, ._98 @ gSpecialVar_Result\n\
ldrh r0, [r0]\n\
cmp r0, #0x1\n\
beq ._95 @cond_branch\n\
@@ -268,7 +268,7 @@ void debug_sub_80D93F4()
._98:\n\
.word gSpecialVar_Result\n\
._96:\n\
- ldr r4, ._102\n\
+ ldr r4, ._102 @ gUnknown_0203923C\n\
add r1, r4, #2\n\
add r0, r4, #0\n\
bl GetXYCoordsOneStepInFrontOfPlayer\n\
@@ -286,7 +286,7 @@ void debug_sub_80D93F4()
cmp r0, #0x1\n\
bne ._100 @cond_branch\n\
bl sub_80C6264\n\
- ldr r1, ._102 + 4\n\
+ ldr r1, ._102 + 4 @ gLastFieldPokeMenuOpened\n\
mov r0, #0x0\n\
strb r0, [r1]\n\
bl sub_80C639C\n\
@@ -304,7 +304,7 @@ void debug_sub_80D93F4()
cmp r0, #0x1\n\
bne ._104 @cond_branch\n\
bl sub_80C6264\n\
- ldr r1, ._106\n\
+ ldr r1, ._106 @ gLastFieldPokeMenuOpened\n\
mov r0, #0x0\n\
strb r0, [r1]\n\
bl sub_80C64A8\n\
@@ -321,7 +321,7 @@ void debug_sub_80D93F4()
cmp r0, #0x1\n\
bne ._108 @cond_branch\n\
bl sub_80C6264\n\
- ldr r1, ._110\n\
+ ldr r1, ._110 @ gLastFieldPokeMenuOpened\n\
mov r0, #0x0\n\
strb r0, [r1]\n\
bl sub_80C660C\n\
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index cf3c7ca4b..ae1465fbd 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -400,8 +400,8 @@ static bool8 SetupBagMultistep(void)
asm("\
push {r4, r5, lr}\n\
add sp, sp, #0xfffffffc\n\
- ldr r0, ._5\n\
- ldr r1, ._5 + 4\n\
+ ldr r0, ._5 @ gMain\n\
+ ldr r1, ._5 + 4 @ 0x43c\n\
add r0, r0, r1\n\
ldrb r0, [r0]\n\
cmp r0, #0x10\n\
@@ -409,7 +409,7 @@ static bool8 SetupBagMultistep(void)
b ._66\n\
._3:\n\
lsl r0, r0, #0x2\n\
- ldr r1, ._5 + 8\n\
+ ldr r1, ._5 + 8 @ \n\
add r0, r0, r1\n\
ldr r0, [r0]\n\
mov pc, r0\n\
@@ -443,8 +443,8 @@ static bool8 SetupBagMultistep(void)
b ._61\n\
._9:\n\
bl ScanlineEffect_Stop\n\
- ldr r1, ._27\n\
- ldr r0, ._27 + 4\n\
+ ldr r1, ._27 @ gMain\n\
+ ldr r0, ._27 + 4 @ 0x43c\n\
add r1, r1, r0\n\
b ._62\n\
._28:\n\
@@ -457,8 +457,8 @@ static bool8 SetupBagMultistep(void)
b ._61\n\
._11:\n\
bl ClearBGTilemapBuffers\n\
- ldr r0, ._31\n\
- ldr r1, ._31 + 4\n\
+ ldr r0, ._31 @ \n\
+ ldr r1, ._31 + 4 @ \n\
add r0, r0, r1\n\
mov r1, #0x0\n\
strb r1, [r0]\n\
@@ -470,13 +470,13 @@ static bool8 SetupBagMultistep(void)
.word 0x1ffff\n\
._12:\n\
bl ResetPaletteFade\n\
- ldr r2, ._34\n\
+ ldr r2, ._34 @ gPaletteFade\n\
ldrb r0, [r2, #0x8]\n\
mov r1, #0x80\n\
orr r0, r0, r1\n\
strb r0, [r2, #0x8]\n\
- ldr r1, ._34 + 4\n\
- ldr r0, ._34 + 8\n\
+ ldr r1, ._34 + 4 @ gMain\n\
+ ldr r0, ._34 + 8 @ 0x43c\n\
add r1, r1, r0\n\
b ._62\n\
._35:\n\
@@ -495,8 +495,8 @@ static bool8 SetupBagMultistep(void)
bne ._37 @cond_branch\n\
b ._66\n\
._37:\n\
- ldr r1, ._40\n\
- ldr r0, ._40 + 4\n\
+ ldr r1, ._40 @ gMain\n\
+ ldr r0, ._40 + 4 @ 0x43c\n\
add r1, r1, r0\n\
b ._62\n\
._41:\n\
@@ -505,7 +505,7 @@ static bool8 SetupBagMultistep(void)
.word gMain\n\
.word 0x43c\n\
._15:\n\
- ldr r0, ._43\n\
+ ldr r0, ._43 @ gWindowTemplate_81E6DFC\n\
bl Text_LoadWindowTemplate\n\
b ._61\n\
._44:\n\
@@ -513,10 +513,10 @@ static bool8 SetupBagMultistep(void)
._43:\n\
.word gWindowTemplate_81E6DFC\n\
._16:\n\
- ldr r0, ._46\n\
+ ldr r0, ._46 @ gWindowTemplate_81E6DFC\n\
bl MultistepInitMenuWindowBegin\n\
- ldr r1, ._46 + 4\n\
- ldr r0, ._46 + 8\n\
+ ldr r1, ._46 + 4 @ gMain\n\
+ ldr r0, ._46 + 8 @ 0x43c\n\
add r1, r1, r0\n\
b ._62\n\
._47:\n\
@@ -563,7 +563,7 @@ static bool8 SetupBagMultistep(void)
mov r0, #0x3\n\
mov r1, #0x2\n\
bl SetVerticalScrollIndicatorPriority\n\
- ldr r0, ._53\n\
+ ldr r0, ._53 @ sReturnLocation\n\
ldrb r0, [r0]\n\
sub r0, r0, #0x4\n\
lsl r0, r0, #0x18\n\
@@ -577,8 +577,8 @@ static bool8 SetupBagMultistep(void)
mov r1, #0x1\n\
bl SetVerticalScrollIndicators\n\
._51:\n\
- ldr r1, ._53 + 4\n\
- ldr r0, ._53 + 8\n\
+ ldr r1, ._53 + 4 @ gMain\n\
+ ldr r0, ._53 + 8 @ 0x43c\n\
add r1, r1, r0\n\
b ._62\n\
._54:\n\
@@ -588,11 +588,11 @@ static bool8 SetupBagMultistep(void)
.word gMain\n\
.word 0x43c\n\
._19:\n\
- ldr r1, ._56\n\
+ ldr r1, ._56 @ gUnknown_0203855A\n\
mov r0, #0x10\n\
strb r0, [r1]\n\
- ldr r4, ._56 + 4\n\
- ldr r5, ._56 + 8\n\
+ ldr r4, ._56 + 4 @ gBGTilemapBuffers\n\
+ ldr r5, ._56 + 8 @ sCurrentBagPocket\n\
ldrb r1, [r5]\n\
add r1, r1, #0x1\n\
lsl r1, r1, #0x18\n\
@@ -603,7 +603,7 @@ static bool8 SetupBagMultistep(void)
add r0, r4, #0\n\
bl DrawPocketIndicatorDots\n\
bl UpdateAllBagPockets\n\
- ldr r4, ._56 + 12\n\
+ ldr r4, ._56 + 12 @ gBagPockets\n\
ldr r0, [r4, #0x10]\n\
ldr r1, [r4, #0x14]\n\
bl SortItemSlots\n\
@@ -611,7 +611,7 @@ static bool8 SetupBagMultistep(void)
ldr r1, [r4, #0x1c]\n\
bl SortItemSlots\n\
bl sub_80A3D40\n\
- ldr r1, ._56 + 16\n\
+ ldr r1, ._56 + 16 @ gCurrentBagPocketItemSlots\n\
mov r0, #0x0\n\
ldsb r0, [r5, r0]\n\
lsl r0, r0, #0x3\n\
@@ -629,12 +629,12 @@ static bool8 SetupBagMultistep(void)
.word gBagPockets\n\
.word gCurrentBagPocketItemSlots\n\
._20:\n\
- ldr r0, ._59\n\
+ ldr r0, ._59 @ 0xffff\n\
mov r1, #0x0\n\
mov r2, #0x7\n\
bl sub_80A48E8\n\
- ldr r1, ._59 + 4\n\
- ldr r4, ._59 + 8\n\
+ ldr r1, ._59 + 4 @ gBagPocketScrollStates\n\
+ ldr r4, ._59 + 8 @ sCurrentBagPocket\n\
mov r0, #0x0\n\
ldsb r0, [r4, r0]\n\
lsl r0, r0, #0x2\n\
@@ -642,7 +642,7 @@ static bool8 SetupBagMultistep(void)
ldrb r1, [r0, #0x1]\n\
ldrb r0, [r0]\n\
add r1, r1, r0\n\
- ldr r0, ._59 + 12\n\
+ ldr r0, ._59 + 12 @ gCurrentBagPocketItemSlots\n\
ldr r0, [r0]\n\
lsl r1, r1, #0x2\n\
add r1, r1, r0\n\
@@ -650,15 +650,15 @@ static bool8 SetupBagMultistep(void)
ldsh r0, [r1, r2]\n\
bl ItemListMenu_InitDescription\n\
bl ItemListMenu_InitMenu\n\
- ldr r1, ._59 + 16\n\
+ ldr r1, ._59 + 16 @ gUnknown_0203855B\n\
ldrb r0, [r4]\n\
add r0, r0, #0x1\n\
strb r0, [r1]\n\
- ldr r1, ._59 + 20\n\
+ ldr r1, ._59 + 20 @ gUnknown_0203855C\n\
mov r0, #0x0\n\
strb r0, [r1]\n\
- ldr r1, ._59 + 24\n\
- ldr r0, ._59 + 28\n\
+ ldr r1, ._59 + 24 @ gMain\n\
+ ldr r0, ._59 + 28 @ 0x43c\n\
add r1, r1, r0\n\
b ._62\n\
._60:\n\
@@ -679,17 +679,17 @@ static bool8 SetupBagMultistep(void)
bl sub_80A3740\n\
b ._61\n\
._22:\n\
- ldr r3, ._63\n\
+ ldr r3, ._63 @ 0x4000208\n\
ldrh r2, [r3]\n\
mov r0, #0x0\n\
strh r0, [r3]\n\
- ldr r4, ._63 + 4\n\
+ ldr r4, ._63 + 4 @ 0x4000200\n\
ldrh r0, [r4]\n\
mov r1, #0x1\n\
orr r0, r0, r1\n\
strh r0, [r4]\n\
strh r2, [r3]\n\
- ldr r2, ._63 + 8\n\
+ ldr r2, ._63 + 8 @ 0x4000004\n\
ldrh r0, [r2]\n\
mov r1, #0x8\n\
orr r0, r0, r1\n\
@@ -701,13 +701,13 @@ static bool8 SetupBagMultistep(void)
mov r2, #0x10\n\
mov r3, #0x0\n\
bl BeginNormalPaletteFade\n\
- ldr r2, ._63 + 12\n\
+ ldr r2, ._63 + 12 @ gPaletteFade\n\
ldrb r1, [r2, #0x8]\n\
mov r0, #0x7f\n\
and r0, r0, r1\n\
strb r0, [r2, #0x8]\n\
- ldr r1, ._63 + 16\n\
- ldr r0, ._63 + 20\n\
+ ldr r1, ._63 + 16 @ gMain\n\
+ ldr r0, ._63 + 20 @ 0x43c\n\
add r1, r1, r0\n\
b ._62\n\
._64:\n\
@@ -724,8 +724,8 @@ static bool8 SetupBagMultistep(void)
cmp r0, #0x1\n\
beq ._66 @cond_branch\n\
._61:\n\
- ldr r1, ._67\n\
- ldr r2, ._67 + 4\n\
+ ldr r1, ._67 @ gMain\n\
+ ldr r2, ._67 + 4 @ 0x43c\n\
add r1, r1, r2\n\
._62:\n\
ldrb r0, [r1]\n\
@@ -738,23 +738,23 @@ static bool8 SetupBagMultistep(void)
.word gMain\n\
.word 0x43c\n\
._24:\n\
- ldr r0, ._71\n\
+ ldr r0, ._71 @ sub_80A3134\n\
bl SetVBlankCallback\n\
- ldr r0, ._71 + 4\n\
+ ldr r0, ._71 + 4 @ sub_80A3118\n\
bl SetMainCallback2\n\
bl sub_80A751C\n\
bl sub_80A7630\n\
bl sub_80A770C\n\
bl sub_80A7828\n\
bl sub_80A78B8\n\
- ldr r0, ._71 + 8\n\
+ ldr r0, ._71 + 8 @ gLinkOpen\n\
ldrb r0, [r0]\n\
cmp r0, #0x1\n\
bne ._69 @cond_branch\n\
- ldr r0, ._71 + 12\n\
+ ldr r0, ._71 + 12 @ 0x600f5e0\n\
mov r1, #0x80\n\
lsl r1, r1, #0x8\n\
- ldr r2, ._71 + 16\n\
+ ldr r2, ._71 + 16 @ 0x600f800\n\
mov r3, #0x0\n\
bl debug_sub_8008218\n\
._69:\n\
@@ -1036,7 +1036,7 @@ void debug_sub_80A3714()
push {r4, r5, r6, lr}\n\
add sp, sp, #0xfffffff4\n\
mov r5, #0x0\n\
- ldr r2, ._138\n\
+ ldr r2, ._138 @ gUnknown_Debug_083EBC68\n\
mov r1, #0x0\n\
._134:\n\
lsl r0, r5, #0x1\n\
@@ -1059,10 +1059,10 @@ void debug_sub_80A3714()
bl ItemId_GetPocket\n\
lsl r0, r0, #0x18\n\
lsr r0, r0, #0x8\n\
- ldr r1, ._138 + 4\n\
+ ldr r1, ._138 + 4 @ 0xffff0000\n\
add r0, r0, r1\n\
lsr r0, r0, #0x10\n\
- ldr r1, ._138 + 8\n\
+ ldr r1, ._138 + 8 @ gBagPockets\n\
lsl r2, r0, #0x3\n\
add r2, r2, r1\n\
lsl r0, r0, #0x1\n\
@@ -4050,12 +4050,12 @@ static void sub_80A740C(void)
bl sub_80A75E4\n\
bl sub_80A7768\n\
bl sub_80A7420\n\
- ldr r0, ._931\n\
+ ldr r0, ._931 @ gLinkOpen\n\
ldrb r0, [r0]\n\
cmp r0, #0x1\n\
bne ._930 @cond_branch\n\
- ldr r0, ._931 + 4\n\
- ldr r1, ._931 + 8\n\
+ ldr r0, ._931 + 4 @ gLink\n\
+ ldr r1, ._931 + 8 @ 0xfbd\n\
add r0, r0, r1\n\
ldrb r0, [r0]\n\
mov r1, #0x0\n\
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index e41ea1628..b42c50513 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -262,7 +262,7 @@ void debug_sub_810B32C()
" cmp r0, #0x4\n"
" bhi ._37 @cond_branch\n"
" lsl r0, r0, #0x2\n"
- " ldr r1, ._23\n"
+ " ldr r1, ._23 @ \n"
" add r0, r0, r1\n"
" ldr r0, [r0]\n"
" mov pc, r0\n"
@@ -281,7 +281,7 @@ void debug_sub_810B32C()
" b ._37\n"
"._26:\n"
" mov r2, #0x0\n"
- " ldr r3, ._34\n"
+ " ldr r3, ._34 @ gSaveBlock1\n"
"._31:\n"
" mov r0, sp\n"
" add r1, r0, r2\n"
@@ -295,7 +295,7 @@ void debug_sub_810B32C()
" bls ._31 @cond_branch\n"
" bl SetupHipster\n"
" mov r2, #0x0\n"
- " ldr r3, ._34\n"
+ " ldr r3, ._34 @ gSaveBlock1\n"
"._32:\n"
" add r1, r2, r3\n"
" mov r4, sp\n"
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index 4108145c1..66e7e2319 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -502,12 +502,12 @@ void CB2_PartyMenuMain(void)
add sp, sp, #0xfffffffc\n\
bl AnimateSprites\n\
bl BuildOamBuffer\n\
- ldr r0, ._3\n\
+ ldr r0, ._3 @ gPartyMenuType\n\
ldrb r1, [r0]\n\
lsl r0, r1, #0x1\n\
add r0, r0, r1\n\
lsl r0, r0, #0x4\n\
- ldr r1, ._3 + 4\n\
+ ldr r1, ._3 + 4 @ PartyMonTextSettings\n\
add r5, r0, r1\n\
mov r6, #0x0\n\
._1:\n\
@@ -529,12 +529,12 @@ void CB2_PartyMenuMain(void)
ble ._1 @cond_branch\n\
bl RunTasks\n\
bl UpdatePaletteFade\n\
- ldr r0, ._3 + 8\n\
+ ldr r0, ._3 + 8 @ gLinkOpen\n\
ldrb r0, [r0]\n\
cmp r0, #0x1\n\
bne ._2 @cond_branch\n\
- ldr r0, ._3 + 12\n\
- ldr r1, ._3 + 16\n\
+ ldr r0, ._3 + 12 @ gLink\n\
+ ldr r1, ._3 + 16 @ 0xfbd\n\
add r0, r0, r1\n\
ldrb r0, [r0]\n\
mov r1, #0x2\n\
@@ -696,8 +696,8 @@ bool8 InitPartyMenu(void)
mov r7, r8\n\
push {r7}\n\
add sp, sp, #0xfffffff4\n\
- ldr r0, ._55\n\
- ldr r1, ._55 + 4\n\
+ ldr r0, ._55 @ gMain\n\
+ ldr r1, ._55 + 4 @ 0x43c\n\
add r0, r0, r1\n\
ldrb r0, [r0]\n\
cmp r0, #0x11\n\
@@ -705,7 +705,7 @@ bool8 InitPartyMenu(void)
b ._125\n\
._53:\n\
lsl r0, r0, #0x2\n\
- ldr r1, ._55 + 8\n\
+ ldr r1, ._55 + 8 @ \n\
add r0, r0, r1\n\
ldr r0, [r0]\n\
mov pc, r0\n\
@@ -745,10 +745,10 @@ bool8 InitPartyMenu(void)
mov r8, r2\n\
add r2, sp, #0x4\n\
mov r6, #0x0\n\
- ldr r1, ._78\n\
+ ldr r1, ._78 @ 0x40000d4\n\
mov r5, #0x80\n\
lsl r5, r5, #0x5\n\
- ldr r7, ._78 + 4\n\
+ ldr r7, ._78 + 4 @ 0x81000800\n\
mov r0, #0x81\n\
lsl r0, r0, #0x18\n\
mov ip, r0\n\
@@ -778,7 +778,7 @@ bool8 InitPartyMenu(void)
lsl r3, r3, #0x3\n\
mov r4, #0x0\n\
str r4, [sp, #0x8]\n\
- ldr r2, ._78\n\
+ ldr r2, ._78 @ 0x40000d4\n\
mov r1, r8\n\
str r1, [r2]\n\
str r0, [r2, #0x4]\n\
@@ -800,13 +800,13 @@ bool8 InitPartyMenu(void)
orr r3, r3, r0\n\
str r3, [r2, #0x8]\n\
ldr r0, [r2, #0x8]\n\
- ldr r2, ._78 + 8\n\
+ ldr r2, ._78 + 8 @ gPaletteFade\n\
ldrb r0, [r2, #0x8]\n\
mov r1, #0x80\n\
orr r0, r0, r1\n\
strb r0, [r2, #0x8]\n\
- ldr r1, ._78 + 12\n\
- ldr r2, ._78 + 16\n\
+ ldr r1, ._78 + 12 @ gMain\n\
+ ldr r2, ._78 + 16 @ 0x43c\n\
add r1, r1, r2\n\
b ._122\n\
._79:\n\
@@ -822,21 +822,21 @@ bool8 InitPartyMenu(void)
b ._115\n\
._60:\n\
bl sub_806B4A8\n\
- ldr r1, ._82\n\
+ ldr r1, ._82 @ \n\
mov r2, #0x99\n\
lsl r2, r2, #0x2\n\
add r0, r1, r2\n\
mov r2, #0x0\n\
strh r2, [r0]\n\
- ldr r3, ._82 + 4\n\
+ ldr r3, ._82 + 4 @ \n\
add r0, r1, r3\n\
strh r2, [r0]\n\
mov r0, #0x9a\n\
lsl r0, r0, #0x2\n\
add r1, r1, r0\n\
strh r2, [r1]\n\
- ldr r1, ._82 + 8\n\
- ldr r2, ._82 + 12\n\
+ ldr r1, ._82 + 8 @ \n\
+ ldr r2, ._82 + 12 @ \n\
add r1, r1, r2\n\
b ._122\n\
._83:\n\
@@ -850,7 +850,7 @@ bool8 InitPartyMenu(void)
bl ResetSpriteData\n\
b ._115\n\
._62:\n\
- ldr r0, ._88\n\
+ ldr r0, ._88 @ \n\
mov r1, #0x96\n\
lsl r1, r1, #0x2\n\
add r0, r0, r1\n\
@@ -861,8 +861,8 @@ bool8 InitPartyMenu(void)
beq ._86 @cond_branch\n\
bl ResetTasks\n\
._86:\n\
- ldr r1, ._88 + 4\n\
- ldr r2, ._88 + 8\n\
+ ldr r1, ._88 + 4 @ \n\
+ ldr r2, ._88 + 8 @ \n\
add r1, r1, r2\n\
b ._122\n\
._89:\n\
@@ -875,7 +875,7 @@ bool8 InitPartyMenu(void)
bl FreeAllSpritePalettes\n\
b ._115\n\
._64:\n\
- ldr r4, ._92\n\
+ ldr r4, ._92 @ \n\
mov r1, #0x97\n\
lsl r1, r1, #0x2\n\
add r0, r4, r1\n\
@@ -892,10 +892,10 @@ bool8 InitPartyMenu(void)
._92:\n\
.word +0x201b000\n\
._65:\n\
- ldr r0, ._95\n\
+ ldr r0, ._95 @ gWindowTemplate_81E6C90\n\
bl Text_LoadWindowTemplate\n\
- ldr r1, ._95 + 4\n\
- ldr r0, ._95 + 8\n\
+ ldr r1, ._95 + 4 @ gMain\n\
+ ldr r0, ._95 + 8 @ 0x43c\n\
add r1, r1, r0\n\
b ._122\n\
._96:\n\
@@ -905,15 +905,15 @@ bool8 InitPartyMenu(void)
.word gMain\n\
.word 0x43c\n\
._66:\n\
- ldr r4, ._98\n\
- ldr r1, ._98 + 4\n\
+ ldr r4, ._98 @ gUnknown_03004210\n\
+ ldr r1, ._98 + 4 @ gWindowTemplate_81E6C90\n\
add r0, r4, #0\n\
bl Text_InitWindowWithTemplate\n\
add r0, r4, #0\n\
mov r1, #0x1\n\
bl MultistepInitWindowTileData\n\
- ldr r1, ._98 + 8\n\
- ldr r2, ._98 + 12\n\
+ ldr r1, ._98 + 8 @ gMain\n\
+ ldr r2, ._98 + 12 @ 0x43c\n\
add r1, r1, r2\n\
b ._122\n\
._99:\n\
@@ -929,14 +929,14 @@ bool8 InitPartyMenu(void)
bne ._100 @cond_branch\n\
b ._125\n\
._100:\n\
- ldr r0, ._103\n\
+ ldr r0, ._103 @ \n\
mov r3, #0x99\n\
lsl r3, r3, #0x2\n\
add r0, r0, r3\n\
mov r1, #0x1\n\
strh r1, [r0]\n\
- ldr r1, ._103 + 4\n\
- ldr r0, ._103 + 8\n\
+ ldr r1, ._103 + 4 @ \n\
+ ldr r0, ._103 + 8 @ \n\
add r1, r1, r0\n\
b ._122\n\
._104:\n\
@@ -946,7 +946,7 @@ bool8 InitPartyMenu(void)
.word gMain\n\
.word 0x43c\n\
._68:\n\
- ldr r0, ._107\n\
+ ldr r0, ._107 @ \n\
mov r1, #0x99\n\
lsl r1, r1, #0x2\n\
add r4, r0, r1\n\
@@ -958,8 +958,8 @@ bool8 InitPartyMenu(void)
bne ._105 @cond_branch\n\
mov r0, #0x0\n\
strh r0, [r4]\n\
- ldr r1, ._107 + 4\n\
- ldr r2, ._107 + 8\n\
+ ldr r1, ._107 + 4 @ \n\
+ ldr r2, ._107 + 8 @ \n\
add r1, r1, r2\n\
b ._122\n\
._108:\n\
@@ -977,8 +977,8 @@ bool8 InitPartyMenu(void)
bl sub_809D51C\n\
b ._115\n\
._70:\n\
- ldr r2, ._113\n\
- ldr r0, ._113 + 4\n\
+ ldr r2, ._113 @ PartyMenuHandlers\n\
+ ldr r0, ._113 + 4 @ \n\
mov r1, #0x96\n\
lsl r1, r1, #0x2\n\
add r0, r0, r1\n\
@@ -994,8 +994,8 @@ bool8 InitPartyMenu(void)
lsr r0, r0, #0x18\n\
cmp r0, #0x1\n\
bne ._125 @cond_branch\n\
- ldr r1, ._113 + 8\n\
- ldr r2, ._113 + 12\n\
+ ldr r1, ._113 + 8 @ \n\
+ ldr r2, ._113 + 12 @ \n\
add r1, r1, r2\n\
b ._122\n\
._114:\n\
@@ -1006,7 +1006,7 @@ bool8 InitPartyMenu(void)
.word gMain\n\
.word 0x43c\n\
._71:\n\
- ldr r0, ._116\n\
+ ldr r0, ._116 @ gWindowTemplate_81E6CC8\n\
bl MultistepInitMenuWindowBegin\n\
b ._115\n\
._117:\n\
@@ -1017,8 +1017,8 @@ bool8 InitPartyMenu(void)
bl MultistepInitMenuWindowContinue\n\
cmp r0, #0\n\
beq ._125 @cond_branch\n\
- ldr r1, ._120\n\
- ldr r0, ._120 + 4\n\
+ ldr r1, ._120 @ gMain\n\
+ ldr r0, ._120 + 4 @ 0x43c\n\
add r1, r1, r0\n\
b ._122\n\
._121:\n\
@@ -1027,14 +1027,14 @@ bool8 InitPartyMenu(void)
.word gMain\n\
.word 0x43c\n\
._73:\n\
- ldr r0, ._123\n\
- ldr r1, ._123 + 4\n\
+ ldr r0, ._123 @ \n\
+ ldr r1, ._123 + 4 @ \n\
add r0, r0, r1\n\
ldrb r0, [r0]\n\
mov r1, #0x0\n\
bl PrintPartyMenuPromptText\n\
- ldr r1, ._123 + 8\n\
- ldr r2, ._123 + 12\n\
+ ldr r1, ._123 + 8 @ \n\
+ ldr r2, ._123 + 12 @ \n\
add r1, r1, r2\n\
b ._122\n\
._124:\n\
@@ -1052,14 +1052,14 @@ bool8 InitPartyMenu(void)
mov r2, #0x10\n\
mov r3, #0x0\n\
bl BeginNormalPaletteFade\n\
- ldr r2, ._126\n\
+ ldr r2, ._126 @ gPaletteFade\n\
ldrb r1, [r2, #0x8]\n\
mov r0, #0x7f\n\
and r0, r0, r1\n\
strb r0, [r2, #0x8]\n\
._115:\n\
- ldr r1, ._126 + 4\n\
- ldr r3, ._126 + 8\n\
+ ldr r1, ._126 + 4 @ gMain\n\
+ ldr r3, ._126 + 8 @ 0x43c\n\
add r1, r1, r3\n\
._122:\n\
ldrb r0, [r1]\n\
@@ -1073,16 +1073,16 @@ bool8 InitPartyMenu(void)
.word gMain\n\
.word 0x43c\n\
._75:\n\
- ldr r0, ._130\n\
+ ldr r0, ._130 @ VBlankCB_PartyMenu\n\
bl SetVBlankCallback\n\
- ldr r0, ._130 + 4\n\
+ ldr r0, ._130 + 4 @ gLinkOpen\n\
ldrb r0, [r0]\n\
cmp r0, #0x1\n\
bne ._128 @cond_branch\n\
- ldr r0, ._130 + 8\n\
+ ldr r0, ._130 + 8 @ 0x600e5e0\n\
mov r1, #0x80\n\
lsl r1, r1, #0x8\n\
- ldr r2, ._130 + 12\n\
+ ldr r2, ._130 + 12 @ 0x6007800\n\
mov r3, #0x2\n\
bl debug_sub_8008218\n\
._128:\n\
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 01e9711dc..8b67a2cd9 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -1658,7 +1658,7 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c)
add r5, r1, #0\n\
lsl r2, r2, #0x18\n\
lsr r7, r2, #0x18\n\
- ldr r0, ._503\n\
+ ldr r0, ._503 @ gUnknown_020297ED\n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
bne ._498 @cond_branch\n\
@@ -1747,10 +1747,10 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c)
bl sub_80BD610\n\
._515:\n\
mov r3, #0x1\n\
- ldr r6, ._521\n\
+ ldr r6, ._521 @ gSaveBlock1\n\
mov r5, #0x10\n\
neg r5, r5\n\
- ldr r4, ._521 + 4\n\
+ ldr r4, ._521 + 4 @ 0x1a09\n\
._517:\n\
lsl r0, r3, #0x2\n\
add r0, r0, r3\n\
@@ -1776,8 +1776,8 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c)
bls ._517 @cond_branch\n\
bl sub_80BD280\n\
mov r3, #0x1\n\
- ldr r4, ._521\n\
- ldr r6, ._521 + 4\n\
+ ldr r4, ._521 @ gSaveBlock1\n\
+ ldr r6, ._521 + 4 @ 0x1a09\n\
add r7, r4, #0\n\
mov r5, #0x3f\n\
._519:\n\
@@ -1799,10 +1799,10 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c)
lsr r3, r0, #0x10\n\
cmp r3, #0x13\n\
bls ._519 @cond_branch\n\
- ldr r0, ._521 + 8\n\
+ ldr r0, ._521 + 8 @ 0x1a16\n\
add r2, r7, r0\n\
ldrh r1, [r2]\n\
- ldr r0, ._521 + 12\n\
+ ldr r0, ._521 + 12 @ 0xffff\n\
cmp r1, r0\n\
beq ._520 @cond_branch\n\
add r0, r1, #1\n\
diff --git a/src/field/shop.c b/src/field/shop.c
index 852ccddda..fdee31178 100644
--- a/src/field/shop.c
+++ b/src/field/shop.c
@@ -1247,7 +1247,7 @@ void debug_sub_80C2818(void)
push {lr}\n\
mov r0, #0x0\n\
bl CreateShopMenu\n\
- ldr r0, ._290\n\
+ ldr r0, ._290 @ gMartBuyNoSellOptionList\n\
bl SetShopItemsForSale\n\
mov r0, #0x0\n\
bl SetShopMenuCallback\n\
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 0d4ebe3f0..2c97c146d 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -402,7 +402,7 @@ static void SlotMachineSetup_0_1(void)
mov r5, r8\n\
push {r5, r6, r7}\n\
bl sub_81019EC\n\
- ldr r5, ._43\n\
+ ldr r5, ._43 @ \n\
mov r4, #0x0\n\
strb r4, [r5]\n\
strb r4, [r5, #0x2]\n\
@@ -415,8 +415,8 @@ static void SlotMachineSetup_0_1(void)
strh r4, [r5, #0x8]\n\
strb r0, [r5, #0xa]\n\
strb r0, [r5, #0xb]\n\
- ldr r0, ._43 + 4\n\
- ldr r1, ._43 + 8\n\
+ ldr r0, ._43 + 4 @ \n\
+ ldr r1, ._43 + 8 @ \n\
add r0, r0, r1\n\
ldrh r0, [r0]\n\
strh r0, [r5, #0xc]\n\
@@ -445,7 +445,7 @@ static void SlotMachineSetup_0_1(void)
strh r0, [r1]\n\
mov r7, #0x0\n\
add r6, r5, #0\n\
- ldr r2, ._43 + 12\n\
+ ldr r2, ._43 + 12 @ \n\
mov sl, r2\n\
mov r0, #0x1c\n\
add r0, r0, r6\n\
@@ -493,7 +493,7 @@ static void SlotMachineSetup_0_1(void)
cmp r7, #0x2\n\
bls ._41 @cond_branch\n\
bl debug_sub_811B5D0\n\
- ldr r0, ._43 + 16\n\
+ ldr r0, ._43 + 16 @ \n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
beq ._42 @cond_branch\n\
@@ -690,21 +690,21 @@ static bool8 sub_8101E10(struct Task *task)
push {lr}\n\
mov r0, #0x0\n\
bl sub_8104CAC\n\
- ldr r2, ._70\n\
+ ldr r2, ._70 @ \n\
mov r0, #0x5\n\
strb r0, [r2]\n\
- ldr r0, ._70 + 4\n\
+ ldr r0, ._70 + 4 @ \n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
beq ._67 @cond_branch\n\
- ldr r0, ._70 + 8\n\
+ ldr r0, ._70 + 8 @ \n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
bne ._69 @cond_branch\n\
._67:\n\
mov r0, #0xc\n\
ldsh r1, [r2, r0]\n\
- ldr r0, ._70 + 12\n\
+ ldr r0, ._70 + 12 @ \n\
cmp r1, r0\n\
ble ._69 @cond_branch\n\
mov r0, #0x17\n\
@@ -740,17 +740,17 @@ static bool8 sub_8101E3C(struct Task *task)
{
asm("\
push {r4, r5, lr}\n\
- ldr r0, ._77\n\
+ ldr r0, ._77 @ unk_debug_bss_1_1\n\
ldrb r1, [r0]\n\
add r3, r0, #0\n\
- ldr r5, ._77 + 4\n\
+ ldr r5, ._77 + 4 @ gMain\n\
cmp r1, #0\n\
beq ._76 @cond_branch\n\
- ldr r2, ._77 + 8\n\
+ ldr r2, ._77 + 8 @ unk_debug_bss_1_4\n\
ldrb r0, [r2]\n\
cmp r0, #0\n\
beq ._76 @cond_branch\n\
- ldr r4, ._77 + 12\n\
+ ldr r4, ._77 + 12 @ \n\
mov r1, #0xc\n\
ldsh r0, [r4, r1]\n\
cmp r0, #0x3\n\
@@ -796,7 +796,7 @@ static bool8 sub_8101E3C(struct Task *task)
cmp r0, #0\n\
beq ._81 @cond_branch\n\
bl debug_sub_811B620\n\
- ldr r1, ._83\n\
+ ldr r1, ._83 @ \n\
mov r0, #0x1d\n\
strb r0, [r1]\n\
b ._102\n\
@@ -812,7 +812,7 @@ static bool8 sub_8101E3C(struct Task *task)
beq ._85 @cond_branch\n\
mov r0, #0x0\n\
bl sub_8104AB8\n\
- ldr r1, ._87\n\
+ ldr r1, ._87 @ \n\
mov r0, #0x8\n\
strb r0, [r1]\n\
b ._102\n\
@@ -826,7 +826,7 @@ static bool8 sub_8101E3C(struct Task *task)
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._89 @cond_branch\n\
- ldr r2, ._94\n\
+ ldr r2, ._94 @ \n\
mov r3, #0xc\n\
ldsh r0, [r2, r3]\n\
sub r0, r0, #0x3\n\
@@ -852,7 +852,7 @@ static bool8 sub_8101E3C(struct Task *task)
cmp r0, #0x2\n\
ble ._92 @cond_branch\n\
._91:\n\
- ldr r1, ._94\n\
+ ldr r1, ._94 @ \n\
ldrh r0, [r1, #0xc]\n\
sub r0, r0, #0x3\n\
ldrh r3, [r1, #0x12]\n\
@@ -877,7 +877,7 @@ static bool8 sub_8101E3C(struct Task *task)
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._98 @cond_branch\n\
- ldr r4, ._103\n\
+ ldr r4, ._103 @ \n\
mov r1, #0xc\n\
ldsh r0, [r4, r1]\n\
cmp r0, #0\n\
@@ -893,11 +893,11 @@ static bool8 sub_8101E3C(struct Task *task)
add r0, r0, #0x1\n\
strh r0, [r4, #0x12]\n\
._98:\n\
- ldr r0, ._103\n\
+ ldr r0, ._103 @ \n\
mov r2, #0x12\n\
ldsh r1, [r0, r2]\n\
add r2, r0, #0\n\
- ldr r5, ._103 + 4\n\
+ ldr r5, ._103 + 4 @ \n\
cmp r1, #0x2\n\
bgt ._99 @cond_branch\n\
cmp r1, #0\n\
@@ -1029,7 +1029,7 @@ static bool8 sub_8101FA4(struct Task *task)
bl sub_8102DEC\n\
mov r0, #0x0\n\
strh r0, [r4, #0x8]\n\
- ldr r4, ._115\n\
+ ldr r4, ._115 @ \n\
ldrb r1, [r4, #0x4]\n\
mov r0, #0x20\n\
and r0, r0, r1\n\
@@ -1048,7 +1048,7 @@ static bool8 sub_8101FA4(struct Task *task)
mov r0, #0xb\n\
._114:\n\
strb r0, [r4]\n\
- ldr r4, ._119\n\
+ ldr r4, ._119 @ \n\
mov r0, #0x8\n\
strh r0, [r4, #0x1a]\n\
ldrb r0, [r4, #0xa]\n\
@@ -1057,7 +1057,7 @@ static bool8 sub_8101FA4(struct Task *task)
bl dp15_jump_random_unknown\n\
strh r0, [r4, #0x1a]\n\
._117:\n\
- ldr r0, ._119 + 4\n\
+ ldr r0, ._119 + 4 @ \n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
beq ._118 @cond_branch\n\
@@ -1128,15 +1128,15 @@ static bool8 sub_8102034(struct Task *task)
asr r1, r1, #0x10\n\
cmp r1, #0x1d\n\
ble ._124 @cond_branch\n\
- ldr r0, ._127\n\
+ ldr r0, ._127 @ unk_debug_bss_1_1\n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
beq ._126 @cond_branch\n\
- ldr r0, ._127 + 4\n\
+ ldr r0, ._127 + 4 @ unk_debug_bss_1_4\n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
beq ._126 @cond_branch\n\
- ldr r4, ._127 + 8\n\
+ ldr r4, ._127 + 8 @ unk_debug_bss_1_8\n\
bl Random\n\
mov r1, #0x1f\n\
and r1, r1, r0\n\
@@ -1144,7 +1144,7 @@ static bool8 sub_8102034(struct Task *task)
str r1, [r4]\n\
._126:\n\
bl sub_81024F0\n\
- ldr r1, ._127 + 12\n\
+ ldr r1, ._127 + 12 @ \n\
mov r0, #0xc\n\
strb r0, [r1]\n\
._124:\n\
@@ -1178,15 +1178,15 @@ static bool8 sub_8102058(struct Task *task)
{
asm("\
push {r4, r5, lr}\n\
- ldr r0, ._133\n\
+ ldr r0, ._133 @ unk_debug_bss_1_1\n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
beq ._130 @cond_branch\n\
- ldr r0, ._133 + 4\n\
+ ldr r0, ._133 + 4 @ unk_debug_bss_1_4\n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
beq ._130 @cond_branch\n\
- ldr r5, ._133 + 8\n\
+ ldr r5, ._133 + 8 @ unk_debug_bss_1_8\n\
ldr r0, [r5]\n\
sub r0, r0, #0x1\n\
str r0, [r5]\n\
@@ -1194,7 +1194,7 @@ static bool8 sub_8102058(struct Task *task)
bne ._135 @cond_branch\n\
mov r0, #0x18\n\
bl PlaySE\n\
- ldr r4, ._133 + 12\n\
+ ldr r4, ._133 + 12 @ \n\
ldrb r0, [r4, #0x18]\n\
bl sub_8102E1C\n\
ldrb r0, [r4, #0x18]\n\
@@ -1213,7 +1213,7 @@ static bool8 sub_8102058(struct Task *task)
.word unk_debug_bss_1_8\n\
.word +0x2000000\n\
._130:\n\
- ldr r0, ._136\n\
+ ldr r0, ._136 @ gMain\n\
ldrh r1, [r0, #0x2e]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\
@@ -1221,7 +1221,7 @@ static bool8 sub_8102058(struct Task *task)
beq ._135 @cond_branch\n\
mov r0, #0x18\n\
bl PlaySE\n\
- ldr r4, ._136 + 4\n\
+ ldr r4, ._136 + 4 @ \n\
ldrb r0, [r4, #0x18]\n\
bl sub_8102E1C\n\
ldrb r0, [r4, #0x18]\n\
@@ -1260,7 +1260,7 @@ static bool8 sub_8102090(struct Task *task)
{
asm("\
push {r4, lr}\n\
- ldr r4, ._146\n\
+ ldr r4, ._146 @ \n\
ldrb r0, [r4, #0x18]\n\
bl sub_8102E40\n\
lsl r0, r0, #0x18\n\
@@ -1278,7 +1278,7 @@ static bool8 sub_8102090(struct Task *task)
ble ._161 @cond_branch\n\
mov r0, #0xe\n\
strb r0, [r4]\n\
- ldr r0, ._146 + 4\n\
+ ldr r0, ._146 + 4 @ \n\
ldrb r0, [r0]\n\
cmp r0, #0x8\n\
beq ._140 @cond_branch\n\
@@ -1389,7 +1389,7 @@ bool8 sub_81020C8(struct Task *task)
{
asm("\
push {r4, lr}\n\
- ldr r4, ._165\n\
+ ldr r4, ._165 @ \n\
ldrb r1, [r4, #0x4]\n\
mov r0, #0xc0\n\
and r0, r0, r1\n\
@@ -1411,7 +1411,7 @@ bool8 sub_81020C8(struct Task *task)
._163:\n\
bl debug_sub_811B894\n\
._164:\n\
- ldr r4, ._171\n\
+ ldr r4, ._171 @ \n\
ldrh r0, [r4, #0x8]\n\
cmp r0, #0\n\
beq ._167 @cond_branch\n\
@@ -1440,7 +1440,7 @@ bool8 sub_81020C8(struct Task *task)
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._169 @cond_branch\n\
- ldr r0, ._171 + 4\n\
+ ldr r0, ._171 + 4 @ \n\
bl PlayFanfare\n\
mov r0, #0x6\n\
bl sub_8104CAC\n\
@@ -1455,7 +1455,7 @@ bool8 sub_81020C8(struct Task *task)
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._173 @cond_branch\n\
- ldr r0, ._175\n\
+ ldr r0, ._175 @ 0x185\n\
bl PlayFanfare\n\
mov r0, #0x5\n\
bl sub_8104CAC\n\
@@ -1471,7 +1471,7 @@ bool8 sub_81020C8(struct Task *task)
mov r0, #0x2\n\
bl sub_8104CAC\n\
._174:\n\
- ldr r1, ._183\n\
+ ldr r1, ._183 @ \n\
ldrh r3, [r1, #0x8]\n\
mov r0, #0xe0\n\
lsl r0, r0, #0x1\n\
@@ -1528,7 +1528,7 @@ bool8 sub_81020C8(struct Task *task)
strh r0, [r4, #0x10]\n\
lsl r0, r0, #0x10\n\
asr r0, r0, #0x10\n\
- ldr r1, ._186\n\
+ ldr r1, ._186 @ 0x270f\n\
cmp r0, r1\n\
ble ._185 @cond_branch\n\
strh r1, [r4, #0x10]\n\
@@ -1765,14 +1765,14 @@ static bool8 sub_8102424(struct Task *task)
asm("\
push {lr}\n\
add sp, sp, #0xfffffffc\n\
- ldr r0, ._234\n\
+ ldr r0, ._234 @ unk_debug_bss_1_1\n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
bne ._233 @cond_branch\n\
- ldr r0, ._234 + 4\n\
- ldr r1, ._234 + 8\n\
+ ldr r0, ._234 + 4 @ gSaveBlock1\n\
+ ldr r1, ._234 + 8 @ \n\
ldrh r1, [r1, #0xc]\n\
- ldr r2, ._234 + 12\n\
+ ldr r2, ._234 + 12 @ \n\
add r0, r0, r2\n\
strh r1, [r0]\n\
._233:\n\
@@ -1783,7 +1783,7 @@ static bool8 sub_8102424(struct Task *task)
mov r2, #0x0\n\
mov r3, #0x10\n\
bl BeginNormalPaletteFade\n\
- ldr r1, ._234 + 8\n\
+ ldr r1, ._234 + 8 @ \n\
ldrb r0, [r1]\n\
add r0, r0, #0x1\n\
strb r0, [r1]\n\
@@ -1828,7 +1828,7 @@ static bool8 debug_sub_8116E74(struct Task *task)
lsl r0, r0, #0x18\n\
cmp r0, #0\n\
beq ._239 @cond_branch\n\
- ldr r1, ._240\n\
+ ldr r1, ._240 @ \n\
mov r0, #0x5\n\
strb r0, [r1]\n\
._239:\n\
@@ -1848,22 +1848,22 @@ static void sub_8102484(void)
{
asm("\
push {r4, r5, r6, lr}\n\
- ldr r0, ._256\n\
+ ldr r0, ._256 @ \n\
ldrb r2, [r0, #0xa]\n\
add r4, r0, #0\n\
cmp r2, #0\n\
beq ._242 @cond_branch\n\
b ._270\n\
._242:\n\
- ldr r0, ._256 + 4\n\
+ ldr r0, ._256 + 4 @ \n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
beq ._245 @cond_branch\n\
- ldr r3, ._256 + 8\n\
+ ldr r3, ._256 + 8 @ \n\
ldrb r0, [r3]\n\
cmp r0, #0\n\
beq ._245 @cond_branch\n\
- ldr r0, ._256 + 12\n\
+ ldr r0, ._256 + 12 @ \n\
ldrb r1, [r0]\n\
strb r1, [r4, #0x4]\n\
strb r2, [r3]\n\
@@ -1972,7 +1972,7 @@ static void sub_8102484(void)
lsr r6, r0, #0x18\n\
cmp r6, #0x3\n\
beq ._260 @cond_branch\n\
- ldr r1, ._271\n\
+ ldr r1, ._271 @ gUnknown_083ECE42\n\
lsl r0, r6, #0x1\n\
add r0, r0, r1\n\
ldrb r1, [r0]\n\
@@ -2016,8 +2016,8 @@ static void sub_8102484(void)
lsr r6, r0, #0x18\n\
cmp r6, #0x5\n\
beq ._270 @cond_branch\n\
- ldr r4, ._271 + 4\n\
- ldr r1, ._271 + 8\n\
+ ldr r4, ._271 + 4 @ \n\
+ ldr r1, ._271 + 8 @ \n\
lsl r0, r6, #0x1\n\
add r0, r0, r1\n\
ldrb r1, [r0]\n\
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 1b01bf7a8..4904f4a80 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -166,7 +166,7 @@ void debug_sub_8075C40()
" lsl r0, r4, #0x2\n"
" add r0, r0, r4\n"
" lsl r0, r0, #0x3\n"
- " ldr r1, ._5\n"
+ " ldr r1, ._5 @ gTasks\n"
" add r5, r0, r1\n"
" mov r1, #0x0\n"
" ldsh r0, [r5, r1]\n"
@@ -191,28 +191,28 @@ void debug_sub_8075C40()
" bl m4aSoundVSyncOff\n"
" b ._12\n"
"._1:\n"
- " ldr r1, ._13\n"
+ " ldr r1, ._13 @ 0x4000208\n"
" ldrh r0, [r1]\n"
" mov sl, r0\n"
" mov r0, #0x0\n"
" strh r0, [r1]\n"
- " ldr r1, ._13 + 4\n"
+ " ldr r1, ._13 + 4 @ 0x4000108\n"
" strh r0, [r1]\n"
" mov r0, #0x83\n"
" lsl r0, r0, #0x10\n"
" str r0, [r1]\n"
- " ldr r4, ._13 + 8\n"
+ " ldr r4, ._13 + 8 @ 0xc34f\n"
" mov r9, r4\n"
- " ldr r2, ._13 + 12\n"
- " ldr r0, ._13 + 16\n"
+ " ldr r2, ._13 + 12 @ 0x40000b0\n"
+ " ldr r0, ._13 + 16 @ gScanlineEffectRegBuffers\n"
" mov ip, r0\n"
- " ldr r1, ._13 + 20\n"
+ " ldr r1, ._13 + 20 @ 0xc5ff\n"
" mov r8, r1\n"
- " ldr r7, ._13 + 24\n"
+ " ldr r7, ._13 + 24 @ 0x7fff\n"
" mov r3, r9\n"
" add r3, r3, #0x1\n"
- " ldr r6, ._13 + 28\n"
- " ldr r4, ._13 + 32\n"
+ " ldr r6, ._13 + 28 @ 0x4000040\n"
+ " ldr r4, ._13 + 32 @ 0xa2600001\n"
"._11:\n"
" mov r0, ip\n"
" str r0, [r2]\n"
@@ -233,18 +233,18 @@ void debug_sub_8075C40()
" bne ._11 @cond_branch\n"
" mov r3, r9\n"
" add r3, r3, #0x1\n"
- " ldr r0, ._13 + 36\n"
+ " ldr r0, ._13 + 36 @ 0x400010a\n"
" mov r2, #0x0\n"
" strh r2, [r0]\n"
- " ldr r1, ._13 + 4\n"
+ " ldr r1, ._13 + 4 @ 0x4000108\n"
" ldrh r0, [r1]\n"
- " ldr r4, ._13 + 40\n"
+ " ldr r4, ._13 + 40 @ _debugStartMenu_0\n"
" str r0, [r4]\n"
" strh r2, [r1]\n"
- " ldr r0, ._13\n"
+ " ldr r0, ._13 @ 0x4000208\n"
" mov r1, sl\n"
" strh r1, [r0]\n"
- " ldr r4, ._13 + 44\n"
+ " ldr r4, ._13 + 44 @ _debugStartMenu_1\n"
" str r3, [r4]\n"
" bl m4aSoundVSyncOn\n"
" b ._12\n"
@@ -266,20 +266,20 @@ void debug_sub_8075C40()
"._7:\n"
" mov r0, #0x15\n"
" bl PlaySE\n"
- " ldr r0, ._16\n"
- " ldr r1, ._16 + 4\n"
+ " ldr r0, ._16 @ gStringVar1\n"
+ " ldr r1, ._16 + 4 @ _debugStartMenu_1\n"
" ldr r1, [r1]\n"
" mov r2, #0x1\n"
" mov r3, #0x8\n"
" bl ConvertIntToDecimalStringN\n"
- " ldr r0, ._16 + 8\n"
- " ldr r1, ._16 + 12\n"
+ " ldr r0, ._16 + 8 @ gStringVar2\n"
+ " ldr r1, ._16 + 12 @ _debugStartMenu_0\n"
" ldr r1, [r1]\n"
" mov r2, #0x1\n"
" mov r3, #0x8\n"
" bl ConvertIntToDecimalStringN\n"
" bl Menu_DisplayDialogueFrame\n"
- " ldr r0, ._16 + 16\n"
+ " ldr r0, ._16 + 16 @ gUnknown_Debug_839B6D8\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
" bl Menu_PrintText\n"
@@ -297,7 +297,7 @@ void debug_sub_8075C40()
" .word _debugStartMenu_0\n"
" .word gUnknown_Debug_839B6D8\n"
"._8:\n"
- " ldr r0, ._19\n"
+ " ldr r0, ._19 @ gMain\n"
" ldrh r1, [r0, #0x2e]\n"
" mov r0, #0x1\n"
" and r0, r0, r1\n"
@@ -328,7 +328,7 @@ void debug_sub_8075D9C()
{
asm(
" push {lr}\n"
- " ldr r0, ._21\n"
+ " ldr r0, ._21 @ debug_sub_8075C40\n"
" mov r1, #0xa\n"
" bl CreateTask\n"
" bl ScriptContext2_Enable\n"
@@ -363,8 +363,8 @@ void debug_sub_8075DB4()
" bl StringCopy8\n"
" mov r3, #0x7\n"
" mov r4, #0x0\n"
- " ldr r0, ._25\n"
- " ldr r1, ._25 + 4\n"
+ " ldr r0, ._25 @ gSaveBlock1\n"
+ " ldr r1, ._25 + 4 @ 0x2b28\n"
" add r5, r0, r1\n"
" add r2, r6, #0\n"
" add r2, r2, #0x10\n"
@@ -387,7 +387,7 @@ void debug_sub_8075DB4()
"._24:\n"
" mov r0, #0x64\n"
" mul r0, r0, r4\n"
- " ldr r1, ._25 + 8\n"
+ " ldr r1, ._25 + 8 @ gPlayerParty\n"
" add r0, r0, r1\n"
" mov r1, #0x2c\n"
" mul r1, r1, r4\n"
@@ -417,12 +417,12 @@ void unref_sub_8070F90()
{
asm(
" push {lr}\n"
- " ldr r0, ._27\n"
+ " ldr r0, ._27 @ 0x801\n"
" bl FlagSet\n"
" mov r0, #0x80\n"
" lsl r0, r0, #0x4\n"
" bl FlagSet\n"
- " ldr r0, ._27 + 4\n"
+ " ldr r0, ._27 + 4 @ 0x802\n"
" bl FlagSet\n"
" pop {r0}\n"
" bx r0\n"