Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-08-23 19:04:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

add comments for pool loads in C files

Browse Source
This commit is contained in:
Cameron Hall
2018-01-27 17:03:40 -06:00
parent 2d5fdddf69
commit fe400f60b6
31 changed files with 1910 additions and 1910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

942
src/battle/battle_2.c
View File

File diff suppressed because it is too large Load Diff

76
src/battle/battle_4.c
View File

@@ -5024,8 +5024,8 @@ static void atk15_seteffectwithchance(void)
{
asm("\
push {r4, lr}\n\
ldr r2, ._1037\n\
ldr r0, ._1037 + 4\n\
ldr r2, ._1037 @ gBattleMons\n\
ldr r0, ._1037 + 4 @ gBankAttacker\n\
ldrb r1, [r0]\n\
mov r0, #0x58\n\
mul r0, r0, r1\n\
@@ -5034,8 +5034,8 @@ static void atk15_seteffectwithchance(void)
ldrb r0, [r0]\n\
cmp r0, #0x20\n\
bne ._1035 @cond_branch\n\
ldr r2, ._1037 + 8\n\
ldr r0, ._1037 + 12\n\
ldr r2, ._1037 + 8 @ gBattleMoves\n\
ldr r0, ._1037 + 12 @ gCurrentMove\n\
ldrh r1, [r0]\n\
lsl r0, r1, #0x1\n\
add r0, r0, r1\n\
@@ -5052,8 +5052,8 @@ static void atk15_seteffectwithchance(void)
.word gBattleMoves\n\
.word gCurrentMove\n\
._1035:\n\
ldr r2, ._1045\n\
ldr r0, ._1045 + 4\n\
ldr r2, ._1045 @ gBattleMoves\n\
ldr r0, ._1045 + 4 @ gCurrentMove\n\
ldrh r1, [r0]\n\
lsl r0, r1, #0x1\n\
add r0, r0, r1\n\
@@ -5061,11 +5061,11 @@ static void atk15_seteffectwithchance(void)
add r0, r0, r2\n\
ldrb r4, [r0, #0x5]\n\
._1036:\n\
ldr r0, ._1045 + 8\n\
ldr r0, ._1045 + 8 @ gUnknown_02023A14_50\n\
ldrb r1, [r0]\n\
mov r0, #0x4\n\
and r0, r0, r1\n\
ldr r2, ._1045 + 12\n\
ldr r2, ._1045 + 12 @ gBattleCommunication\n\
cmp r0, #0\n\
beq ._1039 @cond_branch\n\
ldrb r1, [r2, #0x3]\n\
@@ -5073,7 +5073,7 @@ static void atk15_seteffectwithchance(void)
and r0, r0, r1\n\
cmp r0, #0\n\
bne ._1040 @cond_branch\n\
ldr r0, ._1045 + 16\n\
ldr r0, ._1045 + 16 @ gBattleMoveFlags\n\
ldrb r1, [r0]\n\
mov r0, #0x29\n\
and r0, r0, r1\n\
@@ -5086,13 +5086,13 @@ static void atk15_seteffectwithchance(void)
cmp r0, #0\n\
beq ._1043 @cond_branch\n\
._1040:\n\
ldr r0, ._1045 + 16\n\
ldr r0, ._1045 + 16 @ gBattleMoveFlags\n\
ldrb r1, [r0]\n\
mov r0, #0x29\n\
and r0, r0, r1\n\
cmp r0, #0\n\
bne ._1043 @cond_branch\n\
ldr r2, ._1045 + 12\n\
ldr r2, ._1045 + 12 @ gBattleCommunication\n\
ldrb r1, [r2, #0x3]\n\
mov r0, #0x7f\n\
and r0, r0, r1\n\
@@ -5116,11 +5116,11 @@ static void atk15_seteffectwithchance(void)
lsr r0, r0, #0x10\n\
cmp r0, r4\n\
bhi ._1049 @cond_branch\n\
ldr r0, ._1052\n\
ldr r0, ._1052 @ gBattleCommunication\n\
ldrb r0, [r0, #0x3]\n\
cmp r0, #0\n\
beq ._1049 @cond_branch\n\
ldr r0, ._1052 + 4\n\
ldr r0, ._1052 + 4 @ gBattleMoveFlags\n\
ldrb r1, [r0]\n\
mov r0, #0x29\n\
and r0, r0, r1\n\
@@ -5144,16 +5144,16 @@ static void atk15_seteffectwithchance(void)
bl SetMoveEffect\n\
b ._1054\n\
._1049:\n\
ldr r1, ._1055\n\
ldr r1, ._1055 @ gBattlescriptCurrInstr\n\
ldr r0, [r1]\n\
add r0, r0, #0x1\n\
str r0, [r1]\n\
._1054:\n\
ldr r0, ._1055 + 4\n\
ldr r0, ._1055 + 4 @ gBattleCommunication\n\
mov r1, #0x0\n\
strb r1, [r0, #0x3]\n\
ldr r0, ._1055 + 8\n\
ldr r2, ._1055 + 12\n\
ldr r0, ._1055 + 8 @ \n\
ldr r2, ._1055 + 12 @ \n\
add r0, r0, r2\n\
strb r1, [r0]\n\
pop {r4}\n\
@@ -12778,12 +12778,12 @@ static void atk9E_metronome(void)
push {r4, r5, r6, r7, lr}\n\
mov r7, r8\n\
push {r7}\n\
ldr r6, ._3076\n\
ldr r6, ._3076 @ gBankAttacker\n\
ldrb r2, [r6]\n\
lsl r1, r2, #0x1\n\
ldr r0, ._3076 + 4\n\
ldr r0, ._3076 + 4 @ \n\
add r3, r1, r0\n\
ldr r5, ._3076 + 8\n\
ldr r5, ._3076 + 8 @ \n\
mov r4, #0x58\n\
add r0, r2, #0\n\
mul r0, r0, r4\n\
@@ -12802,7 +12802,7 @@ static void atk9E_metronome(void)
bne ._3072 @cond_branch\n\
strh r2, [r3]\n\
._3072:\n\
ldr r1, ._3076 + 12\n\
ldr r1, ._3076 + 12 @ \n\
ldrh r0, [r3]\n\
strh r0, [r1]\n\
ldrb r0, [r6]\n\
@@ -12845,14 +12845,14 @@ static void atk9E_metronome(void)
._3079:\n\
strh r0, [r3]\n\
._3081:\n\
ldr r4, ._3083\n\
ldr r4, ._3083 @ gHitMarker\n\
ldr r2, [r4]\n\
ldr r0, ._3083 + 4\n\
ldr r0, ._3083 + 4 @ 0xfffffbff\n\
and r2, r2, r0\n\
str r2, [r4]\n\
ldr r6, ._3083 + 8\n\
ldr r5, ._3083 + 12\n\
ldr r3, ._3083 + 16\n\
ldr r6, ._3083 + 8 @ gBattlescriptCurrInstr\n\
ldr r5, ._3083 + 12 @ gBattleScriptsForMoveEffects\n\
ldr r3, ._3083 + 16 @ gBattleMoves\n\
ldrh r1, [r7]\n\
lsl r0, r1, #0x1\n\
add r0, r0, r1\n\
@@ -12878,15 +12878,15 @@ static void atk9E_metronome(void)
.word gBattleScriptsForMoveEffects\n\
.word gBattleMoves\n\
._3071:\n\
ldr r7, ._3090\n\
ldr r7, ._3090 @ gCurrentMove\n\
mov r6, #0xb1\n\
lsl r6, r6, #0x1\n\
ldr r5, ._3090 + 4\n\
ldr r0, ._3090 + 8\n\
ldr r5, ._3090 + 4 @ sMovesForbiddenToCopy\n\
ldr r0, ._3090 + 8 @ gBattlescriptCurrInstr\n\
mov r8, r0\n\
._3089:\n\
bl Random\n\
ldr r2, ._3090 + 12\n\
ldr r2, ._3090 + 12 @ 0x1ff\n\
add r1, r2, #0\n\
and r0, r0, r1\n\
add r0, r0, #0x1\n\
@@ -12898,9 +12898,9 @@ static void atk9E_metronome(void)
sub r0, r0, #0x1\n\
cmp r0, #0\n\
bge ._3086 @cond_branch\n\
ldr r4, ._3090\n\
ldr r4, ._3090 @ gCurrentMove\n\
ldrh r2, [r4]\n\
ldr r3, ._3090 + 16\n\
ldr r3, ._3090 + 16 @ 0xffff\n\
sub r0, r5, #2\n\
._3088:\n\
add r0, r0, #0x2\n\
@@ -12910,16 +12910,16 @@ static void atk9E_metronome(void)
cmp r1, r3\n\
bne ._3088 @cond_branch\n\
._3087:\n\
ldr r0, ._3090 + 16\n\
ldr r0, ._3090 + 16 @ 0xffff\n\
cmp r1, r0\n\
bne ._3089 @cond_branch\n\
ldr r2, ._3090 + 20\n\
ldr r2, ._3090 + 20 @ gHitMarker\n\
ldr r0, [r2]\n\
ldr r1, ._3090 + 24\n\
ldr r1, ._3090 + 24 @ 0xfffffbff\n\
and r0, r0, r1\n\
str r0, [r2]\n\
ldr r3, ._3090 + 28\n\
ldr r2, ._3090 + 32\n\
ldr r3, ._3090 + 28 @ gBattleScriptsForMoveEffects\n\
ldr r2, ._3090 + 32 @ gBattleMoves\n\
ldrh r1, [r4]\n\
lsl r0, r1, #0x1\n\
add r0, r0, r1\n\
@@ -12935,7 +12935,7 @@ static void atk9E_metronome(void)
._3082:\n\
mov r1, #0x0\n\
bl GetMoveTarget\n\
ldr r1, ._3090 + 36\n\
ldr r1, ._3090 + 36 @ gBankTarget\n\
strb r0, [r1]\n\
pop {r3}\n\
mov r8, r3\n\

36
src/battle/battle_controller_opponent.c
View File

@@ -1447,26 +1447,26 @@ void OpponentHandlecmd20(void)
mov r6, r9\n\
mov r5, r8\n\
push {r5, r6, r7}\n\
ldr r6, ._549\n\
ldr r6, ._549 @ gActiveBank\n\
ldrb r0, [r6]\n\
lsl r0, r0, #0x9\n\
ldr r1, ._549 + 4\n\
ldr r1, ._549 + 4 @ gBattleBufferA\n\
add r5, r0, r1\n\
ldr r2, ._549 + 8\n\
ldr r2, ._549 + 8 @ gUnknown_02023A14_50\n\
ldrb r1, [r2]\n\
mov r0, #0x4\n\
and r0, r0, r1\n\
mov sl, r6\n\
cmp r0, #0\n\
beq ._546 @cond_branch\n\
ldr r0, ._549 + 12\n\
ldr r0, ._549 + 12 @ gBattleMoves\n\
mov r9, r0\n\
ldr r1, ._549 + 16\n\
ldr r1, ._549 + 16 @ \n\
mov ip, r1\n\
add r7, r6, #0\n\
mov r0, #0x2\n\
mov r8, r0\n\
ldr r6, ._549 + 20\n\
ldr r6, ._549 + 20 @ \n\
._552:\n\
ldrb r1, [r7]\n\
mov r0, r8\n\
@@ -1526,13 +1526,13 @@ void OpponentHandlecmd20(void)
ldrb r0, [r1]\n\
b ._561\n\
._553:\n\
ldr r0, ._559\n\
ldr r0, ._559 @ gBattleTypeFlags\n\
ldrh r1, [r0]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._557 @cond_branch\n\
ldr r0, ._559 + 4\n\
ldr r0, ._559 + 4 @ gUnknown_02023A14_50\n\
ldrb r1, [r0]\n\
mov r5, #0x2\n\
add r0, r5, #0\n\
@@ -1578,7 +1578,7 @@ void OpponentHandlecmd20(void)
bl OpponentBufferExecCompleted\n\
b ._562\n\
._546:\n\
ldr r0, ._567\n\
ldr r0, ._567 @ gBattleTypeFlags\n\
ldrh r1, [r0]\n\
mov r0, #0x93\n\
lsl r0, r0, #0x3\n\
@@ -1607,7 +1607,7 @@ void OpponentHandlecmd20(void)
mov r2, #0x0\n\
b ._569\n\
._565:\n\
ldr r3, ._574\n\
ldr r3, ._574 @ gBattleMoves\n\
lsl r0, r4, #0x1\n\
add r2, r5, r0\n\
ldrh r1, [r2]\n\
@@ -1620,7 +1620,7 @@ void OpponentHandlecmd20(void)
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._570 @cond_branch\n\
ldr r1, ._574 + 4\n\
ldr r1, ._574 + 4 @ gBankTarget\n\
ldrb r0, [r6]\n\
strb r0, [r1]\n\
._570:\n\
@@ -1636,11 +1636,11 @@ void OpponentHandlecmd20(void)
beq ._572 @cond_branch\n\
mov r0, #0x0\n\
bl GetBankByIdentity\n\
ldr r5, ._574 + 4\n\
ldr r5, ._574 + 4 @ gBankTarget\n\
strb r0, [r5]\n\
ldr r0, ._574 + 8\n\
ldr r0, ._574 + 8 @ gAbsentBankFlags\n\
ldrb r1, [r0]\n\
ldr r2, ._574 + 12\n\
ldr r2, ._574 + 12 @ gBitTable\n\
ldrb r0, [r5]\n\
lsl r0, r0, #0x2\n\
add r0, r0, r2\n\
@@ -1652,7 +1652,7 @@ void OpponentHandlecmd20(void)
bl GetBankByIdentity\n\
strb r0, [r5]\n\
._572:\n\
ldr r0, ._574 + 4\n\
ldr r0, ._574 + 4 @ gBankTarget\n\
ldrb r2, [r0]\n\
lsl r2, r2, #0x8\n\
orr r2, r2, r4\n\
@@ -1678,7 +1678,7 @@ void OpponentHandlecmd20(void)
ldrh r2, [r0]\n\
cmp r2, #0\n\
beq ._576 @cond_branch\n\
ldr r1, ._579\n\
ldr r1, ._579 @ gBattleMoves\n\
lsl r0, r2, #0x1\n\
add r0, r0, r2\n\
lsl r0, r0, #0x2\n\
@@ -1688,7 +1688,7 @@ void OpponentHandlecmd20(void)
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._577 @cond_branch\n\
ldr r0, ._579 + 4\n\
ldr r0, ._579 + 4 @ gActiveBank\n\
ldrb r2, [r0]\n\
lsl r2, r2, #0x8\n\
b ._578\n\
@@ -1698,7 +1698,7 @@ void OpponentHandlecmd20(void)
.word gBattleMoves\n\
.word gActiveBank\n\
._577:\n\
ldr r0, ._583\n\
ldr r0, ._583 @ gBattleTypeFlags\n\
ldrh r1, [r0]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\

128
src/battle/battle_controller_player.c
View File

@@ -1007,21 +1007,21 @@ void debug_sub_8030C24(void)
asm("\
push {r4, r5, r6, lr}\n\
add sp, sp, #0xfffffff4\n\
ldr r1, ._293\n\
ldr r4, ._293 + 4\n\
ldr r1, ._293 @ gBattlePartyID\n\
ldr r4, ._293 + 4 @ gActiveBank\n\
ldrb r0, [r4]\n\
lsl r0, r0, #0x1\n\
add r0, r0, r1\n\
ldrh r1, [r0]\n\
mov r0, #0x64\n\
mul r0, r0, r1\n\
ldr r1, ._293 + 8\n\
ldr r1, ._293 + 8 @ gPlayerParty\n\
add r0, r0, r1\n\
mov r1, #0xd\n\
bl GetMonData\n\
add r1, sp, #0x8\n\
strh r0, [r1]\n\
ldr r5, ._293 + 12\n\
ldr r5, ._293 + 12 @ gMain\n\
ldrh r1, [r5, #0x30]\n\
cmp r1, #0x20\n\
bne ._286 @cond_branch\n\
@@ -1082,7 +1082,7 @@ void debug_sub_8030C24(void)
ldrb r0, [r4]\n\
mov r1, #0x0\n\
bl dp11b_obj_free\n\
ldr r0, ._312\n\
ldr r0, ._312 @ gBankAttacker\n\
ldrb r2, [r4]\n\
strb r2, [r0]\n\
ldrh r1, [r5, #0x28]\n\
@@ -1090,13 +1090,13 @@ void debug_sub_8030C24(void)
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._310 @cond_branch\n\
ldr r0, ._312 + 4\n\
ldr r0, ._312 + 4 @ gBattleTypeFlags\n\
ldrh r1, [r0]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._310 @cond_branch\n\
ldr r0, ._312 + 8\n\
ldr r0, ._312 + 8 @ gBankTarget\n\
mov r1, #0x2\n\
eor r1, r1, r2\n\
strb r1, [r0]\n\
@@ -1108,14 +1108,14 @@ void debug_sub_8030C24(void)
.word gBattleTypeFlags\n\
.word gBankTarget\n\
._310:\n\
ldr r0, ._317\n\
ldr r0, ._317 @ gMain\n\
ldrh r1, [r0, #0x28]\n\
mov r2, #0x1\n\
add r0, r2, #0\n\
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._315 @cond_branch\n\
ldr r0, ._317 + 4\n\
ldr r0, ._317 + 4 @ gBattleTypeFlags\n\
ldrh r1, [r0]\n\
add r0, r2, #0\n\
and r0, r0, r1\n\
@@ -1132,7 +1132,7 @@ void debug_sub_8030C24(void)
mov r0, #0x1\n\
._316:\n\
bl GetBankByIdentity\n\
ldr r1, ._320\n\
ldr r1, ._320 @ gBankTarget\n\
strb r0, [r1]\n\
._311:\n\
mov r0, #0x0\n\
@@ -1140,8 +1140,8 @@ void debug_sub_8030C24(void)
add r0, sp, #0x8\n\
ldrh r0, [r0]\n\
bl DoMoveAnim\n\
ldr r1, ._320 + 4\n\
ldr r0, ._320 + 8\n\
ldr r1, ._320 + 4 @ gBattleBankFunc\n\
ldr r0, ._320 + 8 @ gActiveBank\n\
ldrb r0, [r0]\n\
b ._332\n\
._321:\n\
@@ -1157,7 +1157,7 @@ void debug_sub_8030C24(void)
ldrb r0, [r4]\n\
mov r1, #0x0\n\
bl dp11b_obj_free\n\
ldr r0, ._325\n\
ldr r0, ._325 @ gBankTarget\n\
ldrb r2, [r4]\n\
strb r2, [r0]\n\
ldrh r1, [r5, #0x28]\n\
@@ -1165,13 +1165,13 @@ void debug_sub_8030C24(void)
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._323 @cond_branch\n\
ldr r0, ._325 + 4\n\
ldr r0, ._325 + 4 @ gBattleTypeFlags\n\
ldrh r1, [r0]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._323 @cond_branch\n\
ldr r0, ._325 + 8\n\
ldr r0, ._325 + 8 @ gBankAttacker\n\
mov r1, #0x2\n\
eor r1, r1, r2\n\
strb r1, [r0]\n\
@@ -1183,14 +1183,14 @@ void debug_sub_8030C24(void)
.word gBattleTypeFlags\n\
.word gBankAttacker\n\
._323:\n\
ldr r0, ._330\n\
ldr r0, ._330 @ gMain\n\
ldrh r1, [r0, #0x28]\n\
mov r2, #0x1\n\
add r0, r2, #0\n\
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._328 @cond_branch\n\
ldr r0, ._330 + 4\n\
ldr r0, ._330 + 4 @ gBattleTypeFlags\n\
ldrh r1, [r0]\n\
add r0, r2, #0\n\
and r0, r0, r1\n\
@@ -1207,7 +1207,7 @@ void debug_sub_8030C24(void)
mov r0, #0x1\n\
._329:\n\
bl GetBankByIdentity\n\
ldr r1, ._333\n\
ldr r1, ._333 @ gBankAttacker\n\
strb r0, [r1]\n\
._324:\n\
mov r0, #0x0\n\
@@ -1215,8 +1215,8 @@ void debug_sub_8030C24(void)
add r0, sp, #0x8\n\
ldrh r0, [r0]\n\
bl DoMoveAnim\n\
ldr r1, ._333 + 4\n\
ldr r0, ._333 + 8\n\
ldr r1, ._333 + 4 @ gBattleBankFunc\n\
ldr r0, ._333 + 8 @ gActiveBank\n\
ldrb r0, [r0]\n\
b ._332\n\
._334:\n\
@@ -1231,7 +1231,7 @@ void debug_sub_8030C24(void)
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._336 @cond_branch\n\
ldr r0, ._338\n\
ldr r0, ._338 @ gBattleTypeFlags\n\
ldrh r1, [r0]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\
@@ -1245,7 +1245,7 @@ void debug_sub_8030C24(void)
bl dp11b_obj_free\n\
mov r0, #0x3\n\
bl GetBankByIdentity\n\
ldr r1, ._338 + 4\n\
ldr r1, ._338 + 4 @ gBankAttacker\n\
strb r0, [r1]\n\
mov r0, #0x1\n\
b ._337\n\
@@ -1283,7 +1283,7 @@ void debug_sub_8030C24(void)
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._343 @cond_branch\n\
ldr r0, ._345\n\
ldr r0, ._345 @ gBattleTypeFlags\n\
ldrh r1, [r0]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\
@@ -1297,24 +1297,24 @@ void debug_sub_8030C24(void)
bl dp11b_obj_free\n\
mov r0, #0x1\n\
bl GetBankByIdentity\n\
ldr r1, ._345 + 4\n\
ldr r1, ._345 + 4 @ gBankAttacker\n\
strb r0, [r1]\n\
mov r0, #0x3\n\
._337:\n\
bl GetBankByIdentity\n\
ldr r1, ._345 + 8\n\
ldr r1, ._345 + 8 @ gBankTarget\n\
strb r0, [r1]\n\
mov r0, #0x0\n\
bl sub_80326EC\n\
add r0, sp, #0x8\n\
ldrh r0, [r0]\n\
bl DoMoveAnim\n\
ldr r1, ._345 + 12\n\
ldr r1, ._345 + 12 @ gBattleBankFunc\n\
ldrb r0, [r4]\n\
._332:\n\
lsl r0, r0, #0x2\n\
add r0, r0, r1\n\
ldr r1, ._345 + 16\n\
ldr r1, ._345 + 16 @ debug_sub_803107C\n\
str r1, [r0]\n\
b ._348\n\
._346:\n\
@@ -1345,20 +1345,20 @@ void debug_sub_8030C24(void)
add r0, r2, #0\n\
strh r0, [r1]\n\
._347:\n\
ldr r1, ._349\n\
ldr r4, ._349 + 4\n\
ldr r1, ._349 @ gBattlePartyID\n\
ldr r4, ._349 + 4 @ gActiveBank\n\
ldrb r0, [r4]\n\
lsl r0, r0, #0x1\n\
add r0, r0, r1\n\
ldrh r1, [r0]\n\
mov r0, #0x64\n\
mul r0, r0, r1\n\
ldr r1, ._349 + 8\n\
ldr r1, ._349 + 8 @ gPlayerParty\n\
add r0, r0, r1\n\
mov r1, #0xd\n\
add r2, sp, #0x8\n\
bl SetMonData\n\
ldr r2, ._349 + 12\n\
ldr r2, ._349 + 12 @ gBattleMons\n\
ldrb r1, [r4]\n\
mov r0, #0x58\n\
mul r0, r0, r1\n\
@@ -1366,8 +1366,8 @@ void debug_sub_8030C24(void)
add r1, sp, #0x8\n\
ldrh r1, [r1]\n\
strh r1, [r0, #0xc]\n\
ldr r5, ._349 + 16\n\
ldr r1, ._349 + 20\n\
ldr r5, ._349 + 16 @ gUnknown_03004210\n\
ldr r1, ._349 + 20 @ 0x1016\n\
mov r0, #0x10\n\
str r0, [sp]\n\
mov r0, #0x38\n\
@@ -1381,7 +1381,7 @@ void debug_sub_8030C24(void)
ldsh r1, [r0, r2]\n\
mov r0, #0xd\n\
mul r1, r1, r0\n\
ldr r0, ._349 + 24\n\
ldr r0, ._349 + 24 @ gMoveNames\n\
add r1, r1, r0\n\
mov r2, #0x80\n\
lsl r2, r2, #0x1\n\
@@ -1390,7 +1390,7 @@ void debug_sub_8030C24(void)
add r0, r5, #0\n\
mov r3, #0x2\n\
bl Text_InitWindowAndPrintText\n\
ldr r4, ._349 + 28\n\
ldr r4, ._349 + 28 @ gDisplayedStringBattle\n\
add r0, sp, #0x8\n\
mov r2, #0x0\n\
ldsh r1, [r0, r2]\n\
@@ -1418,11 +1418,11 @@ void debug_sub_8030C24(void)
.word gMoveNames\n\
.word gDisplayedStringBattle\n\
._302:\n\
ldr r0, ._353\n\
ldr r0, ._353 @ gMain\n\
ldrh r0, [r0, #0x30]\n\
cmp r0, #0x40\n\
bne ._351 @cond_branch\n\
ldr r1, ._353 + 4\n\
ldr r1, ._353 + 4 @ gAnimMoveTurn\n\
ldrb r0, [r1]\n\
sub r0, r0, #0x1\n\
b ._352\n\
@@ -1432,18 +1432,18 @@ void debug_sub_8030C24(void)
.word gMain\n\
.word gAnimMoveTurn\n\
._351:\n\
ldr r1, ._359\n\
ldr r1, ._359 @ gAnimMoveTurn\n\
ldrb r0, [r1]\n\
add r0, r0, #0x1\n\
._352:\n\
strb r0, [r1]\n\
ldr r4, ._359 + 4\n\
ldr r4, ._359 + 4 @ gDisplayedStringBattle\n\
ldrb r1, [r1]\n\
add r0, r4, #0\n\
mov r2, #0x2\n\
mov r3, #0x3\n\
bl ConvertIntToDecimalStringN\n\
ldr r0, ._359 + 8\n\
ldr r0, ._359 + 8 @ gUnknown_03004210\n\
mov r2, #0x8e\n\
lsl r2, r2, #0x1\n\
mov r1, #0x39\n\
@@ -1452,7 +1452,7 @@ void debug_sub_8030C24(void)
mov r3, #0x4\n\
bl Text_InitWindowAndPrintText\n\
._348:\n\
ldr r0, ._359 + 12\n\
ldr r0, ._359 + 12 @ gMain\n\
ldrh r2, [r0, #0x28]\n\
mov r1, #0xc0\n\
lsl r1, r1, #0x2\n\
@@ -1461,28 +1461,28 @@ void debug_sub_8030C24(void)
cmp r0, r1\n\
bne ._355 @cond_branch\n\
mov r4, #0x0\n\
ldr r5, ._359 + 4\n\
ldr r6, ._359 + 8\n\
ldr r5, ._359 + 4 @ gDisplayedStringBattle\n\
ldr r6, ._359 + 8 @ gUnknown_03004210\n\
._361:\n\
add r0, r5, #0\n\
ldr r1, ._359 + 16\n\
ldr r1, ._359 + 16 @ BattleText_Format\n\
bl StringCopy\n\
ldr r1, ._359 + 20\n\
ldr r0, ._359 + 24\n\
ldr r1, ._359 + 20 @ gBattlePartyID\n\
ldr r0, ._359 + 24 @ gActiveBank\n\
ldrb r0, [r0]\n\
lsl r0, r0, #0x1\n\
add r0, r0, r1\n\
ldrh r1, [r0]\n\
mov r0, #0x64\n\
mul r0, r0, r1\n\
ldr r1, ._359 + 28\n\
ldr r1, ._359 + 28 @ gPlayerParty\n\
add r0, r0, r1\n\
add r1, r4, #0\n\
add r1, r1, #0xd\n\
bl GetMonData\n\
mov r1, #0xd\n\
mul r1, r1, r0\n\
ldr r0, ._359 + 32\n\
ldr r0, ._359 + 32 @ gMoveNames\n\
add r1, r1, r0\n\
add r0, r5, #0\n\
bl StringAppend\n\
@@ -1521,19 +1521,19 @@ void debug_sub_8030C24(void)
add r0, r6, #0\n\
add r1, r5, #0\n\
bl Text_InitWindow\n\
ldr r0, ._362\n\
ldr r0, ._362 @ gUnknown_03004210\n\
bl Text_PrintWindow8002F44\n\
add r0, r4, #1\n\
lsl r0, r0, #0x18\n\
lsr r4, r0, #0x18\n\
cmp r4, #0x3\n\
bls ._361 @cond_branch\n\
ldr r1, ._362 + 4\n\
ldr r0, ._362 + 8\n\
ldr r1, ._362 + 4 @ gBattleBankFunc\n\
ldr r0, ._362 + 8 @ gActiveBank\n\
ldrb r0, [r0]\n\
lsl r0, r0, #0x2\n\
add r0, r0, r1\n\
ldr r1, ._362 + 12\n\
ldr r1, ._362 + 12 @ sub_802C68C\n\
str r1, [r0]\n\
._355:\n\
add sp, sp, #0xc\n\
@@ -1556,16 +1556,16 @@ void debug_sub_803107C(void)
push {r4, r5, r6, r7, lr}\n\
add sp, sp, #0xfffffffc\n\
mov r7, #0x0\n\
ldr r0, ._369\n\
ldr r0, ._369 @ gAnimScriptCallback\n\
ldr r0, [r0]\n\
bl _call_via_r0\n\
ldr r0, ._369 + 4\n\
ldr r0, ._369 + 4 @ gAnimScriptActive\n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
bne ._364 @cond_branch\n\
mov r0, #0x1\n\
bl sub_80326EC\n\
ldr r4, ._369 + 8\n\
ldr r4, ._369 + 8 @ gActiveBank\n\
ldrb r0, [r4]\n\
mov r1, #0x1\n\
mov r2, #0x7\n\
@@ -1576,7 +1576,7 @@ void debug_sub_803107C(void)
mov r2, #0x7\n\
mov r3, #0x1\n\
bl dp11b_obj_instanciate\n\
ldr r0, ._369 + 12\n\
ldr r0, ._369 + 12 @ gSprites\n\
add r2, r0, #0\n\
add r2, r2, #0x3e\n\
mov r1, #0x3f\n\
@@ -1593,13 +1593,13 @@ void debug_sub_803107C(void)
sub r1, r1, #0x1\n\
cmp r1, #0\n\
bge ._366 @cond_branch\n\
ldr r4, ._369 + 16\n\
ldr r4, ._369 + 16 @ gDisplayedStringBattle\n\
add r0, r4, #0\n\
add r1, r7, #0\n\
mov r2, #0x2\n\
mov r3, #0x2\n\
bl ConvertIntToDecimalStringN\n\
ldr r6, ._369 + 20\n\
ldr r6, ._369 + 20 @ gUnknown_03004210\n\
mov r2, #0x91\n\
lsl r2, r2, #0x1\n\
mov r5, #0x39\n\
@@ -1625,7 +1625,7 @@ void debug_sub_803107C(void)
bl Text_InitWindowAndPrintText\n\
mov r1, #0x0\n\
mov r7, #0x0\n\
ldr r0, ._369 + 24\n\
ldr r0, ._369 + 24 @ gOamMatrixAllocBitmap\n\
mov r3, #0x1\n\
ldr r2, [r0]\n\
._368:\n\
@@ -1641,13 +1641,13 @@ void debug_sub_803107C(void)
add r1, r1, #0x1\n\
cmp r1, #0x1f\n\
ble ._368 @cond_branch\n\
ldr r4, ._369 + 16\n\
ldr r4, ._369 + 16 @ gDisplayedStringBattle\n\
add r0, r4, #0\n\
add r1, r7, #0\n\
mov r2, #0x2\n\
mov r3, #0x2\n\
bl ConvertIntToDecimalStringN\n\
ldr r0, ._369 + 20\n\
ldr r0, ._369 + 20 @ gUnknown_03004210\n\
mov r2, #0x95\n\
lsl r2, r2, #0x1\n\
mov r1, #0x39\n\
@@ -1655,12 +1655,12 @@ void debug_sub_803107C(void)
add r1, r4, #0\n\
mov r3, #0xe\n\
bl Text_InitWindowAndPrintText\n\
ldr r1, ._369 + 28\n\
ldr r0, ._369 + 8\n\
ldr r1, ._369 + 28 @ gBattleBankFunc\n\
ldr r0, ._369 + 8 @ gActiveBank\n\
ldrb r0, [r0]\n\
lsl r0, r0, #0x2\n\
add r0, r0, r1\n\
ldr r1, ._369 + 32\n\
ldr r1, ._369 + 32 @ debug_sub_8030C24\n\
str r1, [r0]\n\
._364:\n\
add sp, sp, #0x4\n\

10
src/battle/battle_records.c
View File

@@ -234,12 +234,12 @@ void debug_sub_81257E0(void)
add sp, sp, #0xfffffffc\n\
bl InitLinkBattleRecords\n\
mov r5, #0x0\n\
ldr r6, ._62\n\
ldr r6, ._62 @ gUnknown_Debug_4245CC\n\
sub r0, r6, #2\n\
mov r8, r0\n\
ldr r7, ._62 + 4\n\
ldr r7, ._62 + 4 @ gLinkPlayers\n\
._61:\n\
ldr r0, ._62 + 8\n\
ldr r0, ._62 + 8 @ gUnknown_Debug_8424620\n\
lsl r3, r5, #0x2\n\
add r3, r3, r0\n\
ldrb r4, [r3]\n\
@@ -251,7 +251,7 @@ void debug_sub_81257E0(void)
add r0, r0, r8\n\
ldrh r2, [r0]\n\
ldrb r3, [r3, #0x1]\n\
ldr r0, ._62 + 12\n\
ldr r0, ._62 + 12 @ gLinkPlayerMapObjects\n\
lsl r4, r4, #0x2\n\
add r4, r4, r0\n\
ldrb r4, [r4, #0x1]\n\
@@ -261,7 +261,7 @@ void debug_sub_81257E0(void)
add r0, r0, r7\n\
ldrb r0, [r0, #0x1a]\n\
str r0, [sp]\n\
ldr r0, ._62 + 16\n\
ldr r0, ._62 + 16 @ gSaveBlock1\n\
bl UpdateLinkBattleRecords_\n\
add r5, r5, #0x1\n\
cmp r5, #0x2\n\

586
src/debug/start_menu_debug.c
View File

File diff suppressed because it is too large Load Diff

56
src/engine/cable_club.c
View File

@@ -104,7 +104,7 @@ int debug_sub_808A4D0()
asm("\
push {lr}\n\
add r1, r0, #0\n\
ldr r0, ._3\n\
ldr r0, ._3 @ sub_8082F68\n\
cmp r1, r0\n\
bne ._1 @cond_branch\n\
mov r0, #0x1\n\
@@ -114,7 +114,7 @@ int debug_sub_808A4D0()
._3:\n\
.word sub_8082F68+1\n\
._1:\n\
ldr r0, ._7\n\
ldr r0, ._7 @ sub_8082FEC\n\
cmp r1, r0\n\
bne ._5 @cond_branch\n\
mov r0, #0x11\n\
@@ -124,7 +124,7 @@ int debug_sub_808A4D0()
._7:\n\
.word sub_8082FEC+1\n\
._5:\n\
ldr r0, ._11\n\
ldr r0, ._11 @ sub_808303C\n\
cmp r1, r0\n\
bne ._9 @cond_branch\n\
mov r0, #0x12\n\
@@ -134,7 +134,7 @@ int debug_sub_808A4D0()
._11:\n\
.word sub_808303C+1\n\
._9:\n\
ldr r0, ._15\n\
ldr r0, ._15 @ sub_8083188\n\
cmp r1, r0\n\
bne ._13 @cond_branch\n\
mov r0, #0x13\n\
@@ -144,7 +144,7 @@ int debug_sub_808A4D0()
._15:\n\
.word sub_8083188+1\n\
._13:\n\
ldr r0, ._19\n\
ldr r0, ._19 @ sub_80830E4\n\
cmp r1, r0\n\
bne ._17 @cond_branch\n\
mov r0, #0x14\n\
@@ -154,7 +154,7 @@ int debug_sub_808A4D0()
._19:\n\
.word sub_80830E4+1\n\
._17:\n\
ldr r0, ._23\n\
ldr r0, ._23 @ sub_80831F8\n\
cmp r1, r0\n\
bne ._21 @cond_branch\n\
mov r0, #0x21\n\
@@ -164,7 +164,7 @@ int debug_sub_808A4D0()
._23:\n\
.word sub_80831F8+1\n\
._21:\n\
ldr r0, ._27\n\
ldr r0, ._27 @ sub_8083314\n\
cmp r1, r0\n\
bne ._25 @cond_branch\n\
mov r0, #0x2\n\
@@ -174,7 +174,7 @@ int debug_sub_808A4D0()
._27:\n\
.word sub_8083314+1\n\
._25:\n\
ldr r0, ._31\n\
ldr r0, ._31 @ sub_80833C4\n\
cmp r1, r0\n\
beq ._29 @cond_branch\n\
mov r0, #0x0\n\
@@ -199,7 +199,7 @@ void debug_sub_808A55C()
push {r7}\n\
lsl r0, r0, #0x18\n\
lsr r7, r0, #0x18\n\
ldr r2, ._37\n\
ldr r2, ._37 @ gTasks\n\
lsl r0, r7, #0x2\n\
add r0, r0, r7\n\
lsl r0, r0, #0x3\n\
@@ -224,13 +224,13 @@ void debug_sub_808A55C()
add r0, r0, #0x1\n\
strh r0, [r4, #0xa]\n\
._33:\n\
ldr r0, ._37 + 4\n\
ldr r0, ._37 + 4 @ gShouldAdvanceLinkState\n\
ldrb r0, [r0]\n\
mov r1, #0x2\n\
mov r2, #0x0\n\
mov r3, #0x2\n\
bl PrintHex\n\
ldr r0, ._37 + 8\n\
ldr r0, ._37 + 8 @ gBlockSendBuffer\n\
ldrb r0, [r0]\n\
mov r1, #0x16\n\
mov r2, #0x5\n\
@@ -244,14 +244,14 @@ void debug_sub_808A55C()
mov r5, #0xa0\n\
lsl r5, r5, #0x13\n\
._35:\n\
ldr r0, ._37 + 12\n\
ldr r0, ._37 + 12 @ gLinkPlayerPending\n\
add r0, r4, r0\n\
ldrb r0, [r0]\n\
lsr r1, r5, #0x18\n\
mov r2, #0x0\n\
mov r3, #0x1\n\
bl PrintHex\n\
ldr r1, ._37 + 16\n\
ldr r1, ._37 + 16 @ gBlockRecvBuffer\n\
lsl r0, r4, #0x8\n\
add r0, r0, r1\n\
ldrh r0, [r0]\n\
@@ -268,13 +268,13 @@ void debug_sub_808A55C()
add r4, r4, #0x1\n\
cmp r4, #0x3\n\
ble ._35 @cond_branch\n\
ldr r4, ._37 + 20\n\
ldr r4, ._37 + 20 @ gLinkStatus\n\
ldr r0, [r4]\n\
mov r1, #0xf\n\
mov r2, #0x0\n\
mov r3, #0x8\n\
bl PrintHex\n\
ldr r0, ._37 + 24\n\
ldr r0, ._37 + 24 @ gLink\n\
ldrb r0, [r0, #0x1]\n\
mov r1, #0x2\n\
mov r2, #0xa\n\
@@ -294,13 +294,13 @@ void debug_sub_808A55C()
mov r2, #0xa\n\
mov r3, #0x2\n\
bl PrintHex\n\
ldr r0, ._37 + 28\n\
ldr r0, ._37 + 28 @ gReceivedRemoteLinkPlayers\n\
ldrb r0, [r0]\n\
mov r1, #0x2\n\
mov r2, #0xc\n\
mov r3, #0x1\n\
bl PrintHex\n\
ldr r0, ._37 + 32\n\
ldr r0, ._37 + 32 @ gSpecialVar_Result\n\
ldrh r0, [r0]\n\
mov r1, #0xb\n\
mov r2, #0x8\n\
@@ -328,7 +328,7 @@ void debug_sub_808A55C()
mov r2, #0xa\n\
mov r3, #0x1\n\
bl PrintHex\n\
ldr r2, ._37\n\
ldr r2, ._37 @ gTasks\n\
mov r3, r8\n\
add r0, r3, r7\n\
lsl r0, r0, #0x3\n\
@@ -347,7 +347,7 @@ void debug_sub_808A55C()
mov r2, #0xc\n\
mov r3, #0x2\n\
bl PrintHex\n\
ldr r0, ._37 + 36\n\
ldr r0, ._37 + 36 @ gLinkCallback\n\
ldr r0, [r0]\n\
mov r1, #0x2\n\
mov r2, #0xd\n\
@@ -360,7 +360,7 @@ void debug_sub_808A55C()
mov r2, #0x2\n\
mov r3, #0x1\n\
bl PrintHex\n\
ldr r0, ._37 + 40\n\
ldr r0, ._37 + 40 @ gLinkPlayers\n\
mov r6, #0x80\n\
lsl r6, r6, #0x12\n\
add r5, r0, #0\n\
@@ -379,7 +379,7 @@ void debug_sub_808A55C()
sub r4, r4, #0x1\n\
cmp r4, #0\n\
bge ._36 @cond_branch\n\
ldr r0, ._37 + 44\n\
ldr r0, ._37 + 44 @ 0x4000128\n\
ldrh r0, [r0]\n\
mov r1, #0x2\n\
mov r2, #0x6\n\
@@ -430,7 +430,7 @@ static void sub_8082CD4(u8 arg0, u8 arg1)
mov r2, #0x1f\n\
mov r3, #0x2\n\
bl InitLinkTestBG_Unused\n\
ldr r4, ._40\n\
ldr r4, ._40 @ sub_8082F20\n\
add r0, r4, #0\n\
bl FindTaskIdByFunc\n\
lsl r0, r0, #0x18\n\
@@ -443,14 +443,14 @@ static void sub_8082CD4(u8 arg0, u8 arg1)
add r4, r0, #0\n\
lsl r4, r4, #0x18\n\
lsr r4, r4, #0x18\n\
ldr r5, ._40 + 4\n\
ldr r5, ._40 + 4 @ gTasks\n\
lsl r0, r4, #0x2\n\
add r0, r0, r4\n\
lsl r0, r0, #0x3\n\
add r0, r0, r5\n\
strh r7, [r0, #0xa]\n\
strh r6, [r0, #0xc]\n\
ldr r0, ._40 + 8\n\
ldr r0, ._40 + 8 @ debug_sub_808A55C\n\
mov r1, #0x50\n\
bl CreateTask\n\
lsl r0, r0, #0x18\n\
@@ -1297,7 +1297,7 @@ void debug_sub_808B778()
{
asm("\
push {r4, lr}\n\
ldr r4, ._390\n\
ldr r4, ._390 @ debug_sub_808B7A8\n\
add r0, r4, #0\n\
bl FuncIsActiveTask\n\
lsl r0, r0, #0x18\n\
@@ -1307,7 +1307,7 @@ void debug_sub_808B778()
mov r1, #0x50\n\
bl CreateTask\n\
._389:\n\
ldr r1, ._390 + 4\n\
ldr r1, ._390 + 4 @ unk_3004E98\n\
ldr r0, [r1]\n\
add r0, r0, #0x1\n\
str r0, [r1]\n\
@@ -1328,7 +1328,7 @@ void debug_sub_808B7A8()
push {lr}\n\
lsl r0, r0, #0x18\n\
lsr r0, r0, #0x18\n\
ldr r2, ._393\n\
ldr r2, ._393 @ gTasks\n\
lsl r1, r0, #0x2\n\
add r1, r1, r0\n\
lsl r1, r1, #0x3\n\
@@ -1342,7 +1342,7 @@ void debug_sub_808B7A8()
bne ._392 @cond_branch\n\
mov r0, #0x0\n\
strh r0, [r1, #0x8]\n\
ldr r2, ._393 + 4\n\
ldr r2, ._393 + 4 @ unk_3004E94\n\
ldrh r0, [r2]\n\
mov r1, #0x1\n\
orr r0, r0, r1\n\

8
src/engine/link.c
View File

@@ -1050,7 +1050,7 @@ void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0)
" add r6, r1, #0\n"
" add r4, r3, #0\n"
" ldr r0, [sp, #0x38]\n"
" ldr r1, ._347\n"
" ldr r1, ._347 @ unk_20238D0\n"
" ldr r1, [r1]\n"
" cmp r1, r0\n"
" bne ._345 @cond_branch\n"
@@ -1059,7 +1059,7 @@ void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0)
" mov r4, #0x8\n"
"._342:\n"
" mov r3, sp\n"
" ldr r0, ._347 + 4\n"
" ldr r0, ._347 + 4 @ debugTileMap\n"
" mov r8, r0\n"
" lsl r2, r2, #0x6\n"
" mov ip, r2\n"
@@ -1087,8 +1087,8 @@ void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0)
" sub r3, r0, #4\n"
" cmp r4, #0\n"
" ble ._345 @cond_branch\n"
" ldr r7, ._347 + 8\n"
" ldr r6, ._347 + 12\n"
" ldr r7, ._347 + 8 @ debugCharacterBase\n"
" ldr r6, ._347 + 12 @ unk_20238C8\n"
" add r2, r4, #0\n"
"._346:\n"
" ldr r1, [r7]\n"

92
src/engine/mystery_event_menu.c
View File

@@ -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"

34
src/engine/reset_rtc_screen.c
View File

@@ -602,7 +602,7 @@ void debug_sub_806F8F8(void)
{
asm("\
push {lr}\n\
ldr r0, ._131\n\
ldr r0, ._131 @ CB2_InitResetRtcScreen\n\
bl SetMainCallback2\n\
pop {r0}\n\
bx r0\n\
@@ -622,7 +622,7 @@ void debug_sub_806F908(u8 a)
lsl r0, r5, #0x2\n\
add r0, r0, r5\n\
lsl r0, r0, #0x3\n\
ldr r2, ._136\n\
ldr r2, ._136 @ gTasks\n\
add r4, r0, r2\n\
mov r1, #0x0\n\
ldsh r0, [r4, r1]\n\
@@ -636,7 +636,7 @@ void debug_sub_806F908(u8 a)
._136:\n\
.word gTasks+0x8\n\
._133:\n\
ldr r0, ._139\n\
ldr r0, ._139 @ Task_ResetRtc_0\n\
mov r1, #0x50\n\
bl CreateTask\n\
lsl r0, r0, #0x18\n\
@@ -666,7 +666,7 @@ void debug_sub_806F908(u8 a)
ldsh r0, [r2, r1]\n\
cmp r0, #0x1\n\
bne ._142 @cond_branch\n\
ldr r3, ._143\n\
ldr r3, ._143 @ gLocalTime\n\
mov r1, #0x0\n\
ldsh r0, [r3, r1]\n\
mov r1, #0x2\n\
@@ -700,7 +700,7 @@ void debug_sub_806F99C()
asm("\
push {lr}\n\
bl RtcCalcLocalTime\n\
ldr r0, ._145\n\
ldr r0, ._145 @ debug_sub_806F908\n\
mov r1, #0x50\n\
bl CreateTask\n\
bl ScriptContext2_Enable\n\
@@ -717,14 +717,14 @@ void debug_sub_806F9B8()
{
asm("\
push {lr}\n\
ldr r2, ._147\n\
ldr r0, ._147 + 4\n\
ldr r2, ._147 @ gLocalTime\n\
ldr r0, ._147 + 4 @ gSaveBlock2\n\
add r0, r0, #0xa0\n\
ldr r1, [r0, #0x4]\n\
ldr r0, [r0]\n\
str r0, [r2]\n\
str r1, [r2, #0x4]\n\
ldr r0, ._147 + 8\n\
ldr r0, ._147 + 8 @ debug_sub_806F908\n\
mov r1, #0x50\n\
bl CreateTask\n\
bl ScriptContext2_Enable\n\
@@ -752,9 +752,9 @@ void debug_sub_806F9E4()
lsl r0, r7, #0x2\n\
add r0, r0, r7\n\
lsl r0, r0, #0x3\n\
ldr r1, ._153\n\
ldr r1, ._153 @ gTasks\n\
add r5, r0, r1\n\
ldr r6, ._153 + 4\n\
ldr r6, ._153 + 4 @ gStringVar4\n\
mov r1, #0x0\n\
ldsh r0, [r5, r1]\n\
cmp r0, #0x1\n\
@@ -793,19 +793,19 @@ void debug_sub_806F9E4()
mov r1, #0x2\n\
mov r2, #0xa\n\
bl Menu_PrintText\n\
ldr r0, ._158\n\
ldr r0, ._158 @ gUnknown_Debug_0839AE94\n\
mov r1, #0xc\n\
mov r2, #0xc\n\
bl Menu_PrintText\n\
ldr r0, ._158 + 4\n\
ldr r0, ._158 + 4 @ gUnknown_Debug_0839AE99\n\
mov r1, #0x14\n\
mov r2, #0xc\n\
bl Menu_PrintText\n\
ldr r0, ._158 + 8\n\
ldr r0, ._158 + 8 @ gUnknown_Debug_0839AEA7\n\
mov r1, #0x1\n\
mov r2, #0xe\n\
bl Menu_PrintText\n\
ldr r0, ._158 + 12\n\
ldr r0, ._158 + 12 @ gUnknown_Debug_0839AE9D\n\
mov r1, #0x1\n\
mov r2, #0x10\n\
bl Menu_PrintText\n\
@@ -833,7 +833,7 @@ void debug_sub_806F9E4()
mov r0, #0x28\n\
add r0, r0, r6\n\
mov sl, r0\n\
ldr r4, ._163\n\
ldr r4, ._163 @ gLocalTime\n\
mov r1, #0x2\n\
ldsb r1, [r4, r1]\n\
mov r2, #0x3\n\
@@ -850,7 +850,7 @@ void debug_sub_806F9E4()
mov r2, #0x1\n\
mov r3, #0x4\n\
bl ConvertIntToDecimalStringN\n\
ldr r0, ._163 + 4\n\
ldr r0, ._163 + 4 @ gSaveBlock2\n\
ldrb r0, [r0, #0x12]\n\
cmp r0, #0\n\
bne ._160 @cond_branch\n\
@@ -885,7 +885,7 @@ void debug_sub_806F9E4()
.word gLocalTime\n\
.word gSaveBlock2\n\
._161:\n\
ldr r0, ._166\n\
ldr r0, ._166 @ gMain\n\
ldrh r1, [r0, #0x2e]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\

34
src/engine/save_failed_screen.c
View File

@@ -157,12 +157,12 @@ void CB2_WipeSave()
asm(
" push {r4, r5, lr}\n"
" mov r4, #0x0\n"
" ldr r0, ._20\n"
" ldr r0, ._20 @ gSaveFailedClockInfo\n"
" mov r2, #0x1\n"
" strh r2, [r0]\n"
" ldr r0, ._20 + 4\n"
" ldr r0, ._20 + 4 @ gUnknown_Debug_03004BD0\n"
" ldr r0, [r0]\n"
" ldr r1, ._20 + 8\n"
" ldr r1, ._20 + 8 @ gDamagedSaveSectors\n"
" cmp r0, #0\n"
" beq ._12 @cond_branch\n"
" str r2, [r1]\n"
@@ -182,11 +182,11 @@ void CB2_WipeSave()
" mov r2, #0x1c\n"
" mov r3, #0x13\n"
" bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._20 + 12\n"
" ldr r0, ._20 + 12 @ gSystemText_CheckCompleteSaveAttempt\n"
" mov r1, #0x2\n"
" mov r2, #0xb\n"
" bl Menu_PrintText\n"
" ldr r0, ._20 + 16\n"
" ldr r0, ._20 + 16 @ gSaveFailedType\n"
" ldrb r0, [r0]\n"
" bl Save_WriteDataInternal\n"
" ldr r0, [r5]\n"
@@ -197,7 +197,7 @@ void CB2_WipeSave()
" mov r2, #0x1c\n"
" mov r3, #0x13\n"
" bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._20 + 20\n"
" ldr r0, ._20 + 20 @ gSystemText_SaveFailedBackupCheck\n"
" mov r1, #0x2\n"
" mov r2, #0xb\n"
" bl Menu_PrintText\n"
@@ -218,11 +218,11 @@ void CB2_WipeSave()
" mov r2, #0x1c\n"
" mov r3, #0x13\n"
" bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._20 + 24\n"
" ldr r0, ._20 + 24 @ gSystemText_BackupDamagedGameContinue\n"
" mov r1, #0x2\n"
" mov r2, #0xb\n"
" bl Menu_PrintText\n"
" ldr r0, ._20 + 28\n"
" ldr r0, ._20 + 28 @ CB2_FadeAndReturnToTitleScreen\n"
" bl SetMainCallback2\n"
" b ._23\n"
"._21:\n"
@@ -242,11 +242,11 @@ void CB2_WipeSave()
" mov r2, #0x1c\n"
" mov r3, #0x13\n"
" bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._24\n"
" ldr r0, ._24 @ gGameContinueCallback\n"
" ldr r0, [r0]\n"
" cmp r0, #0\n"
" bne ._22 @cond_branch\n"
" ldr r0, ._24 + 4\n"
" ldr r0, ._24 + 4 @ gSystemText_SaveCompletedGameEnd\n"
" mov r1, #0x2\n"
" mov r2, #0xb\n"
" bl Menu_PrintText\n"
@@ -262,11 +262,11 @@ void CB2_WipeSave()
" mov r2, #0x1c\n"
" mov r3, #0x13\n"
" bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._27\n"
" ldr r0, ._27 @ gSystemText_BackupDamagedGameContinue\n"
" mov r1, #0x2\n"
" mov r2, #0xb\n"
" bl Menu_PrintText\n"
" ldr r0, ._27 + 4\n"
" ldr r0, ._27 + 4 @ CB2_GameplayCannotBeContinued\n"
" bl SetMainCallback2\n"
" b ._26\n"
"._28:\n"
@@ -275,12 +275,12 @@ void CB2_WipeSave()
" .word gSystemText_BackupDamagedGameContinue\n"
" .word CB2_GameplayCannotBeContinued+1\n"
"._22:\n"
" ldr r0, ._29\n"
" ldr r0, ._29 @ gSystemText_SaveCompletedPressA\n"
" mov r1, #0x2\n"
" mov r2, #0xb\n"
" bl Menu_PrintText\n"
"._23:\n"
" ldr r0, ._29 + 4\n"
" ldr r0, ._29 + 4 @ CB2_FadeAndReturnToTitleScreen\n"
" bl SetMainCallback2\n"
"._26:\n"
" pop {r4, r5}\n"
@@ -420,20 +420,20 @@ bool8 VerifySectorWipe(u16 sector)
" push {lr}\n"
" lsl r0, r0, #0x10\n"
" lsr r0, r0, #0x10\n"
" ldr r2, ._50\n"
" ldr r2, ._50 @ \n"
" mov r3, #0x80\n"
" lsl r3, r3, #0x5\n"
" mov r1, #0x0\n"
" bl ReadFlash\n"
" mov r0, #0x0\n"
" ldr r1, ._50 + 4\n"
" ldr r1, ._50 + 4 @ \n"
"._49:\n"
" add r0, r0, #0x1\n"
" lsl r0, r0, #0x10\n"
" lsr r0, r0, #0x10\n"
" cmp r0, r1\n"
" bls ._49 @cond_branch\n"
" ldr r0, ._50 + 8\n"
" ldr r0, ._50 + 8 @ \n"
" ldrb r0, [r0]\n"
" pop {r1}\n"
" bx r1\n"

100
src/field/berry.c
View File

@@ -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"

4
src/field/choose_party.c
View File

@@ -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"

28
src/field/field_map_obj.c
View File

@@ -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"

20
src/field/field_player_avatar.c
View File

@@ -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"

26
src/field/field_weather.c
View File

@@ -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\

10
src/field/fldeff_cut.c
View File

@@ -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"

4
src/field/fldeff_flash.c
View File

@@ -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\

10
src/field/fldeff_secretpower.c
View File

@@ -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\

102
src/field/item_menu.c
View File

@@ -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\

6
src/field/mauville_man.c
View File

@@ -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"

106
src/field/party_menu.c
View File

@@ -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\

14
src/field/secret_base.c
View File

@@ -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\

2
src/field/shop.c
View File

@@ -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\

108
src/field/slot_machine.c
View File

@@ -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\

54
src/field/start_menu.c
View File

@@ -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"

126
src/pokemon/pokemon_summary_screen.c
View File

@@ -583,12 +583,12 @@ void sub_809D844(void)
bl AnimateSprites\n\
bl BuildOamBuffer\n\
bl UpdatePaletteFade\n\
ldr r0, ._2\n\
ldr r0, ._2 @ gLinkOpen\n\
ldrb r0, [r0]\n\
cmp r0, #0x1\n\
bne ._1 @cond_branch\n\
ldr r0, ._2 + 4\n\
ldr r1, ._2 + 8\n\
ldr r0, ._2 + 4 @ gLink\n\
ldr r1, ._2 + 8 @ 0xfbd\n\
add r0, r0, r1\n\
ldrb r0, [r0]\n\
mov r1, #0x3\n\
@@ -733,8 +733,8 @@ bool8 sub_809DA84(void)
asm("\
push {r4, r5, r6, r7, lr}\n\
add sp, sp, #0xfffffff8\n\
ldr r1, ._52\n\
ldr r2, ._52 + 4\n\
ldr r1, ._52 @ gMain\n\
ldr r2, ._52 + 4 @ 0x43c\n\
add r0, r1, r2\n\
ldrb r0, [r0]\n\
mov ip, r1\n\
@@ -743,7 +743,7 @@ bool8 sub_809DA84(void)
b ._51\n\
._50:\n\
lsl r0, r0, #0x2\n\
ldr r1, ._52 + 8\n\
ldr r1, ._52 + 8 @ \n\
add r0, r0, r1\n\
ldr r0, [r0]\n\
mov pc, r0\n\
@@ -784,8 +784,8 @@ bool8 sub_809DA84(void)
b ._146\n\
._56:\n\
bl ScanlineEffect_Stop\n\
ldr r1, ._80\n\
ldr r2, ._80 + 4\n\
ldr r1, ._80 @ gMain\n\
ldr r2, ._80 + 4 @ 0x43c\n\
add r1, r1, r2\n\
b ._153\n\
._81:\n\
@@ -802,10 +802,10 @@ bool8 sub_809DA84(void)
mov r3, #0x80\n\
lsl r3, r3, #0x9\n\
mov r5, #0x0\n\
ldr r1, ._85\n\
ldr r1, ._85 @ 0x40000d4\n\
mov r4, #0x80\n\
lsl r4, r4, #0x5\n\
ldr r6, ._85 + 4\n\
ldr r6, ._85 + 4 @ 0x85000400\n\
mov r7, #0x85\n\
lsl r7, r7, #0x18\n\
._83:\n\
@@ -827,7 +827,7 @@ bool8 sub_809DA84(void)
orr r0, r0, r7\n\
str r0, [r1, #0x8]\n\
ldr r0, [r1, #0x8]\n\
ldr r1, ._85 + 8\n\
ldr r1, ._85 + 8 @ 0x43c\n\
add r1, r1, ip\n\
b ._153\n\
._86:\n\
@@ -838,8 +838,8 @@ bool8 sub_809DA84(void)
.word 0x43c\n\
._59:\n\
bl sub_809DE64\n\
ldr r1, ._88\n\
ldr r2, ._88 + 4\n\
ldr r1, ._88 @ gMain\n\
ldr r2, ._88 + 4 @ 0x43c\n\
add r1, r1, r2\n\
b ._153\n\
._89:\n\
@@ -848,7 +848,7 @@ bool8 sub_809DA84(void)
.word gMain\n\
.word 0x43c\n\
._60:\n\
ldr r0, ._91\n\
ldr r0, ._91 @ gWindowTemplate_81E6E6C\n\
bl Text_LoadWindowTemplate\n\
b ._146\n\
._92:\n\
@@ -856,10 +856,10 @@ bool8 sub_809DA84(void)
._91:\n\
.word gWindowTemplate_81E6E6C\n\
._61:\n\
ldr r0, ._94\n\
ldr r0, ._94 @ gWindowTemplate_81E6E6C\n\
bl MultistepInitMenuWindowBegin\n\
ldr r1, ._94 + 4\n\
ldr r2, ._94 + 8\n\
ldr r1, ._94 + 4 @ gMain\n\
ldr r2, ._94 + 8 @ 0x43c\n\
add r1, r1, r2\n\
b ._153\n\
._95:\n\
@@ -877,8 +877,8 @@ bool8 sub_809DA84(void)
b ._146\n\
._63:\n\
bl sub_809DA1C\n\
ldr r1, ._100\n\
ldr r2, ._100 + 4\n\
ldr r1, ._100 @ gMain\n\
ldr r2, ._100 + 4 @ 0x43c\n\
add r1, r1, r2\n\
b ._153\n\
._101:\n\
@@ -887,26 +887,26 @@ bool8 sub_809DA84(void)
.word gMain\n\
.word 0x43c\n\
._64:\n\
ldr r1, ._103\n\
ldr r2, ._103 + 4\n\
ldr r0, ._103 + 8\n\
ldr r1, ._103 @ gSummaryScreenTextTiles\n\
ldr r2, ._103 + 4 @ 0x600d000\n\
ldr r0, ._103 + 8 @ 0x40000d4\n\
str r1, [r0]\n\
str r2, [r0, #0x4]\n\
ldr r1, ._103 + 12\n\
ldr r1, ._103 + 12 @ 0x800000a0\n\
str r1, [r0, #0x8]\n\
ldr r1, [r0, #0x8]\n\
ldr r1, ._103 + 16\n\
ldr r2, ._103 + 20\n\
ldr r1, ._103 + 16 @ sSummaryScreenButtonTiles\n\
ldr r2, ._103 + 20 @ 0x600d140\n\
str r1, [r0]\n\
str r2, [r0, #0x4]\n\
ldr r1, ._103 + 24\n\
ldr r1, ._103 + 24 @ 0x80000080\n\
str r1, [r0, #0x8]\n\
ldr r0, [r0, #0x8]\n\
ldr r0, ._103 + 28\n\
ldr r0, ._103 + 28 @ \n\
add r0, r0, #0x74\n\
mov r1, #0x0\n\
strb r1, [r0]\n\
ldr r1, ._103 + 32\n\
ldr r1, ._103 + 32 @ \n\
add r1, r1, ip\n\
b ._153\n\
._104:\n\
@@ -928,7 +928,7 @@ bool8 sub_809DA84(void)
bne ._105 @cond_branch\n\
b ._157\n\
._105:\n\
ldr r0, ._108\n\
ldr r0, ._108 @ \n\
add r0, r0, #0x74\n\
mov r1, #0x0\n\
strb r1, [r0]\n\
@@ -939,8 +939,8 @@ bool8 sub_809DA84(void)
.word +0x2018000\n\
._66:\n\
bl sub_80A18C4\n\
ldr r1, ._111\n\
ldr r2, ._111 + 4\n\
ldr r1, ._111 @ gMain\n\
ldr r2, ._111 + 4 @ 0x43c\n\
add r1, r1, r2\n\
b ._153\n\
._112:\n\
@@ -949,7 +949,7 @@ bool8 sub_809DA84(void)
.word gMain\n\
.word 0x43c\n\
._67:\n\
ldr r4, ._115\n\
ldr r4, ._115 @ \n\
add r0, r4, #0\n\
bl sub_809F678\n\
add r0, r4, #0\n\
@@ -968,7 +968,7 @@ bool8 sub_809DA84(void)
mov r0, #0xa\n\
bl sub_80A12D0\n\
._114:\n\
ldr r0, ._118\n\
ldr r0, ._118 @ \n\
bl DrawPokerusSurvivorDot\n\
b ._146\n\
._119:\n\
@@ -977,10 +977,10 @@ bool8 sub_809DA84(void)
.word +0x2018010\n\
._68:\n\
bl sub_80A1950\n\
ldr r0, ._121\n\
ldr r0, ._121 @ \n\
bl sub_80A1D84\n\
ldr r1, ._121 + 4\n\
ldr r2, ._121 + 8\n\
ldr r1, ._121 + 4 @ \n\
ldr r2, ._121 + 8 @ \n\
add r1, r1, r2\n\
b ._153\n\
._122:\n\
@@ -990,7 +990,7 @@ bool8 sub_809DA84(void)
.word gMain\n\
.word 0x43c\n\
._69:\n\
ldr r4, ._124\n\
ldr r4, ._124 @ \n\
add r0, r4, #0\n\
bl sub_80A1DE8\n\
add r4, r4, #0x64\n\
@@ -1002,7 +1002,7 @@ bool8 sub_809DA84(void)
._124:\n\
.word +0x2018010\n\
._70:\n\
ldr r4, ._129\n\
ldr r4, ._129 @ \n\
add r5, r4, #0\n\
add r5, r5, #0x64\n\
add r0, r4, #0\n\
@@ -1018,8 +1018,8 @@ bool8 sub_809DA84(void)
._126:\n\
mov r0, #0x0\n\
strb r0, [r5]\n\
ldr r1, ._129 + 4\n\
ldr r2, ._129 + 8\n\
ldr r1, ._129 + 4 @ \n\
ldr r2, ._129 + 8 @ \n\
add r1, r1, r2\n\
b ._153\n\
._130:\n\
@@ -1033,19 +1033,19 @@ bool8 sub_809DA84(void)
bl DrawSummaryScreenNavigationDots\n\
b ._146\n\
._72:\n\
ldr r1, ._134\n\
ldr r1, ._134 @ \n\
ldrb r0, [r1, #0xb]\n\
cmp r0, #0x1\n\
bhi ._132 @cond_branch\n\
ldr r0, ._134 + 4\n\
ldr r0, ._134 + 4 @ \n\
ldrb r1, [r1, #0xb]\n\
lsl r1, r1, #0x2\n\
add r1, r1, r0\n\
ldr r0, [r1]\n\
bl _call_via_r0\n\
._132:\n\
ldr r1, ._134 + 8\n\
ldr r2, ._134 + 12\n\
ldr r1, ._134 + 8 @ \n\
ldr r2, ._134 + 12 @ \n\
add r1, r1, r2\n\
b ._153\n\
._135:\n\
@@ -1056,7 +1056,7 @@ bool8 sub_809DA84(void)
.word gMain\n\
.word 0x43c\n\
._73:\n\
ldr r0, ._137\n\
ldr r0, ._137 @ \n\
bl sub_809FAC8\n\
b ._146\n\
._138:\n\
@@ -1064,16 +1064,16 @@ bool8 sub_809DA84(void)
._137:\n\
.word +0x2018010\n\
._74:\n\
ldr r2, ._140\n\
ldr r0, ._140 + 4\n\
ldr r2, ._140 @ sUnknown_083C1598\n\
ldr r0, ._140 + 4 @ \n\
ldrb r1, [r0, #0xb]\n\
lsl r1, r1, #0x2\n\
add r1, r1, r2\n\
add r0, r0, #0x10\n\
ldr r1, [r1]\n\
bl _call_via_r1\n\
ldr r1, ._140 + 8\n\
ldr r2, ._140 + 12\n\
ldr r1, ._140 + 8 @ \n\
ldr r2, ._140 + 12 @ \n\
add r1, r1, r2\n\
b ._153\n\
._141:\n\
@@ -1084,13 +1084,13 @@ bool8 sub_809DA84(void)
.word gMain\n\
.word 0x43c\n\
._75:\n\
ldr r0, ._144\n\
ldr r0, ._144 @ \n\
mov r1, #0x2d\n\
bl GetMonData\n\
add r1, r0, #0\n\
cmp r1, #0\n\
beq ._142 @cond_branch\n\
ldr r1, ._144 + 4\n\
ldr r1, ._144 + 4 @ \n\
mov r2, #0x80\n\
lsl r2, r2, #0x1\n\
add r0, r2, #0\n\
@@ -1102,7 +1102,7 @@ bool8 sub_809DA84(void)
.word +0x2018010\n\
.word gBattle_BG3_X\n\
._142:\n\
ldr r0, ._147\n\
ldr r0, ._147 @ gBattle_BG3_X\n\
strh r1, [r0]\n\
b ._146\n\
._148:\n\
@@ -1111,7 +1111,7 @@ bool8 sub_809DA84(void)
.word gBattle_BG3_X\n\
._76:\n\
bl sub_809EBC4\n\
ldr r0, ._151\n\
ldr r0, ._151 @ \n\
add r0, r0, #0x79\n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
@@ -1136,8 +1136,8 @@ bool8 sub_809DA84(void)
bl sub_80A1654\n\
._150:\n\
bl PrintSummaryWindowHeaderText\n\
ldr r1, ._154\n\
ldr r2, ._154 + 4\n\
ldr r1, ._154 @ gMain\n\
ldr r2, ._154 + 4 @ 0x43c\n\
add r1, r1, r2\n\
b ._153\n\
._155:\n\
@@ -1150,8 +1150,8 @@ bool8 sub_809DA84(void)
cmp r0, #0x1\n\
beq ._157 @cond_branch\n\
._146:\n\
ldr r1, ._158\n\
ldr r0, ._158 + 4\n\
ldr r1, ._158 @ gMain\n\
ldr r0, ._158 + 4 @ 0x43c\n\
add r1, r1, r0\n\
._153:\n\
ldrb r0, [r1]\n\
@@ -1164,7 +1164,7 @@ bool8 sub_809DA84(void)
.word gMain\n\
.word 0x43c\n\
._51:\n\
ldr r0, ._162\n\
ldr r0, ._162 @ sub_809D85C\n\
bl SetVBlankCallback\n\
mov r0, #0x1\n\
str r0, [sp]\n\
@@ -1173,21 +1173,21 @@ bool8 sub_809DA84(void)
mov r2, #0x10\n\
mov r3, #0x0\n\
bl BeginHardwarePaletteFade\n\
ldr r0, ._162 + 4\n\
ldr r0, ._162 + 4 @ sub_809D844\n\
bl SetMainCallback2\n\
ldr r2, ._162 + 8\n\
ldr r2, ._162 + 8 @ gPaletteFade\n\
ldrb r1, [r2, #0x8]\n\
mov r0, #0x7f\n\
and r0, r0, r1\n\
strb r0, [r2, #0x8]\n\
ldr r0, ._162 + 12\n\
ldr r0, ._162 + 12 @ gLinkOpen\n\
ldrb r0, [r0]\n\
cmp r0, #0x1\n\
bne ._160 @cond_branch\n\
ldr r0, ._162 + 16\n\
ldr r0, ._162 + 16 @ 0x600dde0\n\
mov r1, #0x80\n\
lsl r1, r1, #0x8\n\
ldr r2, ._162 + 20\n\
ldr r2, ._162 + 20 @ 0x600f000\n\
mov r3, #0x3\n\
bl debug_sub_8008218\n\
._160:\n\

766
src/pokenav_before.c
View File

File diff suppressed because it is too large Load Diff

262
src/roulette.c
View File

@@ -586,11 +586,11 @@ void sub_8115384(void)
asm("\
push {r4, lr}\n\
add sp, sp, #0xfffffffc\n\
ldr r1, ._35\n\
ldr r0, ._35 + 4\n\
ldr r1, ._35 @ gUnknown_Debug_03005FB8\n\
ldr r0, ._35 + 4 @ 0x2019000\n\
str r0, [r1]\n\
ldr r1, ._35 + 8\n\
ldr r2, ._35 + 12\n\
ldr r1, ._35 + 8 @ gMain\n\
ldr r2, ._35 + 12 @ 0x43c\n\
add r0, r1, r2\n\
ldrb r0, [r0]\n\
add r2, r1, #0\n\
@@ -599,7 +599,7 @@ void sub_8115384(void)
b ._64\n\
._33:\n\
lsl r0, r0, #0x2\n\
ldr r1, ._35 + 16\n\
ldr r1, ._35 + 16 @ \n\
add r0, r0, r1\n\
ldr r0, [r0]\n\
mov pc, r0\n\
@@ -626,12 +626,12 @@ void sub_8115384(void)
bl ScanlineEffect_Stop\n\
bl ClearVideoCallbacks\n\
bl sub_80F9368\n\
ldr r1, ._47\n\
ldr r3, ._47 + 4\n\
ldr r1, ._47 @ 0x400000c\n\
ldr r3, ._47 + 4 @ 0x4686\n\
add r0, r3, #0\n\
strh r0, [r1]\n\
sub r1, r1, #0x2\n\
ldr r2, ._47 + 8\n\
ldr r2, ._47 + 8 @ 0x4401\n\
add r0, r2, #0\n\
strh r0, [r1]\n\
add r1, r1, #0x46\n\
@@ -640,18 +640,18 @@ void sub_8115384(void)
add r0, r3, #0\n\
strh r0, [r1]\n\
add r1, r1, #0x2\n\
ldr r2, ._47 + 12\n\
ldr r2, ._47 + 12 @ 0x60a\n\
add r0, r2, #0\n\
strh r0, [r1]\n\
ldr r0, ._47 + 16\n\
ldr r0, ._47 + 16 @ gUnknown_08E8096C\n\
mov r1, #0xc0\n\
lsl r1, r1, #0x13\n\
bl LZ77UnCompVram\n\
ldr r0, ._47 + 20\n\
ldr r1, ._47 + 24\n\
ldr r0, ._47 + 20 @ gRouletteWheelTiles\n\
ldr r1, ._47 + 24 @ 0x6004000\n\
bl LZ77UnCompVram\n\
ldr r1, ._47 + 28\n\
ldr r3, ._47 + 32\n\
ldr r1, ._47 + 28 @ gMain\n\
ldr r3, ._47 + 32 @ 0x43c\n\
add r1, r1, r3\n\
b ._61\n\
._48:\n\
@@ -670,8 +670,8 @@ void sub_8115384(void)
bl ResetPaletteFade\n\
bl ResetSpriteData\n\
bl ResetTasks\n\
ldr r1, ._50\n\
ldr r0, ._50 + 4\n\
ldr r1, ._50 @ gMain\n\
ldr r0, ._50 + 4 @ 0x43c\n\
add r1, r1, r0\n\
b ._61\n\
._51:\n\
@@ -680,17 +680,17 @@ void sub_8115384(void)
.word gMain\n\
.word 0x43c\n\
._40:\n\
ldr r0, ._53\n\
ldr r0, ._53 @ gWindowTemplate_81E6C3C\n\
bl Text_LoadWindowTemplate\n\
ldr r0, ._53 + 4\n\
ldr r0, ._53 + 4 @ gWindowTemplate_81E6CE4\n\
bl InitMenuWindow\n\
ldr r0, ._53 + 8\n\
ldr r0, ._53 + 8 @ gUnknown_083F86BC\n\
mov r2, #0xe0\n\
lsl r2, r2, #0x1\n\
mov r1, #0x0\n\
bl LoadPalette\n\
ldr r1, ._53 + 12\n\
ldr r2, ._53 + 16\n\
ldr r1, ._53 + 12 @ gMain\n\
ldr r2, ._53 + 16 @ 0x43c\n\
add r1, r1, r2\n\
b ._61\n\
._54:\n\
@@ -704,14 +704,14 @@ void sub_8115384(void)
._41:\n\
bl sub_8115238\n\
bl ClearBGTilemapBuffers\n\
ldr r0, ._56\n\
ldr r1, ._56 + 4\n\
ldr r0, ._56 @ gUnknown_083F88BC\n\
ldr r1, ._56 + 4 @ 0x2018800\n\
bl LZ77UnCompWram\n\
ldr r0, ._56 + 8\n\
ldr r1, ._56 + 12\n\
ldr r0, ._56 + 8 @ gUnknown_083F8A60\n\
ldr r1, ._56 + 12 @ 0x6003000\n\
bl LZ77UnCompVram\n\
ldr r1, ._56 + 16\n\
ldr r3, ._56 + 20\n\
ldr r1, ._56 + 16 @ gMain\n\
ldr r3, ._56 + 20 @ 0x43c\n\
add r1, r1, r3\n\
b ._61\n\
._57:\n\
@@ -732,8 +732,8 @@ void sub_8115384(void)
bl sub_8117900\n\
bl sub_8117BBC\n\
bl sub_8117DF4\n\
ldr r1, ._59\n\
ldr r0, ._59 + 4\n\
ldr r1, ._59 @ gMain\n\
ldr r0, ._59 + 4 @ 0x43c\n\
add r1, r1, r0\n\
b ._61\n\
._60:\n\
@@ -744,8 +744,8 @@ void sub_8115384(void)
._43:\n\
bl AnimateSprites\n\
bl BuildOamBuffer\n\
ldr r0, ._62\n\
ldr r1, ._62 + 4\n\
ldr r0, ._62 @ gSaveBlock1\n\
ldr r1, ._62 + 4 @ 0x494\n\
add r0, r0, r1\n\
ldrh r0, [r0]\n\
bl sub_81180F4\n\
@@ -760,20 +760,20 @@ void sub_8115384(void)
mov r2, #0x1d\n\
mov r3, #0x13\n\
bl Menu_DrawStdWindowFrame\n\
ldr r0, ._62 + 8\n\
ldr r0, ._62 + 8 @ gUnknown_081C4157\n\
mov r1, #0x1\n\
mov r2, #0xf\n\
bl Menu_PrintText\n\
ldr r1, ._62 + 12\n\
ldr r1, ._62 + 12 @ gSpriteCoordOffsetX\n\
mov r2, #0x3c\n\
neg r2, r2\n\
add r0, r2, #0\n\
strh r0, [r1]\n\
ldr r1, ._62 + 16\n\
ldr r1, ._62 + 16 @ gSpriteCoordOffsetY\n\
mov r0, #0x0\n\
strh r0, [r1]\n\
ldr r1, ._62 + 20\n\
ldr r3, ._62 + 24\n\
ldr r1, ._62 + 20 @ gMain\n\
ldr r3, ._62 + 24 @ 0x43c\n\
add r1, r1, r3\n\
b ._61\n\
._63:\n\
@@ -789,10 +789,10 @@ void sub_8115384(void)
._44:\n\
mov r1, #0x80\n\
lsl r1, r1, #0x13\n\
ldr r3, ._65\n\
ldr r3, ._65 @ 0x1741\n\
add r0, r3, #0\n\
strh r0, [r1]\n\
ldr r0, ._65 + 4\n\
ldr r0, ._65 + 4 @ 0x43c\n\
add r1, r2, r0\n\
._61:\n\
ldrb r0, [r1]\n\
@@ -805,22 +805,22 @@ void sub_8115384(void)
.word 0x1741\n\
.word 0x43c\n\
._45:\n\
ldr r3, ._67\n\
ldr r3, ._67 @ 0x4000208\n\
ldrh r2, [r3]\n\
mov r0, #0x0\n\
strh r0, [r3]\n\
ldr r4, ._67 + 4\n\
ldr r4, ._67 + 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, ._67 + 8\n\
ldr r2, ._67 + 8 @ 0x4000004\n\
ldrh r0, [r2]\n\
mov r1, #0x8\n\
orr r0, r0, r1\n\
strh r0, [r2]\n\
ldr r0, ._67 + 12\n\
ldr r0, ._67 + 12 @ sub_8115124\n\
bl SetVBlankCallback\n\
mov r0, #0x1\n\
str r0, [sp]\n\
@@ -829,33 +829,33 @@ void sub_8115384(void)
mov r2, #0x10\n\
mov r3, #0x0\n\
bl BeginHardwarePaletteFade\n\
ldr r0, ._67 + 16\n\
ldr r0, ._67 + 16 @ sub_81156BC\n\
mov r1, #0x0\n\
bl CreateTask\n\
ldr r4, ._67 + 20\n\
ldr r4, ._67 + 20 @ 0x2019000\n\
add r1, r4, #0\n\
add r1, r1, #0xa4\n\
strb r0, [r1]\n\
lsl r0, r0, #0x18\n\
lsr r0, r0, #0x18\n\
ldr r2, ._67 + 24\n\
ldr r2, ._67 + 24 @ gTasks\n\
lsl r1, r0, #0x2\n\
add r1, r1, r0\n\
lsl r1, r1, #0x3\n\
add r1, r1, r2\n\
mov r0, #0x6\n\
strh r0, [r1, #0x14]\n\
ldr r0, ._67 + 28\n\
ldr r2, ._67 + 32\n\
ldr r0, ._67 + 28 @ gSaveBlock1\n\
ldr r2, ._67 + 32 @ 0x494\n\
add r0, r0, r2\n\
ldrh r0, [r0]\n\
strh r0, [r1, #0x22]\n\
ldr r0, ._67 + 36\n\
ldr r0, ._67 + 36 @ sub_8115634\n\
mov r1, #0x1\n\
bl CreateTask\n\
add r4, r4, #0xa5\n\
strb r0, [r4]\n\
ldr r0, ._67 + 40\n\
ldr r0, ._67 + 40 @ sub_81150FC\n\
bl SetMainCallback2\n\
._64:\n\
add sp, sp, #0x4\n\
@@ -967,7 +967,7 @@ void sub_8115634(u8 unused)
{
asm("\
push {r4, r5, r6, lr}\n\
ldr r0, ._75\n\
ldr r0, ._75 @ 0x2019000\n\
add r3, r0, #0\n\
add r3, r3, #0x21\n\
ldrb r1, [r3]\n\
@@ -1030,17 +1030,17 @@ void sub_8115634(u8 unused)
asr r0, r0, #0x10\n\
neg r0, r0\n\
strh r0, [r6, #0x30]\n\
ldr r0, ._75 + 4\n\
ldr r0, ._75 + 4 @ unk_203955C\n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
beq ._74 @cond_branch\n\
ldr r0, ._75 + 8\n\
ldr r0, ._75 + 8 @ gMain\n\
ldrh r1, [r0, #0x2e]\n\
mov r0, #0x8\n\
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._74 @cond_branch\n\
ldr r2, ._75 + 12\n\
ldr r2, ._75 + 12 @ gTasks\n\
add r0, r6, #0\n\
add r0, r0, #0xa4\n\
ldrb r1, [r0]\n\
@@ -1048,13 +1048,13 @@ void sub_8115634(u8 unused)
add r0, r0, r1\n\
lsl r0, r0, #0x3\n\
add r0, r0, r2\n\
ldr r1, ._75 + 16\n\
ldr r1, ._75 + 16 @ sub_81157AC\n\
str r1, [r0]\n\
ldr r0, ._75 + 20\n\
ldr r0, ._75 + 20 @ gMPlay_SE1\n\
bl m4aMPlayStop\n\
ldr r0, ._75 + 24\n\
ldr r0, ._75 + 24 @ gMPlay_SE2\n\
bl m4aMPlayStop\n\
ldr r0, ._75 + 28\n\
ldr r0, ._75 + 28 @ gMPlay_SE3\n\
bl m4aMPlayStop\n\
._74:\n\
pop {r4, r5, r6}\n\
@@ -2030,13 +2030,13 @@ void sub_8116B40(u8 taskid) // end roulette ?
bne ._380 @cond_branch\n\
mov r0, #0x0\n\
bl SetVBlankCallback\n\
ldr r0, ._381\n\
ldr r0, ._381 @ 0x2019000\n\
mov r2, #0xbe\n\
lsl r2, r2, #0x1\n\
mov r1, #0x0\n\
bl memset\n\
ldr r1, ._381 + 4\n\
ldr r0, ._381 + 8\n\
ldr r1, ._381 + 4 @ gSpriteCoordOffsetX\n\
ldr r0, ._381 + 8 @ gSpriteCoordOffsetY\n\
mov r4, #0x0\n\
strh r5, [r0]\n\
strh r5, [r1]\n\
@@ -2045,20 +2045,20 @@ void sub_8116B40(u8 taskid) // end roulette ?
bl ResetPaletteFade\n\
bl ResetSpriteData\n\
bl ClearBGTilemapBuffers\n\
ldr r0, ._381 + 12\n\
ldr r0, ._381 + 12 @ 0x4000050\n\
strh r5, [r0]\n\
add r0, r0, #0x2\n\
strh r5, [r0]\n\
add r0, r0, #0x2\n\
strh r5, [r0]\n\
ldr r1, ._381 + 16\n\
ldr r0, ._381 + 20\n\
ldr r1, ._381 + 16 @ gFieldCallback\n\
ldr r0, ._381 + 20 @ sub_8080990\n\
str r0, [r1]\n\
ldr r0, ._381 + 24\n\
ldr r0, ._381 + 24 @ c2_exit_to_overworld_2_switch\n\
bl SetMainCallback2\n\
add r0, r6, #0\n\
bl DestroyTask\n\
ldr r0, ._381 + 28\n\
ldr r0, ._381 + 28 @ unk_203955C\n\
strb r4, [r0]\n\
._380:\n\
pop {r4, r5, r6}\n\
@@ -3189,13 +3189,13 @@ void debug_sub_812CDE4()
lsl r0, r0, #0x18\n\
lsr r3, r0, #0x18\n\
add r4, r3, #0\n\
ldr r0, ._575\n\
ldr r0, ._575 @ gMain\n\
ldrh r1, [r0, #0x2e]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._572 @cond_branch\n\
ldr r1, ._575 + 4\n\
ldr r1, ._575 + 4 @ gTasks\n\
lsl r0, r3, #0x2\n\
add r0, r0, r3\n\
lsl r0, r0, #0x3\n\
@@ -3204,13 +3204,13 @@ void debug_sub_812CDE4()
add r0, r0, #0x1\n\
strh r0, [r2, #0x22]\n\
lsl r0, r0, #0x10\n\
ldr r1, ._575 + 8\n\
ldr r1, ._575 + 8 @ 0x27100000\n\
cmp r0, r1\n\
bne ._573 @cond_branch\n\
mov r0, #0x0\n\
strh r0, [r2, #0x22]\n\
._573:\n\
ldr r0, ._575 + 12\n\
ldr r0, ._575 + 12 @ gStringVar1\n\
mov r3, #0x22\n\
ldsh r1, [r2, r3]\n\
b ._584\n\
@@ -3226,7 +3226,7 @@ void debug_sub_812CDE4()
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._577 @cond_branch\n\
ldr r1, ._580\n\
ldr r1, ._580 @ gTasks\n\
lsl r0, r3, #0x2\n\
add r0, r0, r3\n\
lsl r0, r0, #0x3\n\
@@ -3240,10 +3240,10 @@ void debug_sub_812CDE4()
neg r1, r1\n\
cmp r0, r1\n\
bne ._578 @cond_branch\n\
ldr r0, ._580 + 4\n\
ldr r0, ._580 + 4 @ 0x270f\n\
strh r0, [r2, #0x22]\n\
._578:\n\
ldr r0, ._580 + 8\n\
ldr r0, ._580 + 8 @ gStringVar1\n\
mov r3, #0x22\n\
ldsh r1, [r2, r3]\n\
b ._584\n\
@@ -3259,7 +3259,7 @@ void debug_sub_812CDE4()
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._582 @cond_branch\n\
ldr r1, ._585\n\
ldr r1, ._585 @ gTasks\n\
lsl r0, r3, #0x2\n\
add r0, r0, r3\n\
lsl r0, r0, #0x3\n\
@@ -3269,14 +3269,14 @@ void debug_sub_812CDE4()
add r0, r0, #0xa\n\
strh r0, [r2, #0x22]\n\
lsl r0, r0, #0x10\n\
ldr r1, ._585 + 4\n\
ldr r1, ._585 + 4 @ 0x270f0000\n\
cmp r0, r1\n\
ble ._583 @cond_branch\n\
ldr r1, ._585 + 8\n\
ldr r1, ._585 + 8 @ 0xffffd8fb\n\
add r0, r3, r1\n\
strh r0, [r2, #0x22]\n\
._583:\n\
ldr r0, ._585 + 12\n\
ldr r0, ._585 + 12 @ gStringVar1\n\
mov r3, #0x22\n\
ldsh r1, [r2, r3]\n\
b ._584\n\
@@ -3293,7 +3293,7 @@ void debug_sub_812CDE4()
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._587 @cond_branch\n\
ldr r0, ._590\n\
ldr r0, ._590 @ gTasks\n\
lsl r1, r3, #0x2\n\
add r1, r1, r3\n\
lsl r1, r1, #0x3\n\
@@ -3305,19 +3305,19 @@ void debug_sub_812CDE4()
lsl r0, r0, #0x10\n\
cmp r0, #0\n\
bge ._588 @cond_branch\n\
ldr r3, ._590 + 4\n\
ldr r3, ._590 + 4 @ 0x2705\n\
add r0, r2, r3\n\
strh r0, [r1, #0x22]\n\
._588:\n\
ldr r0, ._590 + 8\n\
ldr r0, ._590 + 8 @ gStringVar1\n\
mov r2, #0x22\n\
ldsh r1, [r1, r2]\n\
._584:\n\
mov r2, #0x1\n\
mov r3, #0x4\n\
bl ConvertIntToDecimalStringN\n\
ldr r4, ._590 + 12\n\
ldr r1, ._590 + 16\n\
ldr r4, ._590 + 12 @ gStringVar4\n\
ldr r1, ._590 + 16 @ gOtherText_Coins\n\
add r0, r4, #0\n\
bl StringExpandPlaceholders\n\
add r0, r4, #0\n\
@@ -3338,34 +3338,34 @@ void debug_sub_812CDE4()
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._592 @cond_branch\n\
ldr r0, ._594\n\
ldr r2, ._594 + 4\n\
ldr r0, ._594 @ gSaveBlock1\n\
ldr r2, ._594 + 4 @ gTasks\n\
lsl r1, r3, #0x2\n\
add r1, r1, r3\n\
lsl r1, r1, #0x3\n\
add r1, r1, r2\n\
ldrh r2, [r1, #0x22]\n\
ldr r3, ._594 + 8\n\
ldr r3, ._594 + 8 @ 0x494\n\
add r0, r0, r3\n\
mov r5, #0x0\n\
strh r2, [r0]\n\
ldr r0, ._594 + 12\n\
ldr r0, ._594 + 12 @ Task_Roulette_0\n\
str r0, [r1]\n\
ldr r0, ._594 + 16\n\
ldr r0, ._594 + 16 @ gStringVar1\n\
mov r2, #0x22\n\
ldsh r1, [r1, r2]\n\
mov r2, #0x1\n\
mov r3, #0x4\n\
bl ConvertIntToDecimalStringN\n\
ldr r4, ._594 + 20\n\
ldr r1, ._594 + 24\n\
ldr r4, ._594 + 20 @ gStringVar4\n\
ldr r1, ._594 + 24 @ gOtherText_Coins\n\
add r0, r4, #0\n\
bl StringExpandPlaceholders\n\
add r0, r4, #0\n\
mov r1, #0x9\n\
mov r2, #0x1\n\
bl MenuPrint_RightAligned\n\
ldr r0, ._594 + 28\n\
ldr r0, ._594 + 28 @ unk_2039560\n\
strb r5, [r0]\n\
b ._596\n\
._595:\n\
@@ -3384,33 +3384,33 @@ void debug_sub_812CDE4()
and r0, r0, r1\n\
cmp r0, #0\n\
beq ._596 @cond_branch\n\
ldr r0, ._597\n\
ldr r2, ._597 + 4\n\
ldr r0, ._597 @ gSaveBlock1\n\
ldr r2, ._597 + 4 @ gTasks\n\
lsl r1, r4, #0x2\n\
add r1, r1, r4\n\
lsl r1, r1, #0x3\n\
add r1, r1, r2\n\
ldrh r2, [r1, #0x22]\n\
ldr r3, ._597 + 8\n\
ldr r3, ._597 + 8 @ 0x494\n\
add r0, r0, r3\n\
strh r2, [r0]\n\
ldr r0, ._597 + 12\n\
ldr r0, ._597 + 12 @ Task_Roulette_0\n\
str r0, [r1]\n\
ldr r0, ._597 + 16\n\
ldr r0, ._597 + 16 @ gStringVar1\n\
mov r2, #0x22\n\
ldsh r1, [r1, r2]\n\
mov r2, #0x1\n\
mov r3, #0x4\n\
bl ConvertIntToDecimalStringN\n\
ldr r4, ._597 + 20\n\
ldr r1, ._597 + 24\n\
ldr r4, ._597 + 20 @ gStringVar4\n\
ldr r1, ._597 + 24 @ gOtherText_Coins\n\
add r0, r4, #0\n\
bl StringExpandPlaceholders\n\
add r0, r4, #0\n\
mov r1, #0x9\n\
mov r2, #0x1\n\
bl MenuPrint_RightAligned\n\
ldr r1, ._597 + 28\n\
ldr r1, ._597 + 28 @ unk_2039560\n\
mov r0, #0x1\n\
strb r0, [r1]\n\
._596:\n\
@@ -3437,13 +3437,13 @@ void debug_sub_812CFE8()
push {r4, r5, lr}\n\
lsl r0, r0, #0x18\n\
lsr r0, r0, #0x18\n\
ldr r2, ._600\n\
ldr r2, ._600 @ gTasks\n\
lsl r1, r0, #0x2\n\
add r1, r1, r0\n\
lsl r1, r1, #0x3\n\
add r5, r1, r2\n\
ldr r0, ._600 + 4\n\
ldr r1, ._600 + 8\n\
ldr r0, ._600 + 4 @ gSaveBlock1\n\
ldr r1, ._600 + 8 @ 0x494\n\
add r0, r0, r1\n\
ldrh r0, [r0]\n\
strh r0, [r5, #0x22]\n\
@@ -3452,20 +3452,20 @@ void debug_sub_812CFE8()
and r1, r1, r0\n\
cmp r1, #0\n\
beq ._599 @cond_branch\n\
ldr r0, ._600 + 12\n\
ldr r0, ._600 + 12 @ gSpecialVar_0x8004\n\
ldrh r1, [r0]\n\
mov r2, #0x80\n\
orr r1, r1, r2\n\
strh r1, [r0]\n\
._599:\n\
ldr r0, ._600 + 16\n\
ldr r0, ._600 + 16 @ gStringVar1\n\
mov r2, #0x22\n\
ldsh r1, [r5, r2]\n\
mov r2, #0x1\n\
mov r3, #0x4\n\
bl ConvertIntToDecimalStringN\n\
ldr r4, ._600 + 20\n\
ldr r1, ._600 + 24\n\
ldr r4, ._600 + 20 @ gStringVar4\n\
ldr r1, ._600 + 24 @ gOtherText_Coins\n\
add r0, r4, #0\n\
bl StringExpandPlaceholders\n\
mov r0, #0x0\n\
@@ -3482,11 +3482,11 @@ void debug_sub_812CFE8()
mov r2, #0x1d\n\
mov r3, #0x13\n\
bl Menu_DrawStdWindowFrame\n\
ldr r0, ._600 + 28\n\
ldr r0, ._600 + 28 @ gUnknown_Debug_0842510D\n\
mov r1, #0x1\n\
mov r2, #0xf\n\
bl Menu_PrintText\n\
ldr r0, ._600 + 32\n\
ldr r0, ._600 + 32 @ debug_sub_812CDE4\n\
str r0, [r5]\n\
pop {r4, r5}\n\
pop {r0}\n\
@@ -3514,14 +3514,14 @@ void PlayRoulette(void)
asm("\
push {lr}\n\
bl ScriptContext2_Enable\n\
ldr r1, ._604\n\
ldr r1, ._604 @ unk_2039560\n\
mov r0, #0x0\n\
strb r0, [r1]\n\
ldr r0, ._604 + 4\n\
ldr r0, ._604 + 4 @ unk_203955C\n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
beq ._602 @cond_branch\n\
ldr r0, ._604 + 8\n\
ldr r0, ._604 + 8 @ debug_sub_812CFE8\n\
mov r1, #0x0\n\
bl CreateTask\n\
b ._603\n\
@@ -3532,18 +3532,18 @@ void PlayRoulette(void)
.word unk_203955C\n\
.word debug_sub_812CFE8+1\n\
._602:\n\
ldr r0, ._606\n\
ldr r0, ._606 @ Task_Roulette_0\n\
mov r1, #0x0\n\
bl CreateTask\n\
lsl r0, r0, #0x18\n\
lsr r0, r0, #0x18\n\
ldr r2, ._606 + 4\n\
ldr r2, ._606 + 4 @ gTasks\n\
lsl r1, r0, #0x2\n\
add r1, r1, r0\n\
lsl r1, r1, #0x3\n\
add r1, r1, r2\n\
ldr r0, ._606 + 8\n\
ldr r2, ._606 + 12\n\
ldr r0, ._606 + 8 @ gSaveBlock1\n\
ldr r2, ._606 + 12 @ 0x494\n\
add r0, r0, r2\n\
ldrh r0, [r0]\n\
strh r0, [r1, #0x22]\n\
@@ -4479,10 +4479,10 @@ void debug_sub_812E698()
and r1, r1, r0\n\
cmp r1, #0\n\
beq ._837 @cond_branch\n\
ldr r4, ._839\n\
ldr r4, ._839 @ 0x2019000\n\
add r1, r4, #0\n\
add r1, r1, #0x8c\n\
ldr r0, ._839 + 4\n\
ldr r0, ._839 + 4 @ 0x0\n\
str r0, [r1]\n\
add r0, r4, #0\n\
add r0, r0, #0x7e\n\
@@ -4494,7 +4494,7 @@ void debug_sub_812E698()
add r1, r1, #0x7f\n\
strb r0, [r1]\n\
add r1, r4, #0\n\
ldr r4, ._839 + 8\n\
ldr r4, ._839 + 8 @ gUnknown_083F8DF4\n\
b ._838\n\
._840:\n\
.align 2, 0\n\
@@ -4503,10 +4503,10 @@ void debug_sub_812E698()
.word 0x0\n\
.word gUnknown_083F8DF4\n\
._837:\n\
ldr r6, ._841\n\
ldr r6, ._841 @ 0x2019000\n\
add r5, r6, #0\n\
add r5, r5, #0x8c\n\
ldr r4, ._841 + 4\n\
ldr r4, ._841 + 4 @ gUnknown_083F8DF4\n\
ldrb r0, [r6, #0x4]\n\
lsl r0, r0, #0x1e\n\
lsr r0, r0, #0x19\n\
@@ -4534,9 +4534,9 @@ void debug_sub_812E698()
ldrb r0, [r0, #0x2]\n\
strh r0, [r7, #0x32]\n\
add r1, r1, #0x98\n\
ldr r0, ._841 + 8\n\
ldr r0, ._841 + 8 @ 0x3dae147b\n\
str r0, [r1]\n\
ldr r0, ._841 + 12\n\
ldr r0, ._841 + 12 @ sub_8118D2C\n\
str r0, [r7, #0x1c]\n\
mov r0, #0x5\n\
strh r0, [r7, #0x30]\n\
@@ -4839,12 +4839,12 @@ void sub_8118F8C(struct Sprite *sprite)
push {r6, r7}\n\
add r6, r0, #0\n\
bl sub_8118724\n\
ldr r5, ._868\n\
ldr r5, ._868 @ 0x2019000\n\
mov r0, #0x8c\n\
add r0, r0, r5\n\
mov r8, r0\n\
ldr r0, [r0]\n\
ldr r1, ._868 + 4\n\
ldr r1, ._868 + 4 @ 0x3f000000\n\
bl __gtsf2\n\
cmp r0, #0\n\
bgt ._874 @cond_branch\n\
@@ -4857,9 +4857,9 @@ void sub_8118F8C(struct Sprite *sprite)
bne ._864 @cond_branch\n\
add r1, r5, #0\n\
add r1, r1, #0x90\n\
ldr r0, ._868 + 8\n\
ldr r0, ._868 + 8 @ 0x0\n\
str r0, [r1]\n\
ldr r1, ._868 + 12\n\
ldr r1, ._868 + 12 @ gUnknown_083F8DF4\n\
mov r9, r1\n\
ldrb r0, [r5, #0x4]\n\
lsl r7, r0, #0x1e\n\
@@ -4872,7 +4872,7 @@ void sub_8118F8C(struct Sprite *sprite)
add r5, r0, #0\n\
cmp r4, #0\n\
bge ._865 @cond_branch\n\
ldr r1, ._868 + 16\n\
ldr r1, ._868 + 16 @ 0x43800000\n\
bl __addsf3\n\
add r5, r0, #0\n\
._865:\n\
@@ -4892,11 +4892,11 @@ void sub_8118F8C(struct Sprite *sprite)
str r0, [r1]\n\
mov r0, #0x4\n\
strh r0, [r6, #0x30]\n\
ldr r0, ._868 + 20\n\
ldr r0, ._868 + 20 @ unk_2039560\n\
ldrb r0, [r0]\n\
cmp r0, #0\n\
beq ._866 @cond_branch\n\
ldr r0, ._868 + 24\n\
ldr r0, ._868 + 24 @ debug_sub_812E698\n\
str r0, [r6, #0x1c]\n\
b ._874\n\
._869:\n\
@@ -4910,7 +4910,7 @@ void sub_8118F8C(struct Sprite *sprite)
.word unk_2039560\n\
.word debug_sub_812E698+1\n\
._866:\n\
ldr r0, ._871\n\
ldr r0, ._871 @ sub_8118DE4\n\
str r0, [r6, #0x1c]\n\
b ._874\n\
._872:\n\
@@ -4921,7 +4921,7 @@ void sub_8118F8C(struct Sprite *sprite)
add r6, r5, #0\n\
add r6, r6, #0x90\n\
ldr r0, [r6]\n\
ldr r4, ._875\n\
ldr r4, ._875 @ 0x0\n\
add r1, r4, #0\n\
bl __nesf2\n\
cmp r0, #0\n\
@@ -4939,8 +4939,8 @@ void sub_8118F8C(struct Sprite *sprite)
add r4, r4, #0x98\n\
ldr r0, [r4]\n\
bl __extendsfdf2\n\
ldr r2, ._875 + 4\n\
ldr r3, ._875 + 8\n\
ldr r2, ._875 + 4 @ 0x3ff33333\n\
ldr r3, ._875 + 8 @ 0x33333333\n\
bl __divdf3\n\
bl __truncdfsf2\n\
str r0, [r4]\n\

28
src/scene/cable_car.c
View File

@@ -216,10 +216,10 @@ u8 debug_sub_8138C14(void)
{
asm("\n\
push {lr}\n\
ldr r0, ._1\n\
ldr r0, ._1 @ unk_203955C\n\
mov r1, #0x1\n\
strb r1, [r0]\n\
ldr r0, ._1 + 4\n\
ldr r0, ._1 + 4 @ MauvilleCity_GameCorner_EventScript_1C407E\n\
bl ScriptContext1_SetupScript\n\
bl CloseMenu\n\
mov r0, #0x1\n\
@@ -237,10 +237,10 @@ u8 debug_sub_8138C34(void)
{
asm("\n\
push {lr}\n\
ldr r0, ._3\n\
ldr r0, ._3 @ unk_203955C\n\
mov r1, #0x1\n\
strb r1, [r0]\n\
ldr r0, ._3 + 4\n\
ldr r0, ._3 + 4 @ MauvilleCity_GameCorner_EventScript_1C40AC\n\
bl ScriptContext1_SetupScript\n\
bl CloseMenu\n\
mov r0, #0x1\n\
@@ -258,7 +258,7 @@ u8 debug_sub_8138C54(void)
{
asm("\n\
push {r4, lr}\n\
ldr r4, ._10\n\
ldr r4, ._10 @ gMain\n\
ldrh r0, [r4, #0x2e]\n\
cmp r0, #0x40\n\
bne ._5 @cond_branch\n\
@@ -275,14 +275,14 @@ u8 debug_sub_8138C54(void)
ldrh r1, [r4, #0x2e]\n\
cmp r1, #0x1\n\
beq ._7 @cond_branch\n\
ldr r0, ._10 + 4\n\
ldr r0, ._10 + 4 @ 0x101\n\
cmp r1, r0\n\
bne ._8 @cond_branch\n\
ldr r1, ._10 + 8\n\
ldr r1, ._10 + 8 @ gSpecialVar_0x8004\n\
mov r0, #0x1\n\
strh r0, [r1]\n\
._7:\n\
ldr r4, ._10 + 12\n\
ldr r4, ._10 + 12 @ gUnkDebug4Menu\n\
bl Menu_GetCursorPos\n\
lsl r0, r0, #0x18\n\
lsr r0, r0, #0x15\n\
@@ -320,7 +320,7 @@ u8 debug_sub_8138CC4(void)
asm("\n\
push {lr}\n\
add sp, sp, #0xfffffff8\n\
ldr r1, ._14\n\
ldr r1, ._14 @ gSpecialVar_0x8004\n\
mov r0, #0x0\n\
strh r0, [r1]\n\
bl Menu_EraseScreen\n\
@@ -329,7 +329,7 @@ u8 debug_sub_8138CC4(void)
mov r2, #0x1d\n\
mov r3, #0xc\n\
bl Menu_DrawStdWindowFrame\n\
ldr r3, ._14 + 4\n\
ldr r3, ._14 + 4 @ gUnkDebug4Menu\n\
mov r0, #0x14\n\
mov r1, #0x1\n\
mov r2, #0x5\n\
@@ -343,8 +343,8 @@ u8 debug_sub_8138CC4(void)
mov r2, #0x1\n\
mov r3, #0x5\n\
bl InitMenu\n\
ldr r1, ._14 + 8\n\
ldr r0, ._14 + 12\n\
ldr r1, ._14 + 8 @ gMenuCallback\n\
ldr r0, ._14 + 12 @ debug_sub_8138C54\n\
str r0, [r1]\n\
mov r0, #0x0\n\
add sp, sp, #0x8\n\
@@ -384,7 +384,7 @@ u8 debug_sub_8138D74(void)
{
asm("\n\
push {lr}\n\
ldr r1, ._21\n\
ldr r1, ._21 @ gSpecialVar_0x8004\n\
mov r0, #0x0\n\
strh r0, [r1]\n\
bl CloseMenu\n\
@@ -402,7 +402,7 @@ u8 debug_sub_8138D8C(void)
{
asm("\n\
push {lr}\n\
ldr r1, ._23\n\
ldr r1, ._23 @ gSpecialVar_0x8004\n\
mov r0, #0x1\n\
strh r0, [r1]\n\
bl CloseMenu\n\

42
src/scene/cute_sketch.c
View File

@@ -38,8 +38,8 @@ void debug_sub_8110CCC(void)
push {r4, r5, r6, r7, lr}\n\
mov r7, #0x0\n\
mov r1, #0x0\n\
ldr r2, ._5\n\
ldr r6, ._5 + 4\n\
ldr r2, ._5 @ gUnknown_083E79C0\n\
ldr r6, ._5 + 4 @ \n\
._7:\n\
lsl r0, r1, #0x3\n\
add r4, r0, r2\n\
@@ -108,7 +108,7 @@ void debug_sub_8110CCC(void)
mov r2, #0x1d\n\
mov r3, #0x13\n\
bl Menu_DrawStdWindowFrame\n\
ldr r0, ._9\n\
ldr r0, ._9 @ \n\
mov r1, #0x11\n\
mov r2, #0x11\n\
bl Menu_PrintText\n\
@@ -133,14 +133,14 @@ void debug_sub_8110D84(void)
asm("\
push {r4, lr}\n\
add sp, sp, #0xfffffffc\n\
ldr r0, ._13\n\
ldr r0, ._13 @ \n\
ldrh r0, [r0, #0x4]\n\
cmp r0, #0x7\n\
bls ._11 @cond_branch\n\
b ._65\n\
._11:\n\
lsl r0, r0, #0x2\n\
ldr r1, ._13 + 4\n\
ldr r1, ._13 + 4 @ \n\
add r0, r0, r1\n\
ldr r0, [r0]\n\
mov pc, r0\n\
@@ -166,7 +166,7 @@ void debug_sub_8110D84(void)
mov r2, #0x10\n\
mov r3, #0x0\n\
bl BeginNormalPaletteFade\n\
ldr r1, ._25\n\
ldr r1, ._25 @ \n\
ldrh r0, [r1, #0x4]\n\
add r0, r0, #0x1\n\
b ._62\n\
@@ -181,7 +181,7 @@ void debug_sub_8110D84(void)
beq ._27 @cond_branch\n\
b ._65\n\
._27:\n\
ldr r1, ._30\n\
ldr r1, ._30 @ \n\
ldrh r0, [r1, #0x4]\n\
add r0, r0, #0x1\n\
b ._62\n\
@@ -205,7 +205,7 @@ void debug_sub_8110D84(void)
beq ._36 @cond_branch\n\
b ._65\n\
._35:\n\
ldr r4, ._41\n\
ldr r4, ._41 @ \n\
ldrb r0, [r4, #0x1e]\n\
cmp r0, #0\n\
bne ._38 @cond_branch\n\
@@ -213,11 +213,11 @@ void debug_sub_8110D84(void)
._38:\n\
mov r0, #0x5\n\
bl m4aSongNumStart\n\
ldr r1, ._41 + 4\n\
ldr r1, ._41 + 4 @ \n\
add r0, r4, r1\n\
mov r1, #0x1\n\
strb r1, [r0]\n\
ldr r0, ._41 + 8\n\
ldr r0, ._41 + 8 @ \n\
bl sub_80FC244\n\
b ._65\n\
._42:\n\
@@ -236,7 +236,7 @@ void debug_sub_8110D84(void)
mov r2, #0x0\n\
mov r3, #0x10\n\
bl BeginNormalPaletteFade\n\
ldr r1, ._44\n\
ldr r1, ._44 @ \n\
ldrh r0, [r1, #0x4]\n\
add r0, r0, #0x1\n\
b ._62\n\
@@ -249,7 +249,7 @@ void debug_sub_8110D84(void)
lsl r0, r0, #0x18\n\
cmp r0, #0\n\
bne ._65 @cond_branch\n\
ldr r0, ._48\n\
ldr r0, ._48 @ sub_805469C\n\
bl SetMainCallback2\n\
b ._65\n\
._49:\n\
@@ -265,7 +265,7 @@ void debug_sub_8110D84(void)
bl debug_sub_8110CCC\n\
b ._65\n\
._50:\n\
ldr r0, ._54\n\
ldr r0, ._54 @ gMain\n\
ldrh r1, [r0, #0x2e]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\
@@ -273,7 +273,7 @@ void debug_sub_8110D84(void)
beq ._65 @cond_branch\n\
bl sub_80FBCA0\n\
bl sub_80FAEC4\n\
ldr r1, ._54 + 4\n\
ldr r1, ._54 + 4 @ \n\
ldrh r0, [r1, #0x4]\n\
add r0, r0, #0x1\n\
b ._62\n\
@@ -290,7 +290,7 @@ void debug_sub_8110D84(void)
mov r0, #0x0\n\
mov r1, #0x0\n\
bl CreateRegionMapCursor\n\
ldr r1, ._58\n\
ldr r1, ._58 @ \n\
ldrh r0, [r1, #0x4]\n\
add r0, r0, #0x1\n\
b ._62\n\
@@ -305,7 +305,7 @@ void debug_sub_8110D84(void)
beq ._60 @cond_branch\n\
bl debug_sub_8110CCC\n\
._60:\n\
ldr r0, ._63\n\
ldr r0, ._63 @ gMain\n\
ldrh r1, [r0, #0x2e]\n\
mov r0, #0x1\n\
and r0, r0, r1\n\
@@ -313,7 +313,7 @@ void debug_sub_8110D84(void)
beq ._65 @cond_branch\n\
bl sub_80FBCA0\n\
bl sub_80FAEC4\n\
ldr r1, ._63 + 4\n\
ldr r1, ._63 + 4 @ \n\
ldrh r0, [r1, #0x4]\n\
add r0, r0, #0x1\n\
b ._62\n\
@@ -330,7 +330,7 @@ void debug_sub_8110D84(void)
mov r0, #0x0\n\
mov r1, #0x0\n\
bl CreateRegionMapCursor\n\
ldr r1, ._66\n\
ldr r1, ._66 @ \n\
mov r0, #0x3\n\
._62:\n\
strh r0, [r1, #0x4]\n\
@@ -351,13 +351,13 @@ void debug_sub_8110F28(void)
asm("\
push {lr}\n\
bl CB2_InitFlyRegionMap\n\
ldr r0, ._69\n\
ldr r0, ._69 @ gMain\n\
ldr r1, [r0, #0x4]\n\
ldr r0, ._69 + 4\n\
ldr r0, ._69 + 4 @ CB2_FlyRegionMap\n\
cmp r1, r0\n\
bne ._68 @cond_branch\n\
bl sub_80FBF94\n\
ldr r0, ._69 + 8\n\
ldr r0, ._69 + 8 @ debug_sub_8110D84\n\
bl sub_80FC244\n\
bl debug_sub_8110CCC\n\
._68:\n\