summaryrefslogtreecommitdiff
path: root/src/field/berry.c
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/berry.c
parent2d5fdddf69bbbe524a32b6b6f104aeb60bb1cebd (diff)
add comments for pool loads in C files
Diffstat (limited to 'src/field/berry.c')
-rw-r--r--src/field/berry.c100
1 files changed, 50 insertions, 50 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"