dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import pokeemerald names again

Browse Source
This commit is contained in:
sceptillion
2017-12-17 03:12:04 -08:00
parent ae3ef7fec6
commit 3ff48ec8c8
152 changed files with 2453 additions and 2453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/bag.s
+6 -6
View File
@@ -13,14 +13,14 @@ sub_810B858: @ 810B858
cmp r0, 0x3 cmp r0, 0x3
beq _0810B874 beq _0810B874
ldr r0, _0810B870 @ =gUnknown_84530C4 ldr r0, _0810B870 @ =gUnknown_84530C4
bl sub_8003B24 bl InitWindows
b _0810B87A b _0810B87A
.align 2, 0 .align 2, 0
_0810B86C: .4byte gUnknown_203ACFC _0810B86C: .4byte gUnknown_203ACFC
_0810B870: .4byte gUnknown_84530C4 _0810B870: .4byte gUnknown_84530C4
_0810B874: _0810B874:
ldr r0, _0810B8E4 @ =gUnknown_84530E4 ldr r0, _0810B8E4 @ =gUnknown_84530E4
bl sub_8003B24 bl InitWindows
_0810B87A: _0810B87A:
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
movs r0, 0 movs r0, 0
@@ -118,7 +118,7 @@ sub_810B8F0: @ 810B8F0
str r4, [sp, 0xC] str r4, [sp, 0xC]
str r2, [sp, 0x10] str r2, [sp, 0x10]
mov r2, r9 mov r2, r9
bl sub_812E5A4 bl AddTextPrinterParametrized2
add sp, 0x14 add sp, 0x14
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3
@@ -152,7 +152,7 @@ sub_810B958: @ 810B958
movs r0, 0x2 movs r0, 0x2
movs r1, 0x1 movs r1, 0x1
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
add sp, 0xC add sp, 0xC
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -213,7 +213,7 @@ sub_810B9DC: @ 810B9DC
lsls r0, 3 lsls r0, 3
ldr r1, _0810BA14 @ =gUnknown_8453104 ldr r1, _0810BA14 @ =gUnknown_8453104
adds r0, r1 adds r0, r1
bl sub_8003CE4 bl AddWindow
strb r0, [r4] strb r0, [r4]
cmp r5, 0x6 cmp r5, 0x6
beq _0810BA18 beq _0810BA18
@@ -285,7 +285,7 @@ sub_810BA70: @ 810BA70
lsls r0, r1, 3 lsls r0, r1, 3
ldr r1, _0810BA98 @ =gUnknown_8453104 ldr r1, _0810BA98 @ =gUnknown_8453104
adds r0, r1 adds r0, r1
bl sub_8003CE4 bl AddWindow
strb r0, [r4] strb r0, [r4]
_0810BA8C: _0810BA8C:
ldrb r0, [r4] ldrb r0, [r4]
asm/battle_1.s
+4 -4
View File
@@ -184,7 +184,7 @@ sub_800F324: @ 800F324
movs r2, 0x4 movs r2, 0x4
bl sub_8001658 bl sub_8001658
ldr r0, _0800F348 @ =gUnknown_8248330 ldr r0, _0800F348 @ =gUnknown_8248330
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
pop {r0} pop {r0}
bx r0 bx r0
@@ -291,8 +291,8 @@ sub_800F40C: @ 800F40C
bx r0 bx r0
thumb_func_end sub_800F40C thumb_func_end sub_800F40C
thumb_func_start sub_800F420 thumb_func_start LoadBattleTextboxAndBackground
sub_800F420: @ 800F420 LoadBattleTextboxAndBackground: @ 800F420
push {lr} push {lr}
ldr r0, _0800F454 @ =gUnknown_8D00000 ldr r0, _0800F454 @ =gUnknown_8D00000
movs r1, 0xC0 movs r1, 0xC0
@@ -317,7 +317,7 @@ sub_800F420: @ 800F420
_0800F454: .4byte gUnknown_8D00000 _0800F454: .4byte gUnknown_8D00000
_0800F458: .4byte gUnknown_8D0051C _0800F458: .4byte gUnknown_8D0051C
_0800F45C: .4byte gUnknown_8D004D8 _0800F45C: .4byte gUnknown_8D004D8
thumb_func_end sub_800F420 thumb_func_end LoadBattleTextboxAndBackground
thumb_func_start sub_800F460 thumb_func_start sub_800F460
sub_800F460: @ 800F460 sub_800F460: @ 800F460
asm/battle_2.s
+66 -66
View File
@@ -10,7 +10,7 @@ sub_800FD9C: @ 800FD9C
push {r4,lr} push {r4,lr}
bl sub_804C0A4 bl sub_804C0A4
bl sub_802E03C bl sub_802E03C
bl sub_8033DB8 bl AllocateBattleSpritesData
bl AllocateMonSpritesGfx bl AllocateMonSpritesGfx
ldr r4, _0800FDCC @ =gUnknown_2022B4C ldr r4, _0800FDCC @ =gUnknown_2022B4C
ldr r0, [r4] ldr r0, [r4]
@@ -161,7 +161,7 @@ _0800FEA6:
ldr r1, _0800FF64 @ =gUnknown_2022B50 ldr r1, _0800FF64 @ =gUnknown_2022B50
strb r0, [r1] strb r0, [r1]
bl sub_800F34C bl sub_800F34C
bl sub_800F420 bl LoadBattleTextboxAndBackground
bl ResetSpriteData bl ResetSpriteData
bl ResetTasks bl ResetTasks
bl sub_800FAE0 bl sub_800FAE0
@@ -369,7 +369,7 @@ sub_80100B8: @ 80100B8
movs r0, 0xC4 movs r0, 0xC4
lsls r0, 1 lsls r0, 1
adds r4, r5, r0 adds r4, r5, r0
bl sub_809C854 bl IsEnigmaBerryValid
cmp r0, 0x1 cmp r0, 0x1
bne _08010134 bne _08010134
movs r2, 0 movs r2, 0
@@ -477,7 +477,7 @@ sub_801017C: @ 801017C
beq _08010194 beq _08010194
b _080102C0 b _080102C0
_08010194: _08010194:
bl sub_809C854 bl IsEnigmaBerryValid
cmp r0, 0x1 cmp r0, 0x1
bne _08010250 bne _08010250
movs r5, 0 movs r5, 0
@@ -2389,7 +2389,7 @@ sub_8011100: @ 8011100
movs r2, 0 movs r2, 0
movs r3, 0x10 movs r3, 0x10
bl BeginNormalPaletteFade bl BeginNormalPaletteFade
ldr r0, _08011170 @ =sub_80111BC ldr r0, _08011170 @ =CB2_QuitRecordedBattle
bl SetMainCallback2 bl SetMainCallback2
_08011158: _08011158:
add sp, 0x4 add sp, 0x4
@@ -2400,11 +2400,11 @@ _08011160: .4byte gUnknown_30030F0
_08011164: .4byte gUnknown_2022B4C _08011164: .4byte gUnknown_2022B4C
_08011168: .4byte gUnknown_20370D0 _08011168: .4byte gUnknown_20370D0
_0801116C: .4byte gUnknown_2023E8A _0801116C: .4byte gUnknown_2023E8A
_08011170: .4byte sub_80111BC _08011170: .4byte CB2_QuitRecordedBattle
thumb_func_end sub_8011100 thumb_func_end sub_8011100
thumb_func_start sub_8011174 thumb_func_start FreeRestoreBattleData
sub_8011174: @ 8011174 FreeRestoreBattleData: @ 8011174
push {lr} push {lr}
ldr r1, _080111AC @ =gUnknown_30030F0 ldr r1, _080111AC @ =gUnknown_30030F0
ldr r0, _080111B0 @ =gUnknown_3004F80 ldr r0, _080111B0 @ =gUnknown_3004F80
@@ -2424,7 +2424,7 @@ sub_8011174: @ 8011174
movs r0, 0x53 movs r0, 0x53
bl m4aSongNumStop bl m4aSongNumStop
bl FreeMonSpritesGfx bl FreeMonSpritesGfx
bl sub_8033DF8 bl FreeBattleSpritesData
bl sub_802E138 bl sub_802E138
pop {r0} pop {r0}
bx r0 bx r0
@@ -2433,10 +2433,10 @@ _080111AC: .4byte gUnknown_30030F0
_080111B0: .4byte gUnknown_3004F80 _080111B0: .4byte gUnknown_3004F80
_080111B4: .4byte gUnknown_2039600 _080111B4: .4byte gUnknown_2039600
_080111B8: .4byte 0x00000439 _080111B8: .4byte 0x00000439
thumb_func_end sub_8011174 thumb_func_end FreeRestoreBattleData
thumb_func_start sub_80111BC thumb_func_start CB2_QuitRecordedBattle
sub_80111BC: @ 80111BC CB2_QuitRecordedBattle: @ 80111BC
push {lr} push {lr}
bl UpdatePaletteFade bl UpdatePaletteFade
ldr r0, _080111E4 @ =gUnknown_2037AB8 ldr r0, _080111E4 @ =gUnknown_2037AB8
@@ -2445,7 +2445,7 @@ sub_80111BC: @ 80111BC
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _080111DE bne _080111DE
bl sub_8011174 bl FreeRestoreBattleData
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
ldr r0, _080111E8 @ =gUnknown_30030F0 ldr r0, _080111E8 @ =gUnknown_30030F0
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
@@ -2456,7 +2456,7 @@ _080111DE:
.align 2, 0 .align 2, 0
_080111E4: .4byte gUnknown_2037AB8 _080111E4: .4byte gUnknown_2037AB8
_080111E8: .4byte gUnknown_30030F0 _080111E8: .4byte gUnknown_30030F0
thumb_func_end sub_80111BC thumb_func_end CB2_QuitRecordedBattle
thumb_func_start sub_80111EC thumb_func_start sub_80111EC
sub_80111EC: @ 80111EC sub_80111EC: @ 80111EC
@@ -3737,7 +3737,7 @@ _08011C10:
bl SetMainCallback2 bl SetMainCallback2
bl sub_812C224 bl sub_812C224
bl FreeMonSpritesGfx bl FreeMonSpritesGfx
bl sub_8033DF8 bl FreeBattleSpritesData
bl sub_802E138 bl sub_802E138
_08011C34: _08011C34:
add sp, 0x4 add sp, 0x4
@@ -4780,14 +4780,14 @@ sub_80123C0: @ 80123C0
movs r0, 0 movs r0, 0
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
ldr r1, _080123DC @ =gUnknown_3004F84 ldr r1, _080123DC @ =gUnknown_3004F84
ldr r0, _080123E0 @ =sub_8012FAC ldr r0, _080123E0 @ =BattleIntroGetMonsData
str r0, [r1] str r0, [r1]
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080123D8: .4byte gUnknown_2023E82 _080123D8: .4byte gUnknown_2023E82
_080123DC: .4byte gUnknown_3004F84 _080123DC: .4byte gUnknown_3004F84
_080123E0: .4byte sub_8012FAC _080123E0: .4byte BattleIntroGetMonsData
thumb_func_end sub_80123C0 thumb_func_end sub_80123C0
thumb_func_start sub_80123E4 thumb_func_start sub_80123E4
@@ -6259,8 +6259,8 @@ _08012FA4: .4byte gUnknown_2023FF4
_08012FA8: .4byte gUnknown_8254784 _08012FA8: .4byte gUnknown_8254784
thumb_func_end sub_8012BC8 thumb_func_end sub_8012BC8
thumb_func_start sub_8012FAC thumb_func_start BattleIntroGetMonsData
sub_8012FAC: @ 8012FAC BattleIntroGetMonsData: @ 8012FAC
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, _08012FBC @ =gUnknown_2023E82 ldr r5, _08012FBC @ =gUnknown_2023E82
ldrb r0, [r5] ldrb r0, [r5]
@@ -6302,24 +6302,24 @@ _08012FE4:
cmp r0, r1 cmp r0, r1
bne _08013018 bne _08013018
ldr r1, _08013010 @ =gUnknown_3004F84 ldr r1, _08013010 @ =gUnknown_3004F84
ldr r0, _08013014 @ =sub_8013020 ldr r0, _08013014 @ =BattleIntroPrepareBackgroundSlide
str r0, [r1] str r0, [r1]
b _0801301A b _0801301A
.align 2, 0 .align 2, 0
_08013008: .4byte gUnknown_2023BC8 _08013008: .4byte gUnknown_2023BC8
_0801300C: .4byte gUnknown_2023BCC _0801300C: .4byte gUnknown_2023BCC
_08013010: .4byte gUnknown_3004F84 _08013010: .4byte gUnknown_3004F84
_08013014: .4byte sub_8013020 _08013014: .4byte BattleIntroPrepareBackgroundSlide
_08013018: _08013018:
strb r2, [r5] strb r2, [r5]
_0801301A: _0801301A:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8012FAC thumb_func_end BattleIntroGetMonsData
thumb_func_start sub_8013020 thumb_func_start BattleIntroPrepareBackgroundSlide
sub_8013020: @ 8013020 BattleIntroPrepareBackgroundSlide: @ 8013020
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, _08013058 @ =gUnknown_2023BC8 ldr r0, _08013058 @ =gUnknown_2023BC8
ldr r5, [r0] ldr r5, [r0]
@@ -6352,7 +6352,7 @@ _08013060: .4byte gUnknown_2022B50
_08013064: .4byte gUnknown_3004F84 _08013064: .4byte gUnknown_3004F84
_08013068: .4byte sub_8013070 _08013068: .4byte sub_8013070
_0801306C: .4byte gUnknown_2023E82 _0801306C: .4byte gUnknown_2023E82
thumb_func_end sub_8013020 thumb_func_end BattleIntroPrepareBackgroundSlide
thumb_func_start sub_8013070 thumb_func_start sub_8013070
sub_8013070: @ 8013070 sub_8013070: @ 8013070
@@ -6674,7 +6674,7 @@ _080132F8:
b _080130A0 b _080130A0
_0801330E: _0801330E:
ldr r1, _08013334 @ =gUnknown_3004F84 ldr r1, _08013334 @ =gUnknown_3004F84
ldr r0, _08013338 @ =sub_801333C ldr r0, _08013338 @ =BattleIntroDrawPartySummaryScreens
str r0, [r1] str r0, [r1]
_08013314: _08013314:
pop {r3-r5} pop {r3-r5}
@@ -6690,11 +6690,11 @@ _08013328: .4byte gUnknown_2022B4C
_0801332C: .4byte gUnknown_2023BC4 _0801332C: .4byte gUnknown_2023BC4
_08013330: .4byte gUnknown_2023BCC _08013330: .4byte gUnknown_2023BCC
_08013334: .4byte gUnknown_3004F84 _08013334: .4byte gUnknown_3004F84
_08013338: .4byte sub_801333C _08013338: .4byte BattleIntroDrawPartySummaryScreens
thumb_func_end sub_8013070 thumb_func_end sub_8013070
thumb_func_start sub_801333C thumb_func_start BattleIntroDrawPartySummaryScreens
sub_801333C: @ 801333C BattleIntroDrawPartySummaryScreens: @ 801333C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -6827,12 +6827,12 @@ _0801342E:
ldrb r0, [r4] ldrb r0, [r4]
bl MarkBufferBankForExecution bl MarkBufferBankForExecution
ldr r1, _08013460 @ =gUnknown_3004F84 ldr r1, _08013460 @ =gUnknown_3004F84
ldr r0, _08013464 @ =sub_80134DC ldr r0, _08013464 @ =BattleIntroPrintTrainerWantsToBattle
b _080134C6 b _080134C6
.align 2, 0 .align 2, 0
_0801345C: .4byte gUnknown_2023BC4 _0801345C: .4byte gUnknown_2023BC4
_08013460: .4byte gUnknown_3004F84 _08013460: .4byte gUnknown_3004F84
_08013464: .4byte sub_80134DC _08013464: .4byte BattleIntroPrintTrainerWantsToBattle
_08013468: _08013468:
movs r7, 0 movs r7, 0
add r6, sp, 0x4 add r6, sp, 0x4
@@ -6892,10 +6892,10 @@ _080134C8:
.align 2, 0 .align 2, 0
_080134D4: .4byte gUnknown_3004F84 _080134D4: .4byte gUnknown_3004F84
_080134D8: .4byte sub_8013514 _080134D8: .4byte sub_8013514
thumb_func_end sub_801333C thumb_func_end BattleIntroDrawPartySummaryScreens
thumb_func_start sub_80134DC thumb_func_start BattleIntroPrintTrainerWantsToBattle
sub_80134DC: @ 80134DC BattleIntroPrintTrainerWantsToBattle: @ 80134DC
push {lr} push {lr}
ldr r0, _08013504 @ =gUnknown_2023BC8 ldr r0, _08013504 @ =gUnknown_2023BC8
ldr r0, [r0] ldr r0, [r0]
@@ -6919,7 +6919,7 @@ _08013504: .4byte gUnknown_2023BC8
_08013508: .4byte gUnknown_2023BC4 _08013508: .4byte gUnknown_2023BC4
_0801350C: .4byte gUnknown_3004F84 _0801350C: .4byte gUnknown_3004F84
_08013510: .4byte sub_8013568 _08013510: .4byte sub_8013568
thumb_func_end sub_80134DC thumb_func_end BattleIntroPrintTrainerWantsToBattle
thumb_func_start sub_8013514 thumb_func_start sub_8013514
sub_8013514: @ 8013514 sub_8013514: @ 8013514
@@ -6946,7 +6946,7 @@ sub_8013514: @ 8013514
ldr r1, _08013560 @ =gUnknown_2023FC4 ldr r1, _08013560 @ =gUnknown_2023FC4
strb r0, [r1, 0x17] strb r0, [r1, 0x17]
ldr r0, _08013564 @ =gUnknown_81D91A1 ldr r0, _08013564 @ =gUnknown_81D91A1
bl sub_801BBE4 bl BattleScriptExecute
_0801354A: _0801354A:
pop {r0} pop {r0}
bx r0 bx r0
@@ -7388,7 +7388,7 @@ _080138C0:
ldrb r1, [r1] ldrb r1, [r1]
movs r2, 0x1 movs r2, 0x1
str r3, [sp, 0x4] str r3, [sp, 0x4]
bl sub_8014CD8 bl GetWhoStrikesFirst
lsls r0, 24 lsls r0, 24
ldr r3, [sp, 0x4] ldr r3, [sp, 0x4]
cmp r0, 0 cmp r0, 0
@@ -7396,7 +7396,7 @@ _080138C0:
lsls r1, r4, 24 lsls r1, r4, 24
lsrs r1, 24 lsrs r1, 24
lsrs r0, r7, 24 lsrs r0, r7, 24
bl sub_8014CA4 bl SwapTurnOrder
ldr r3, [sp, 0x4] ldr r3, [sp, 0x4]
_080138E4: _080138E4:
adds r4, 0x1 adds r4, 0x1
@@ -7799,7 +7799,7 @@ _08013BF8:
beq _08013C04 beq _08013C04
b _08013D20 b _08013D20
_08013C04: _08013C04:
bl sub_8018F90 bl HandleFaintedMonActions
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -7950,8 +7950,8 @@ _08013D4C: .4byte gUnknown_2023DC4
_08013D50: .4byte gUnknown_2023E80 _08013D50: .4byte gUnknown_2023E80
thumb_func_end sub_8013BD4 thumb_func_end sub_8013BD4
thumb_func_start sub_8013D54 thumb_func_start IsRunningFromBattleImpossible
sub_8013D54: @ 8013D54 IsRunningFromBattleImpossible: @ 8013D54
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
ldr r1, _08013D78 @ =gUnknown_2023BE4 ldr r1, _08013D78 @ =gUnknown_2023BE4
@@ -8216,7 +8216,7 @@ _08013F5E:
bx r1 bx r1
.align 2, 0 .align 2, 0
_08013F68: .4byte gUnknown_2023E82 _08013F68: .4byte gUnknown_2023E82
thumb_func_end sub_8013D54 thumb_func_end IsRunningFromBattleImpossible
thumb_func_start sub_8013F6C thumb_func_start sub_8013F6C
sub_8013F6C: @ 8013F6C sub_8013F6C: @ 8013F6C
@@ -9096,7 +9096,7 @@ _080146AC:
cmp r0, 0x3 cmp r0, 0x3
bne _080146EC bne _080146EC
ldr r0, _080146E4 @ =gUnknown_81D8924 ldr r0, _080146E4 @ =gUnknown_81D8924
bl sub_801BBE4 bl BattleScriptExecute
ldr r1, _080146E8 @ =gUnknown_2023E82 ldr r1, _080146E8 @ =gUnknown_2023E82
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r1 adds r0, r1
@@ -9108,7 +9108,7 @@ _080146E0: .4byte gUnknown_2023BC4
_080146E4: .4byte gUnknown_81D8924 _080146E4: .4byte gUnknown_81D8924
_080146E8: .4byte gUnknown_2023E82 _080146E8: .4byte gUnknown_2023E82
_080146EC: _080146EC:
bl sub_8013D54 bl IsRunningFromBattleImpossible
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08014750 beq _08014750
@@ -9798,8 +9798,8 @@ _08014C9C: .4byte gUnknown_3004F84
_08014CA0: .4byte sub_80150A8 _08014CA0: .4byte sub_80150A8
thumb_func_end sub_8014040 thumb_func_end sub_8014040
thumb_func_start sub_8014CA4 thumb_func_start SwapTurnOrder
sub_8014CA4: @ 8014CA4 SwapTurnOrder: @ 8014CA4
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -9825,10 +9825,10 @@ sub_8014CA4: @ 8014CA4
.align 2, 0 .align 2, 0
_08014CD0: .4byte gUnknown_2023BDA _08014CD0: .4byte gUnknown_2023BDA
_08014CD4: .4byte gUnknown_2023BDE _08014CD4: .4byte gUnknown_2023BDE
thumb_func_end sub_8014CA4 thumb_func_end SwapTurnOrder
thumb_func_start sub_8014CD8 thumb_func_start GetWhoStrikesFirst
sub_8014CD8: @ 8014CD8 GetWhoStrikesFirst: @ 8014CD8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -10314,7 +10314,7 @@ _08015096:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8014CD8 thumb_func_end GetWhoStrikesFirst
thumb_func_start sub_80150A8 thumb_func_start sub_80150A8
sub_80150A8: @ 80150A8 sub_80150A8: @ 80150A8
@@ -10593,7 +10593,7 @@ _080152A8:
beq _080152E4 beq _080152E4
adds r0, r3, 0 adds r0, r3, 0
movs r2, 0 movs r2, 0
bl sub_8014CD8 bl GetWhoStrikesFirst
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080152E4 beq _080152E4
@@ -10601,7 +10601,7 @@ _080152A8:
lsrs r1, 24 lsrs r1, 24
mov r3, r8 mov r3, r8
lsrs r0, r3, 24 lsrs r0, r3, 24
bl sub_8014CA4 bl SwapTurnOrder
_080152E4: _080152E4:
adds r4, 0x1 adds r4, 0x1
ldr r0, _08015320 @ =gUnknown_2023BCC ldr r0, _08015320 @ =gUnknown_2023BCC
@@ -10901,7 +10901,7 @@ _080154CC:
cmp r0, 0 cmp r0, 0
blt _08015550 blt _08015550
ldr r0, _0801554C @ =gUnknown_81D9015 ldr r0, _0801554C @ =gUnknown_81D9015
bl sub_801BBE4 bl BattleScriptExecute
b _08015598 b _08015598
.align 2, 0 .align 2, 0
_08015528: .4byte gUnknown_2023DD0 _08015528: .4byte gUnknown_2023DD0
@@ -10923,7 +10923,7 @@ _08015550:
cmp r0, r1 cmp r0, r1
bcc _080154CC bcc _080154CC
_0801555E: _0801555E:
bl sub_8019284 bl TryClearRageStatuses
ldr r1, _080155A0 @ =gUnknown_2023BE2 ldr r1, _080155A0 @ =gUnknown_2023BE2
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
@@ -11502,14 +11502,14 @@ sub_8015A30: @ 8015A30
beq _08015A6C beq _08015A6C
_08015A52: _08015A52:
ldr r1, _08015A64 @ =gUnknown_3004F84 ldr r1, _08015A64 @ =gUnknown_3004F84
ldr r0, _08015A68 @ =sub_8015B58 ldr r0, _08015A68 @ =ReturnFromBattleToOverworld
b _08015A70 b _08015A70
.align 2, 0 .align 2, 0
_08015A58: .4byte gUnknown_2037AB8 _08015A58: .4byte gUnknown_2037AB8
_08015A5C: .4byte gUnknown_3004FD4 _08015A5C: .4byte gUnknown_3004FD4
_08015A60: .4byte gUnknown_2023E8A _08015A60: .4byte gUnknown_2023E8A
_08015A64: .4byte gUnknown_3004F84 _08015A64: .4byte gUnknown_3004F84
_08015A68: .4byte sub_8015B58 _08015A68: .4byte ReturnFromBattleToOverworld
_08015A6C: _08015A6C:
ldr r1, _08015A94 @ =gUnknown_3004F84 ldr r1, _08015A94 @ =gUnknown_3004F84
ldr r0, _08015A98 @ =sub_8015AA0 ldr r0, _08015A98 @ =sub_8015AA0
@@ -11523,7 +11523,7 @@ _08015A70:
cmp r0, 0 cmp r0, 0
bne _08015A8E bne _08015A8E
bl FreeMonSpritesGfx bl FreeMonSpritesGfx
bl sub_8033DF8 bl FreeBattleSpritesData
bl sub_802E138 bl sub_802E138
_08015A8E: _08015A8E:
pop {r0} pop {r0}
@@ -11594,7 +11594,7 @@ _08015B08:
bne _08015AAC bne _08015AAC
_08015B16: _08015B16:
ldr r1, _08015B28 @ =gUnknown_3004F84 ldr r1, _08015B28 @ =gUnknown_3004F84
ldr r0, _08015B2C @ =sub_8015B58 ldr r0, _08015B2C @ =ReturnFromBattleToOverworld
str r0, [r1] str r0, [r1]
_08015B1C: _08015B1C:
pop {r4,r5} pop {r4,r5}
@@ -11603,7 +11603,7 @@ _08015B1C:
.align 2, 0 .align 2, 0
_08015B24: .4byte gUnknown_3004FD4 _08015B24: .4byte gUnknown_3004FD4
_08015B28: .4byte gUnknown_3004F84 _08015B28: .4byte gUnknown_3004F84
_08015B2C: .4byte sub_8015B58 _08015B2C: .4byte ReturnFromBattleToOverworld
thumb_func_end sub_8015AA0 thumb_func_end sub_8015AA0
thumb_func_start sub_8015B30 thumb_func_start sub_8015B30
@@ -11627,8 +11627,8 @@ _08015B50: .4byte gUnknown_3004F84
_08015B54: .4byte sub_8015AA0 _08015B54: .4byte sub_8015AA0
thumb_func_end sub_8015B30 thumb_func_end sub_8015B30
thumb_func_start sub_8015B58 thumb_func_start ReturnFromBattleToOverworld
sub_8015B58: @ 8015B58 ReturnFromBattleToOverworld: @ 8015B58
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, _08015BDC @ =gUnknown_2022B4C ldr r6, _08015BDC @ =gUnknown_2022B4C
ldr r0, [r6] ldr r0, [r6]
@@ -11703,10 +11703,10 @@ _08015BF0: .4byte gUnknown_30030F0
_08015BF4: .4byte 0x00000439 _08015BF4: .4byte 0x00000439
_08015BF8: .4byte gUnknown_3004F80 _08015BF8: .4byte gUnknown_3004F80
_08015BFC: .4byte gUnknown_202402C _08015BFC: .4byte gUnknown_202402C
thumb_func_end sub_8015B58 thumb_func_end ReturnFromBattleToOverworld
thumb_func_start sub_8015C00 thumb_func_start RunBattleScriptCommands_PopCallbacksStack
sub_8015C00: @ 8015C00 RunBattleScriptCommands_PopCallbacksStack: @ 8015C00
push {lr} push {lr}
ldr r0, _08015C3C @ =gUnknown_2023BE3 ldr r0, _08015C3C @ =gUnknown_2023BE3
ldrb r0, [r0] ldrb r0, [r0]
@@ -11761,7 +11761,7 @@ _08015C62:
_08015C68: .4byte gUnknown_2023BC8 _08015C68: .4byte gUnknown_2023BC8
_08015C6C: .4byte gUnknown_825011C _08015C6C: .4byte gUnknown_825011C
_08015C70: .4byte gUnknown_2023D74 _08015C70: .4byte gUnknown_2023D74
thumb_func_end sub_8015C00 thumb_func_end RunBattleScriptCommands_PopCallbacksStack
thumb_func_start sub_8015C74 thumb_func_start sub_8015C74
sub_8015C74: @ 8015C74 sub_8015C74: @ 8015C74
@@ -13760,7 +13760,7 @@ _08016D10: .4byte gUnknown_2023BDA
thumb_func_start HandleAction_Action11 thumb_func_start HandleAction_Action11
HandleAction_Action11: @ 8016D14 HandleAction_Action11: @ 8016D14
push {lr} push {lr}
bl sub_8018F90 bl HandleFaintedMonActions
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
asm/battle_ai_script_commands.s
+14 -14
View File
@@ -2899,7 +2899,7 @@ sub_80C8238: @ 80C8238
ldr r1, _080C8274 @ =gUnknown_2023D6C ldr r1, _080C8274 @ =gUnknown_2023D6C
ldrb r1, [r1] ldrb r1, [r1]
movs r2, 0x1 movs r2, 0x1
bl sub_8014CD8 bl GetWhoStrikesFirst
ldr r3, _080C8278 @ =gUnknown_2039A00 ldr r3, _080C8278 @ =gUnknown_2039A00
ldr r2, [r3] ldr r2, [r3]
lsls r0, 24 lsls r0, 24
@@ -2939,7 +2939,7 @@ sub_80C8284: @ 80C8284
ldr r1, _080C82C0 @ =gUnknown_2023D6C ldr r1, _080C82C0 @ =gUnknown_2023D6C
ldrb r1, [r1] ldrb r1, [r1]
movs r2, 0x1 movs r2, 0x1
bl sub_8014CD8 bl GetWhoStrikesFirst
ldr r3, _080C82C4 @ =gUnknown_2039A00 ldr r3, _080C82C4 @ =gUnknown_2039A00
ldr r2, [r3] ldr r2, [r3]
lsls r0, 24 lsls r0, 24
@@ -3289,8 +3289,8 @@ _080C852C: .4byte gUnknown_2023BE4
_080C8530: .4byte gUnknown_2039A00 _080C8530: .4byte gUnknown_2039A00
thumb_func_end sub_80C841C thumb_func_end sub_80C841C
thumb_func_start sub_80C8534 thumb_func_start BattleAICmd_get_highest_type_effectiveness
sub_80C8534: @ 80C8534 BattleAICmd_get_highest_type_effectiveness: @ 80C8534
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -3404,10 +3404,10 @@ _080C8610: .4byte gUnknown_2023BF0
_080C8614: .4byte gUnknown_2023D6B _080C8614: .4byte gUnknown_2023D6B
_080C8618: .4byte gUnknown_2023D6C _080C8618: .4byte gUnknown_2023D6C
_080C861C: .4byte gUnknown_2039A00 _080C861C: .4byte gUnknown_2039A00
thumb_func_end sub_80C8534 thumb_func_end BattleAICmd_get_highest_type_effectiveness
thumb_func_start sub_80C8620 thumb_func_start BattleAICmd_if_type_effectiveness
sub_80C8620: @ 80C8620 BattleAICmd_if_type_effectiveness: @ 80C8620
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, _080C86B8 @ =gUnknown_2023F50 ldr r0, _080C86B8 @ =gUnknown_2023F50
movs r1, 0 movs r1, 0
@@ -3506,7 +3506,7 @@ _080C86E8:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80C8620 thumb_func_end BattleAICmd_if_type_effectiveness
thumb_func_start nullsub_66 thumb_func_start nullsub_66
nullsub_66: @ 80C86F0 nullsub_66: @ 80C86F0
@@ -5042,8 +5042,8 @@ _080C9244:
_080C924C: .4byte gUnknown_2039A00 _080C924C: .4byte gUnknown_2039A00
thumb_func_end sub_80C91B4 thumb_func_end sub_80C91B4
thumb_func_start sub_80C9250 thumb_func_start BattleAICmd_watch
sub_80C9250: @ 80C9250 BattleAICmd_watch: @ 80C9250
ldr r0, _080C9260 @ =gUnknown_2023FF4 ldr r0, _080C9260 @ =gUnknown_2023FF4
ldr r0, [r0] ldr r0, [r0]
ldr r2, [r0, 0x14] ldr r2, [r0, 0x14]
@@ -5054,10 +5054,10 @@ sub_80C9250: @ 80C9250
bx lr bx lr
.align 2, 0 .align 2, 0
_080C9260: .4byte gUnknown_2023FF4 _080C9260: .4byte gUnknown_2023FF4
thumb_func_end sub_80C9250 thumb_func_end BattleAICmd_watch
thumb_func_start sub_80C9264 thumb_func_start BattleAICmd_get_hold_effect
sub_80C9264: @ 80C9264 BattleAICmd_get_hold_effect: @ 80C9264
push {r4,lr} push {r4,lr}
ldr r0, _080C9274 @ =gUnknown_2039A00 ldr r0, _080C9274 @ =gUnknown_2039A00
ldr r0, [r0] ldr r0, [r0]
@@ -5119,7 +5119,7 @@ _080C92CA:
_080C92D8: .4byte gUnknown_2023BE4 _080C92D8: .4byte gUnknown_2023BE4
_080C92DC: .4byte gUnknown_2023FF4 _080C92DC: .4byte gUnknown_2023FF4
_080C92E0: .4byte gUnknown_2039A00 _080C92E0: .4byte gUnknown_2039A00
thumb_func_end sub_80C9264 thumb_func_end BattleAICmd_get_hold_effect
thumb_func_start BattleAICmd_get_gender thumb_func_start BattleAICmd_get_gender
BattleAICmd_get_gender: @ 80C92E4 BattleAICmd_get_gender: @ 80C92E4
asm/battle_ai_switch_items.s
+4 -4
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_8039188 thumb_func_start ShouldSwitchIfPerishSong
sub_8039188: @ 8039188 ShouldSwitchIfPerishSong: @ 8039188
push {lr} push {lr}
ldr r1, _080391D4 @ =gUnknown_2023DFC ldr r1, _080391D4 @ =gUnknown_2023DFC
ldr r0, _080391D8 @ =gUnknown_2023BC4 ldr r0, _080391D8 @ =gUnknown_2023BC4
@@ -53,7 +53,7 @@ _080391E4:
_080391E6: _080391E6:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8039188 thumb_func_end ShouldSwitchIfPerishSong
thumb_func_start sub_80391EC thumb_func_start sub_80391EC
sub_80391EC: @ 80391EC sub_80391EC: @ 80391EC
@@ -1323,7 +1323,7 @@ _08039BFA:
mov r0, r8 mov r0, r8
cmp r0, 0 cmp r0, 0
beq _08039C74 beq _08039C74
bl sub_8039188 bl ShouldSwitchIfPerishSong
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08039C60 bne _08039C60
asm/battle_anim.s
+22 -22
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_80724C0 thumb_func_start ClearBattleAnimationVars
sub_80724C0: @ 80724C0 ClearBattleAnimationVars: @ 80724C0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -102,10 +102,10 @@ _0807258C: .4byte gUnknown_2037F24
_08072590: .4byte 0x0000ffff _08072590: .4byte 0x0000ffff
_08072594: .4byte gUnknown_2037EEE _08072594: .4byte gUnknown_2037EEE
_08072598: .4byte gUnknown_2037F02 _08072598: .4byte gUnknown_2037F02
thumb_func_end sub_80724C0 thumb_func_end ClearBattleAnimationVars
thumb_func_start sub_807259C thumb_func_start DoMoveAnim
sub_807259C: @ 807259C DoMoveAnim: @ 807259C
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
@@ -129,7 +129,7 @@ _080725C4: .4byte gUnknown_2023D6B
_080725C8: .4byte gUnknown_2037F1B _080725C8: .4byte gUnknown_2037F1B
_080725CC: .4byte gUnknown_2023D6C _080725CC: .4byte gUnknown_2023D6C
_080725D0: .4byte gUnknown_81C68F4 _080725D0: .4byte gUnknown_81C68F4
thumb_func_end sub_807259C thumb_func_end DoMoveAnim
thumb_func_start sub_80725D4 thumb_func_start sub_80725D4
sub_80725D4: @ 80725D4 sub_80725D4: @ 80725D4
@@ -1011,7 +1011,7 @@ _08072C88:
ldr r0, _08072CDC @ =gUnknown_2023D44 ldr r0, _08072CDC @ =gUnknown_2023D44
adds r0, r5, r0 adds r0, r5, r0
ldrb r4, [r0] ldrb r4, [r0]
ldr r0, _08072CE0 @ =sub_8073174 ldr r0, _08072CE0 @ =task_pA_ma0A_obj_to_bg_pal
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
lsls r0, 24 lsls r0, 24
@@ -1045,7 +1045,7 @@ _08072C88:
.align 2, 0 .align 2, 0
_08072CD8: .4byte gUnknown_2037F1B _08072CD8: .4byte gUnknown_2037F1B
_08072CDC: .4byte gUnknown_2023D44 _08072CDC: .4byte gUnknown_2023D44
_08072CE0: .4byte sub_8073174 _08072CE0: .4byte task_pA_ma0A_obj_to_bg_pal
_08072CE4: .4byte gUnknown_3005090 _08072CE4: .4byte gUnknown_3005090
_08072CE8: .4byte gUnknown_202063C _08072CE8: .4byte gUnknown_202063C
_08072CEC: .4byte gUnknown_2022978 _08072CEC: .4byte gUnknown_2022978
@@ -1095,7 +1095,7 @@ _08072D3E:
ldr r0, _08072D9C @ =gUnknown_2023D44 ldr r0, _08072D9C @ =gUnknown_2023D44
adds r0, r5, r0 adds r0, r5, r0
ldrb r4, [r0] ldrb r4, [r0]
ldr r0, _08072DA0 @ =sub_8073174 ldr r0, _08072DA0 @ =task_pA_ma0A_obj_to_bg_pal
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
lsls r0, 24 lsls r0, 24
@@ -1132,7 +1132,7 @@ _08072D90: .4byte gUnknown_202297E
_08072D94: .4byte gUnknown_3005090 _08072D94: .4byte gUnknown_3005090
_08072D98: .4byte gUnknown_2037F14 _08072D98: .4byte gUnknown_2037F14
_08072D9C: .4byte gUnknown_2023D44 _08072D9C: .4byte gUnknown_2023D44
_08072DA0: .4byte sub_8073174 _08072DA0: .4byte task_pA_ma0A_obj_to_bg_pal
_08072DA4: .4byte gUnknown_202063C _08072DA4: .4byte gUnknown_202063C
_08072DA8: .4byte gUnknown_2022978 _08072DA8: .4byte gUnknown_2022978
_08072DAC: .4byte gUnknown_202297A _08072DAC: .4byte gUnknown_202297A
@@ -1589,8 +1589,8 @@ _0807316C: .4byte gUnknown_202297C
_08073170: .4byte gUnknown_202297E _08073170: .4byte gUnknown_202297E
thumb_func_end sub_8073128 thumb_func_end sub_8073128
thumb_func_start sub_8073174 thumb_func_start task_pA_ma0A_obj_to_bg_pal
sub_8073174: @ 8073174 task_pA_ma0A_obj_to_bg_pal: @ 8073174
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x10 sub sp, 0x10
lsls r0, 24 lsls r0, 24
@@ -1688,10 +1688,10 @@ _0807323C: .4byte gUnknown_202297C
_08073240: .4byte gUnknown_202297E _08073240: .4byte gUnknown_202297E
_08073244: .4byte gUnknown_20377F8 _08073244: .4byte gUnknown_20377F8
_08073248: .4byte 0x04000008 _08073248: .4byte 0x04000008
thumb_func_end sub_8073174 thumb_func_end task_pA_ma0A_obj_to_bg_pal
thumb_func_start sub_807324C thumb_func_start ScriptCmd_clearmonbg
sub_807324C: @ 807324C ScriptCmd_clearmonbg: @ 807324C
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, _08073260 @ =gUnknown_2037ED4 ldr r0, _08073260 @ =gUnknown_2037ED4
ldr r2, [r0] ldr r2, [r0]
@@ -1796,7 +1796,7 @@ _080732E6:
_08073310: .4byte sub_807331C _08073310: .4byte sub_807331C
_08073314: .4byte gUnknown_3005090 _08073314: .4byte gUnknown_3005090
_08073318: .4byte gUnknown_2037ED4 _08073318: .4byte gUnknown_2037ED4
thumb_func_end sub_807324C thumb_func_end ScriptCmd_clearmonbg
thumb_func_start sub_807331C thumb_func_start sub_807331C
sub_807331C: @ 807331C sub_807331C: @ 807331C
@@ -3867,8 +3867,8 @@ _0807429E:
bx r0 bx r0
thumb_func_end sub_807423C thumb_func_end sub_807423C
thumb_func_start sub_80742A4 thumb_func_start ScriptCmd_invisible
sub_80742A4: @ 80742A4 ScriptCmd_invisible: @ 80742A4
push {r4,lr} push {r4,lr}
ldr r4, _080742D8 @ =gUnknown_2037ED4 ldr r4, _080742D8 @ =gUnknown_2037ED4
ldr r0, [r4] ldr r0, [r4]
@@ -3898,10 +3898,10 @@ _080742CC:
.align 2, 0 .align 2, 0
_080742D8: .4byte gUnknown_2037ED4 _080742D8: .4byte gUnknown_2037ED4
_080742DC: .4byte gUnknown_202063C _080742DC: .4byte gUnknown_202063C
thumb_func_end sub_80742A4 thumb_func_end ScriptCmd_invisible
thumb_func_start sub_80742E0 thumb_func_start ScriptCmd_visible
sub_80742E0: @ 80742E0 ScriptCmd_visible: @ 80742E0
push {r4,lr} push {r4,lr}
ldr r4, _08074318 @ =gUnknown_2037ED4 ldr r4, _08074318 @ =gUnknown_2037ED4
ldr r0, [r4] ldr r0, [r4]
@@ -3932,7 +3932,7 @@ _0807430A:
.align 2, 0 .align 2, 0
_08074318: .4byte gUnknown_2037ED4 _08074318: .4byte gUnknown_2037ED4
_0807431C: .4byte gUnknown_202063C _0807431C: .4byte gUnknown_202063C
thumb_func_end sub_80742E0 thumb_func_end ScriptCmd_visible
thumb_func_start sub_8074320 thumb_func_start sub_8074320
sub_8074320: @ 8074320 sub_8074320: @ 8074320
asm/battle_anim_8074480.s
+6 -6
View File
@@ -545,8 +545,8 @@ _0807489E:
bx r1 bx r1
thumb_func_end sub_8074844 thumb_func_end sub_8074844
thumb_func_start sub_80748A8 thumb_func_start GetBankSpriteDefault_Y
sub_80748A8: @ 80748A8 GetBankSpriteDefault_Y: @ 80748A8
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -556,10 +556,10 @@ sub_80748A8: @ 80748A8
lsrs r0, 24 lsrs r0, 24
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80748A8 thumb_func_end GetBankSpriteDefault_Y
thumb_func_start sub_80748BC thumb_func_start GetSubstituteSpriteDefault_Y
sub_80748BC: @ 80748BC GetSubstituteSpriteDefault_Y: @ 80748BC
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -592,7 +592,7 @@ _080748F0:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80748BC thumb_func_end GetSubstituteSpriteDefault_Y
thumb_func_start sub_8074900 thumb_func_start sub_8074900
sub_8074900: @ 8074900 sub_8074900: @ 8074900
asm/battle_controller_link_opponent.s
+18 -18
View File
@@ -929,7 +929,7 @@ _0803ADD4: .4byte gUnknown_3004FF0
CompleteOnInactiveTextPrinter_5: @ 803ADD8 CompleteOnInactiveTextPrinter_5: @ 803ADD8
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _0803ADEA bne _0803ADEA
@@ -3586,7 +3586,7 @@ sub_803C3B4: @ 803C3B4
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
ldrb r0, [r6] ldrb r0, [r6]
bl sub_80748A8 bl GetBankSpriteDefault_Y
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -3790,7 +3790,7 @@ sub_803C550: @ 803C550
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_80748A8 bl GetBankSpriteDefault_Y
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -4609,8 +4609,8 @@ sub_803CC88: @ 803CC88
bx r0 bx r0
thumb_func_end sub_803CC88 thumb_func_end sub_803CC88
thumb_func_start sub_803CC94 thumb_func_start RecordedOpponentHandleMoveAnimation
sub_803CC94: @ 803CC94 RecordedOpponentHandleMoveAnimation: @ 803CC94
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, _0803CD78 @ =gUnknown_2023BC4 ldr r6, _0803CD78 @ =gUnknown_2023BC4
ldrb r0, [r6] ldrb r0, [r6]
@@ -4746,7 +4746,7 @@ _0803CD9C:
ldrb r0, [r6] ldrb r0, [r6]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
ldr r1, _0803CDC8 @ =sub_803CDCC ldr r1, _0803CDC8 @ =RecordedOpponentDoMoveAnimation
str r1, [r0] str r1, [r0]
_0803CDBA: _0803CDBA:
pop {r4-r6} pop {r4-r6}
@@ -4755,11 +4755,11 @@ _0803CDBA:
.align 2, 0 .align 2, 0
_0803CDC0: .4byte gUnknown_2024018 _0803CDC0: .4byte gUnknown_2024018
_0803CDC4: .4byte gUnknown_3004FE0 _0803CDC4: .4byte gUnknown_3004FE0
_0803CDC8: .4byte sub_803CDCC _0803CDC8: .4byte RecordedOpponentDoMoveAnimation
thumb_func_end sub_803CC94 thumb_func_end RecordedOpponentHandleMoveAnimation
thumb_func_start sub_803CDCC thumb_func_start RecordedOpponentDoMoveAnimation
sub_803CDCC: @ 803CDCC RecordedOpponentDoMoveAnimation: @ 803CDCC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -4845,7 +4845,7 @@ _0803CE64:
movs r0, 0 movs r0, 0
bl sub_8035450 bl sub_8035450
adds r0, r4, 0 adds r0, r4, 0
bl sub_807259C bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -4947,7 +4947,7 @@ _0803CF40:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_803CDCC thumb_func_end RecordedOpponentDoMoveAnimation
thumb_func_start sub_803CF50 thumb_func_start sub_803CF50
sub_803CF50: @ 803CF50 sub_803CF50: @ 803CF50
@@ -5555,8 +5555,8 @@ _0803D3DC: .4byte gUnknown_2022BC4
_0803D3E0: .4byte gUnknown_2023BC4 _0803D3E0: .4byte gUnknown_2023BC4
thumb_func_end sub_803D3B4 thumb_func_end sub_803D3B4
thumb_func_start sub_803D3E4 thumb_func_start RecordedOpponentHandleFaintingCry
sub_803D3E4: @ 803D3E4 RecordedOpponentHandleFaintingCry: @ 803D3E4
push {lr} push {lr}
ldr r1, _0803D414 @ =gUnknown_2023BCE ldr r1, _0803D414 @ =gUnknown_2023BCE
ldr r0, _0803D418 @ =gUnknown_2023BC4 ldr r0, _0803D418 @ =gUnknown_2023BC4
@@ -5582,10 +5582,10 @@ sub_803D3E4: @ 803D3E4
_0803D414: .4byte gUnknown_2023BCE _0803D414: .4byte gUnknown_2023BCE
_0803D418: .4byte gUnknown_2023BC4 _0803D418: .4byte gUnknown_2023BC4
_0803D41C: .4byte gUnknown_202402C _0803D41C: .4byte gUnknown_202402C
thumb_func_end sub_803D3E4 thumb_func_end RecordedOpponentHandleFaintingCry
thumb_func_start sub_803D420 thumb_func_start RecordedOpponentHandleIntroSlide
sub_803D420: @ 803D420 RecordedOpponentHandleIntroSlide: @ 803D420
push {lr} push {lr}
ldr r1, _0803D448 @ =gUnknown_2022BC4 ldr r1, _0803D448 @ =gUnknown_2022BC4
ldr r0, _0803D44C @ =gUnknown_2023BC4 ldr r0, _0803D44C @ =gUnknown_2023BC4
@@ -5607,7 +5607,7 @@ sub_803D420: @ 803D420
_0803D448: .4byte gUnknown_2022BC4 _0803D448: .4byte gUnknown_2022BC4
_0803D44C: .4byte gUnknown_2023BC4 _0803D44C: .4byte gUnknown_2023BC4
_0803D450: .4byte gUnknown_2023F4C _0803D450: .4byte gUnknown_2023F4C
thumb_func_end sub_803D420 thumb_func_end RecordedOpponentHandleIntroSlide
thumb_func_start sub_803D454 thumb_func_start sub_803D454
sub_803D454: @ 803D454 sub_803D454: @ 803D454
asm/battle_controller_link_partner.s
+6 -6
View File
@@ -644,7 +644,7 @@ _080D4714: .4byte gUnknown_3004FF0
sub_80D4718: @ 80D4718 sub_80D4718: @ 80D4718
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080D472A bne _080D472A
@@ -838,7 +838,7 @@ sub_80D484C: @ 80D484C
bl FreeSpriteTilesByTag bl FreeSpriteTilesByTag
adds r0, r4, 0 adds r0, r4, 0
bl FreeSpritePaletteByTag bl FreeSpritePaletteByTag
ldr r0, _080D4924 @ =sub_802FDF4 ldr r0, _080D4924 @ =c3_0802FDF4
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
ldr r0, _080D4928 @ =gUnknown_2023BCE ldr r0, _080D4928 @ =gUnknown_2023BCE
@@ -898,7 +898,7 @@ _080D490E:
_080D4918: .4byte gUnknown_2024018 _080D4918: .4byte gUnknown_2024018
_080D491C: .4byte gUnknown_2023BC4 _080D491C: .4byte gUnknown_2023BC4
_080D4920: .4byte 0x000027f9 _080D4920: .4byte 0x000027f9
_080D4924: .4byte sub_802FDF4 _080D4924: .4byte c3_0802FDF4
_080D4928: .4byte gUnknown_2023BCE _080D4928: .4byte gUnknown_2023BCE
_080D492C: .4byte gUnknown_2024284 _080D492C: .4byte gUnknown_2024284
_080D4930: .4byte gUnknown_2023D44 _080D4930: .4byte gUnknown_2023D44
@@ -3380,7 +3380,7 @@ sub_80D5DB4: @ 80D5DB4
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
ldrb r0, [r6] ldrb r0, [r6]
bl sub_80748A8 bl GetBankSpriteDefault_Y
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -3572,7 +3572,7 @@ sub_80D5F40: @ 80D5F40
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_80748A8 bl GetBankSpriteDefault_Y
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -4466,7 +4466,7 @@ _080D66E0:
movs r0, 0 movs r0, 0
bl sub_8035450 bl sub_8035450
adds r0, r4, 0 adds r0, r4, 0
bl sub_807259C bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
asm/battle_controller_oak.s
+27 -27
View File
@@ -176,7 +176,7 @@ _080E76EE:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -204,7 +204,7 @@ _080E7726:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -248,7 +248,7 @@ _080E777C:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -260,7 +260,7 @@ _080E7794:
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_8030A54 bl ActionSelectionCreateCursorAt
b _080E7838 b _080E7838
.align 2, 0 .align 2, 0
_080E77A8: .4byte gUnknown_2023FF8 _080E77A8: .4byte gUnknown_2023FF8
@@ -382,10 +382,10 @@ _080E787C:
movs r0, 0x5 movs r0, 0x5
bl sub_80722CC bl sub_80722CC
movs r0, 0 movs r0, 0
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl sub_8030A54 bl ActionSelectionCreateCursorAt
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x96 adds r0, 0x96
movs r1, 0x40 movs r1, 0x40
@@ -451,7 +451,7 @@ _080E7914: .4byte nullsub_8
sub_80E7918: @ 80E7918 sub_80E7918: @ 80E7918
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080E792A bne _080E792A
@@ -1005,7 +1005,7 @@ _080E7D02:
bl FreeSpriteTilesByTag bl FreeSpriteTilesByTag
adds r0, r4, 0 adds r0, r4, 0
bl FreeSpritePaletteByTag bl FreeSpritePaletteByTag
ldr r0, _080E7DF0 @ =sub_802FDF4 ldr r0, _080E7DF0 @ =c3_0802FDF4
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
ldr r2, _080E7DF4 @ =gUnknown_2023BCE ldr r2, _080E7DF4 @ =gUnknown_2023BCE
@@ -1039,7 +1039,7 @@ _080E7DE0: .4byte gUnknown_2023BC4
_080E7DE4: .4byte nullsub_8 _080E7DE4: .4byte nullsub_8
_080E7DE8: .4byte gUnknown_2024018 _080E7DE8: .4byte gUnknown_2024018
_080E7DEC: .4byte 0x000027f9 _080E7DEC: .4byte 0x000027f9
_080E7DF0: .4byte sub_802FDF4 _080E7DF0: .4byte c3_0802FDF4
_080E7DF4: .4byte gUnknown_2023BCE _080E7DF4: .4byte gUnknown_2023BCE
_080E7DF8: .4byte gUnknown_2024284 _080E7DF8: .4byte gUnknown_2024284
_080E7DFC: .4byte gUnknown_3004FE0 _080E7DFC: .4byte gUnknown_3004FE0
@@ -1779,7 +1779,7 @@ _080E83FE:
_080E8404: .4byte gUnknown_2037AB8 _080E8404: .4byte gUnknown_2037AB8
_080E8408: _080E8408:
ldr r0, _080E8418 @ =gUnknown_83FDAE2 ldr r0, _080E8418 @ =gUnknown_83FDAE2
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080E841C @ =gUnknown_202298C ldr r0, _080E841C @ =gUnknown_202298C
movs r1, 0x18 movs r1, 0x18
bl sub_80D87BC bl sub_80D87BC
@@ -1789,7 +1789,7 @@ _080E8418: .4byte gUnknown_83FDAE2
_080E841C: .4byte gUnknown_202298C _080E841C: .4byte gUnknown_202298C
_080E8420: _080E8420:
movs r0, 0x18 movs r0, 0x18
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
cmp r3, 0 cmp r3, 0
@@ -1830,7 +1830,7 @@ _080E8468:
cmp r0, 0 cmp r0, 0
bne _080E855E bne _080E855E
ldr r0, _080E8488 @ =gUnknown_83FDB92 ldr r0, _080E8488 @ =gUnknown_83FDB92
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080E848C @ =gUnknown_202298C ldr r0, _080E848C @ =gUnknown_202298C
movs r1, 0x18 movs r1, 0x18
bl sub_80D87BC bl sub_80D87BC
@@ -1841,7 +1841,7 @@ _080E8488: .4byte gUnknown_83FDB92
_080E848C: .4byte gUnknown_202298C _080E848C: .4byte gUnknown_202298C
_080E8490: _080E8490:
movs r0, 0x18 movs r0, 0x18
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
cmp r3, 0 cmp r3, 0
@@ -1880,7 +1880,7 @@ _080E84D8:
cmp r0, 0 cmp r0, 0
bne _080E855E bne _080E855E
ldr r0, _080E84F8 @ =gUnknown_83FDBEF ldr r0, _080E84F8 @ =gUnknown_83FDBEF
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080E84FC @ =gUnknown_202298C ldr r0, _080E84FC @ =gUnknown_202298C
movs r1, 0x18 movs r1, 0x18
bl sub_80D87BC bl sub_80D87BC
@@ -1891,7 +1891,7 @@ _080E84F8: .4byte gUnknown_83FDBEF
_080E84FC: .4byte gUnknown_202298C _080E84FC: .4byte gUnknown_202298C
_080E8500: _080E8500:
movs r0, 0x18 movs r0, 0x18
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r1, r0, 16 lsrs r1, r0, 16
cmp r1, 0 cmp r1, 0
@@ -2038,7 +2038,7 @@ _080E8600:
.4byte _080E86B4 .4byte _080E86B4
_080E8618: _080E8618:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080E86F2 bne _080E86F2
@@ -2082,7 +2082,7 @@ _080E865A:
_080E866C: .4byte gUnknown_2037AB8 _080E866C: .4byte gUnknown_2037AB8
_080E8670: _080E8670:
adds r0, r2, 0 adds r0, r2, 0
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080E8680 @ =gUnknown_202298C ldr r0, _080E8680 @ =gUnknown_202298C
movs r1, 0x18 movs r1, 0x18
bl sub_80D87BC bl sub_80D87BC
@@ -2091,7 +2091,7 @@ _080E8670:
_080E8680: .4byte gUnknown_202298C _080E8680: .4byte gUnknown_202298C
_080E8684: _080E8684:
movs r0, 0x18 movs r0, 0x18
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r1, r0, 16 lsrs r1, r0, 16
cmp r1, 0 cmp r1, 0
@@ -2262,7 +2262,7 @@ _080E87D0:
_080E87E4: .4byte gUnknown_2037AB8 _080E87E4: .4byte gUnknown_2037AB8
_080E87E8: _080E87E8:
ldr r0, _080E87F8 @ =gUnknown_83FDCD2 ldr r0, _080E87F8 @ =gUnknown_83FDCD2
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080E87FC @ =gUnknown_202298C ldr r0, _080E87FC @ =gUnknown_202298C
movs r1, 0x18 movs r1, 0x18
bl sub_80D87BC bl sub_80D87BC
@@ -2272,7 +2272,7 @@ _080E87F8: .4byte gUnknown_83FDCD2
_080E87FC: .4byte gUnknown_202298C _080E87FC: .4byte gUnknown_202298C
_080E8800: _080E8800:
movs r0, 0x18 movs r0, 0x18
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
cmp r3, 0 cmp r3, 0
@@ -2419,7 +2419,7 @@ _080E892C: .4byte gUnknown_2024284
sub_80E8930: @ 80E8930 sub_80E8930: @ 80E8930
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080E8942 bne _080E8942
@@ -5687,7 +5687,7 @@ _080EA46A:
movs r0, 0 movs r0, 0
bl sub_8035450 bl sub_8035450
adds r0, r4, 0 adds r0, r4, 0
bl sub_807259C bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -6014,7 +6014,7 @@ sub_80EA6FC: @ 80EA6FC
_080EA71E: _080EA71E:
lsls r0, r4, 24 lsls r0, r4, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x3 cmp r4, 0x3
ble _080EA71E ble _080EA71E
@@ -6024,7 +6024,7 @@ _080EA71E:
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_8030A54 bl ActionSelectionCreateCursorAt
ldr r0, _080EA768 @ =gUnknown_2022B4C ldr r0, _080EA768 @ =gUnknown_2022B4C
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x10 movs r1, 0x10
@@ -6032,7 +6032,7 @@ _080EA71E:
cmp r0, 0 cmp r0, 0
beq _080EA770 beq _080EA770
ldr r0, _080EA76C @ =gUnknown_83FE6D5 ldr r0, _080EA76C @ =gUnknown_83FE6D5
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
b _080EA776 b _080EA776
.align 2, 0 .align 2, 0
_080EA750: .4byte gUnknown_3004FE0 _080EA750: .4byte gUnknown_3004FE0
@@ -6045,7 +6045,7 @@ _080EA768: .4byte gUnknown_2022B4C
_080EA76C: .4byte gUnknown_83FE6D5 _080EA76C: .4byte gUnknown_83FE6D5
_080EA770: _080EA770:
ldr r0, _080EA784 @ =gUnknown_83FE6FA ldr r0, _080EA784 @ =gUnknown_83FE6FA
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
_080EA776: _080EA776:
ldr r0, _080EA788 @ =gUnknown_202298C ldr r0, _080EA788 @ =gUnknown_202298C
movs r1, 0x1 movs r1, 0x1
@@ -7081,7 +7081,7 @@ sub_80EAF34: @ 80EAF34
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_80748A8 bl GetBankSpriteDefault_Y
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
asm/battle_controller_opponent.s
+10 -10
View File
@@ -925,7 +925,7 @@ _080361E0: .4byte gUnknown_3004FF0
sub_80361E4: @ 80361E4 sub_80361E4: @ 80361E4
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080361F6 bne _080361F6
@@ -3638,7 +3638,7 @@ _08037890:
adds r0, r6 adds r0, r6
bl BattleLoadOpponentMonSpriteGfx bl BattleLoadOpponentMonSpriteGfx
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80748A8 bl GetBankSpriteDefault_Y
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
_080378AA: _080378AA:
@@ -3770,8 +3770,8 @@ _080379C0: .4byte gUnknown_3004FE0
_080379C4: .4byte sub_8035FE8 _080379C4: .4byte sub_8035FE8
thumb_func_end sub_80377FC thumb_func_end sub_80377FC
thumb_func_start sub_80379C8 thumb_func_start OpponentHandleSwitchInAnim
sub_80379C8: @ 80379C8 OpponentHandleSwitchInAnim: @ 80379C8
push {r4,lr} push {r4,lr}
ldr r4, _08037A10 @ =gUnknown_2023BC4 ldr r4, _08037A10 @ =gUnknown_2023BC4
ldrb r0, [r4] ldrb r0, [r4]
@@ -3813,7 +3813,7 @@ _08037A18: .4byte gUnknown_2023BCE
_08037A1C: .4byte gUnknown_2022BC4 _08037A1C: .4byte gUnknown_2022BC4
_08037A20: .4byte gUnknown_3004FE0 _08037A20: .4byte gUnknown_3004FE0
_08037A24: .4byte sub_8036408 _08037A24: .4byte sub_8036408
thumb_func_end sub_80379C8 thumb_func_end OpponentHandleSwitchInAnim
thumb_func_start sub_8037A28 thumb_func_start sub_8037A28
sub_8037A28: @ 8037A28 sub_8037A28: @ 8037A28
@@ -3882,7 +3882,7 @@ sub_8037A28: @ 8037A28
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_80748A8 bl GetBankSpriteDefault_Y
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -5006,7 +5006,7 @@ _080383D0:
movs r0, 0 movs r0, 0
bl sub_8035450 bl sub_8035450
adds r0, r4, 0 adds r0, r4, 0
bl sub_807259C bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -6695,8 +6695,8 @@ sub_8039134: @ 8039134
bx r0 bx r0
thumb_func_end sub_8039134 thumb_func_end sub_8039134
thumb_func_start sub_8039140 thumb_func_start OpponentHandleCmd55
sub_8039140: @ 8039140 OpponentHandleCmd55: @ 8039140
push {lr} push {lr}
ldr r0, _08039174 @ =gUnknown_2022B4C ldr r0, _08039174 @ =gUnknown_2022B4C
ldr r0, [r0] ldr r0, [r0]
@@ -6726,7 +6726,7 @@ _08039174: .4byte gUnknown_2022B4C
_08039178: .4byte gUnknown_30030F0 _08039178: .4byte gUnknown_30030F0
_0803917C: .4byte 0x00000439 _0803917C: .4byte 0x00000439
_08039180: .4byte gUnknown_3004F80 _08039180: .4byte gUnknown_3004F80
thumb_func_end sub_8039140 thumb_func_end OpponentHandleCmd55
thumb_func_start nullsub_18 thumb_func_start nullsub_18
nullsub_18: @ 8039184 nullsub_18: @ 8039184
asm/battle_controller_player.s
+69 -69
View File
@@ -249,7 +249,7 @@ _0802E4EA:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -277,7 +277,7 @@ _0802E522:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -321,7 +321,7 @@ _0802E578:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -333,7 +333,7 @@ _0802E590:
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_8030A54 bl ActionSelectionCreateCursorAt
b _0802E634 b _0802E634
.align 2, 0 .align 2, 0
_0802E5A4: .4byte gUnknown_2023FF8 _0802E5A4: .4byte gUnknown_2023FF8
@@ -1145,7 +1145,7 @@ _0802EC38:
b _0802EDBA b _0802EDBA
_0802EC52: _0802EC52:
ldrb r0, [r2] ldrb r0, [r2]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
ldrb r0, [r1] ldrb r0, [r1]
@@ -1179,7 +1179,7 @@ _0802EC84:
b _0802EDBA b _0802EDBA
_0802EC92: _0802EC92:
ldrb r0, [r3] ldrb r0, [r3]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
ldrb r0, [r1] ldrb r0, [r1]
@@ -1204,7 +1204,7 @@ _0802ECAC:
b _0802EDBA b _0802EDBA
_0802ECC6: _0802ECC6:
ldrb r0, [r2] ldrb r0, [r2]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
ldrb r0, [r1] ldrb r0, [r1]
@@ -1234,7 +1234,7 @@ _0802ECDC:
cmp r0, r1 cmp r0, r1
bcs _0802EDBA bcs _0802EDBA
ldrb r0, [r3] ldrb r0, [r3]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
ldrb r0, [r1] ldrb r0, [r1]
@@ -1247,7 +1247,7 @@ _0802ED10:
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
bl MoveSelectionDisplayPpNumber bl MoveSelectionDisplayPpNumber
bl MoveSelectionDisplayMoveType bl MoveSelectionDisplayMoveType
_0802ED2C: _0802ED2C:
@@ -1283,7 +1283,7 @@ _0802ED4C:
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x1D movs r1, 0x1D
bl sub_80309CC bl MoveSelectionCreateCursorAt
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
@@ -1305,7 +1305,7 @@ _0802ED94:
_0802ED9C: _0802ED9C:
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x1B movs r1, 0x1B
bl sub_80309CC bl MoveSelectionCreateCursorAt
ldr r0, _0802EDCC @ =gUnknown_83FE7A0 ldr r0, _0802EDCC @ =gUnknown_83FE7A0
movs r1, 0xB movs r1, 0xB
bl sub_80D87BC bl sub_80D87BC
@@ -1379,7 +1379,7 @@ _0802EE18:
cmp r0, 0 cmp r0, 0
beq _0802EE58 beq _0802EE58
ldrb r0, [r2] ldrb r0, [r2]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -1392,7 +1392,7 @@ _0802EE18:
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
_0802EE58: _0802EE58:
ldr r0, _0802EF40 @ =gUnknown_30030F0 ldr r0, _0802EF40 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E] ldrh r1, [r0, 0x2E]
@@ -1417,7 +1417,7 @@ _0802EE58:
cmp r0, r1 cmp r0, r1
bcs _0802EEA6 bcs _0802EEA6
ldrb r0, [r3] ldrb r0, [r3]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -1429,7 +1429,7 @@ _0802EE58:
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
_0802EEA6: _0802EEA6:
ldr r0, _0802EF40 @ =gUnknown_30030F0 ldr r0, _0802EF40 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E] ldrh r1, [r0, 0x2E]
@@ -1447,7 +1447,7 @@ _0802EEA6:
cmp r0, 0 cmp r0, 0
beq _0802EEE8 beq _0802EEE8
ldrb r0, [r2] ldrb r0, [r2]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -1460,7 +1460,7 @@ _0802EEA6:
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
_0802EEE8: _0802EEE8:
ldr r0, _0802EF40 @ =gUnknown_30030F0 ldr r0, _0802EF40 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E] ldrh r1, [r0, 0x2E]
@@ -1485,7 +1485,7 @@ _0802EEE8:
cmp r0, r1 cmp r0, r1
bcs _0802EF36 bcs _0802EF36
ldrb r0, [r3] ldrb r0, [r3]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -1497,7 +1497,7 @@ _0802EEE8:
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
_0802EF36: _0802EF36:
adds r0, r7, 0 adds r0, r7, 0
pop {r4-r7} pop {r4-r7}
@@ -2005,7 +2005,7 @@ _0802F324:
adds r0, r2 adds r0, r2
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
bl MoveSelectionDisplayPpString bl MoveSelectionDisplayPpString
bl MoveSelectionDisplayPpNumber bl MoveSelectionDisplayPpNumber
bl MoveSelectionDisplayMoveType bl MoveSelectionDisplayMoveType
@@ -2020,14 +2020,14 @@ _0802F34C:
bl sub_80722CC bl sub_80722CC
ldr r0, _0802F3A0 @ =gUnknown_3004FF4 ldr r0, _0802F3A0 @ =gUnknown_3004FF4
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
ldr r1, _0802F39C @ =gUnknown_2023FFC ldr r1, _0802F39C @ =gUnknown_2023FFC
ldr r4, _0802F394 @ =gUnknown_2023BC4 ldr r4, _0802F394 @ =gUnknown_2023BC4
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
ldr r0, _0802F3A8 @ =gUnknown_2022B4C ldr r0, _0802F3A8 @ =gUnknown_2022B4C
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x10 movs r1, 0x10
@@ -2082,7 +2082,7 @@ _0802F3C8:
bne _0802F410 bne _0802F410
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0x1D movs r1, 0x1D
bl sub_80309CC bl MoveSelectionCreateCursorAt
b _0802F416 b _0802F416
.align 2, 0 .align 2, 0
_0802F3F8: .4byte gUnknown_3004FE0 _0802F3F8: .4byte gUnknown_3004FE0
@@ -2093,7 +2093,7 @@ _0802F408: .4byte gUnknown_2023FFC
_0802F40C: .4byte gUnknown_2023BC4 _0802F40C: .4byte gUnknown_2023BC4
_0802F410: _0802F410:
ldrb r0, [r3] ldrb r0, [r3]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
_0802F416: _0802F416:
ldr r4, _0802F440 @ =gUnknown_3004FF4 ldr r4, _0802F440 @ =gUnknown_3004FF4
ldrb r0, [r4] ldrb r0, [r4]
@@ -2112,7 +2112,7 @@ _0802F416:
bne _0802F44C bne _0802F44C
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
b _0802F454 b _0802F454
.align 2, 0 .align 2, 0
_0802F440: .4byte gUnknown_3004FF4 _0802F440: .4byte gUnknown_3004FF4
@@ -2121,7 +2121,7 @@ _0802F448: .4byte gUnknown_2023BC4
_0802F44C: _0802F44C:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1B movs r1, 0x1B
bl sub_80309CC bl MoveSelectionCreateCursorAt
_0802F454: _0802F454:
ldr r0, _0802F490 @ =gUnknown_30030F0 ldr r0, _0802F490 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E] ldrh r1, [r0, 0x2E]
@@ -2150,7 +2150,7 @@ _0802F454:
bne _0802F4A4 bne _0802F4A4
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0x1D movs r1, 0x1D
bl sub_80309CC bl MoveSelectionCreateCursorAt
b _0802F4AA b _0802F4AA
.align 2, 0 .align 2, 0
_0802F490: .4byte gUnknown_30030F0 _0802F490: .4byte gUnknown_30030F0
@@ -2160,7 +2160,7 @@ _0802F49C: .4byte gUnknown_2023FFC
_0802F4A0: .4byte gUnknown_2023BC4 _0802F4A0: .4byte gUnknown_2023BC4
_0802F4A4: _0802F4A4:
ldrb r0, [r3] ldrb r0, [r3]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
_0802F4AA: _0802F4AA:
ldr r4, _0802F4D4 @ =gUnknown_3004FF4 ldr r4, _0802F4D4 @ =gUnknown_3004FF4
ldrb r0, [r4] ldrb r0, [r4]
@@ -2179,7 +2179,7 @@ _0802F4AA:
bne _0802F4E0 bne _0802F4E0
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
b _0802F4E8 b _0802F4E8
.align 2, 0 .align 2, 0
_0802F4D4: .4byte gUnknown_3004FF4 _0802F4D4: .4byte gUnknown_3004FF4
@@ -2188,7 +2188,7 @@ _0802F4DC: .4byte gUnknown_2023BC4
_0802F4E0: _0802F4E0:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1B movs r1, 0x1B
bl sub_80309CC bl MoveSelectionCreateCursorAt
_0802F4E8: _0802F4E8:
ldr r0, _0802F518 @ =gUnknown_30030F0 ldr r0, _0802F518 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E] ldrh r1, [r0, 0x2E]
@@ -2211,7 +2211,7 @@ _0802F4E8:
bne _0802F528 bne _0802F528
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0x1D movs r1, 0x1D
bl sub_80309CC bl MoveSelectionCreateCursorAt
b _0802F52E b _0802F52E
.align 2, 0 .align 2, 0
_0802F518: .4byte gUnknown_30030F0 _0802F518: .4byte gUnknown_30030F0
@@ -2220,7 +2220,7 @@ _0802F520: .4byte gUnknown_2023FFC
_0802F524: .4byte gUnknown_2023BC4 _0802F524: .4byte gUnknown_2023BC4
_0802F528: _0802F528:
ldrb r0, [r3] ldrb r0, [r3]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
_0802F52E: _0802F52E:
ldr r4, _0802F558 @ =gUnknown_3004FF4 ldr r4, _0802F558 @ =gUnknown_3004FF4
ldrb r0, [r4] ldrb r0, [r4]
@@ -2239,7 +2239,7 @@ _0802F52E:
bne _0802F564 bne _0802F564
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
b _0802F56C b _0802F56C
.align 2, 0 .align 2, 0
_0802F558: .4byte gUnknown_3004FF4 _0802F558: .4byte gUnknown_3004FF4
@@ -2248,7 +2248,7 @@ _0802F560: .4byte gUnknown_2023BC4
_0802F564: _0802F564:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1B movs r1, 0x1B
bl sub_80309CC bl MoveSelectionCreateCursorAt
_0802F56C: _0802F56C:
ldr r0, _0802F5A8 @ =gUnknown_30030F0 ldr r0, _0802F5A8 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E] ldrh r1, [r0, 0x2E]
@@ -2277,7 +2277,7 @@ _0802F56C:
bne _0802F5BC bne _0802F5BC
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0x1D movs r1, 0x1D
bl sub_80309CC bl MoveSelectionCreateCursorAt
b _0802F5C2 b _0802F5C2
.align 2, 0 .align 2, 0
_0802F5A8: .4byte gUnknown_30030F0 _0802F5A8: .4byte gUnknown_30030F0
@@ -2287,7 +2287,7 @@ _0802F5B4: .4byte gUnknown_2023FFC
_0802F5B8: .4byte gUnknown_2023BC4 _0802F5B8: .4byte gUnknown_2023BC4
_0802F5BC: _0802F5BC:
ldrb r0, [r3] ldrb r0, [r3]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
_0802F5C2: _0802F5C2:
ldr r4, _0802F5EC @ =gUnknown_3004FF4 ldr r4, _0802F5EC @ =gUnknown_3004FF4
ldrb r0, [r4] ldrb r0, [r4]
@@ -2306,7 +2306,7 @@ _0802F5C2:
bne _0802F5F8 bne _0802F5F8
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
b _0802F600 b _0802F600
.align 2, 0 .align 2, 0
_0802F5EC: .4byte gUnknown_3004FF4 _0802F5EC: .4byte gUnknown_3004FF4
@@ -2315,7 +2315,7 @@ _0802F5F4: .4byte gUnknown_2023BC4
_0802F5F8: _0802F5F8:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1B movs r1, 0x1B
bl sub_80309CC bl MoveSelectionCreateCursorAt
_0802F600: _0802F600:
add sp, 0x24 add sp, 0x24
pop {r3-r5} pop {r3-r5}
@@ -3282,8 +3282,8 @@ _0802FDEC: .4byte gUnknown_3004FE0
_0802FDF0: .4byte sub_802FBF4 _0802FDF0: .4byte sub_802FBF4
thumb_func_end sub_802FD18 thumb_func_end sub_802FD18
thumb_func_start sub_802FDF4 thumb_func_start c3_0802FDF4
sub_802FDF4: @ 802FDF4 c3_0802FDF4: @ 802FDF4
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -3305,10 +3305,10 @@ _0802FE16:
.align 2, 0 .align 2, 0
_0802FE1C: .4byte gMPlay_BGM _0802FE1C: .4byte gMPlay_BGM
_0802FE20: .4byte 0x0000ffff _0802FE20: .4byte 0x0000ffff
thumb_func_end sub_802FDF4 thumb_func_end c3_0802FDF4
thumb_func_start sub_802FE24 thumb_func_start CompleteOnHealthbarDone
sub_802FE24: @ 802FE24 CompleteOnHealthbarDone: @ 802FE24
push {r4-r6,lr} push {r4-r6,lr}
ldr r5, _0802FE64 @ =gUnknown_2023BC4 ldr r5, _0802FE64 @ =gUnknown_2023BC4
ldrb r0, [r5] ldrb r0, [r5]
@@ -3359,13 +3359,13 @@ _0802FE86:
.align 2, 0 .align 2, 0
_0802FE8C: .4byte gUnknown_2023BCE _0802FE8C: .4byte gUnknown_2023BCE
_0802FE90: .4byte gUnknown_2024284 _0802FE90: .4byte gUnknown_2024284
thumb_func_end sub_802FE24 thumb_func_end CompleteOnHealthbarDone
thumb_func_start sub_802FE94 thumb_func_start sub_802FE94
sub_802FE94: @ 802FE94 sub_802FE94: @ 802FE94
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _0802FEA6 bne _0802FEA6
@@ -4045,7 +4045,7 @@ _0803040C:
.4byte _080304E8 .4byte _080304E8
_08030428: _08030428:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _0803051C bne _0803051C
@@ -4280,7 +4280,7 @@ _0803060C: .4byte gUnknown_3004FF0
sub_8030610: @ 8030610 sub_8030610: @ 8030610
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _08030622 bne _08030622
@@ -4563,7 +4563,7 @@ sub_8030830: @ 8030830
_08030848: _08030848:
lsls r0, r5, 24 lsls r0, r5, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
adds r0, r6, 0 adds r0, r6, 0
ldr r1, _080308A0 @ =gUnknown_83FE770 ldr r1, _080308A0 @ =gUnknown_83FE770
bl StringCopy bl StringCopy
@@ -4632,7 +4632,7 @@ MoveSelectionDisplayPpNumber: @ 80308CC
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
beq _08030928 beq _08030928
bl sub_80D89DC bl SetPpNumbersPaletteInMoveSelection
ldrb r1, [r7] ldrb r1, [r7]
lsls r4, r1, 9 lsls r4, r1, 9
adds r0, r5, 0x4 adds r0, r5, 0x4
@@ -4737,8 +4737,8 @@ _080309C4: .4byte gUnknown_2023FFC
_080309C8: .4byte gUnknown_824F1A0 _080309C8: .4byte gUnknown_824F1A0
thumb_func_end MoveSelectionDisplayMoveType thumb_func_end MoveSelectionDisplayMoveType
thumb_func_start sub_80309CC thumb_func_start MoveSelectionCreateCursorAt
sub_80309CC: @ 80309CC MoveSelectionCreateCursorAt: @ 80309CC
push {lr} push {lr}
sub sp, 0x10 sub sp, 0x10
adds r3, r0, 0 adds r3, r0, 0
@@ -4773,10 +4773,10 @@ sub_80309CC: @ 80309CC
add sp, 0x10 add sp, 0x10
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80309CC thumb_func_end MoveSelectionCreateCursorAt
thumb_func_start sub_8030A14 thumb_func_start MoveSelectionDestroyCursorAt
sub_8030A14: @ 8030A14 MoveSelectionDestroyCursorAt: @ 8030A14
push {lr} push {lr}
sub sp, 0x10 sub sp, 0x10
adds r3, r0, 0 adds r3, r0, 0
@@ -4807,10 +4807,10 @@ sub_8030A14: @ 8030A14
add sp, 0x10 add sp, 0x10
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8030A14 thumb_func_end MoveSelectionDestroyCursorAt
thumb_func_start sub_8030A54 thumb_func_start ActionSelectionCreateCursorAt
sub_8030A54: @ 8030A54 ActionSelectionCreateCursorAt: @ 8030A54
push {r4,lr} push {r4,lr}
sub sp, 0x10 sub sp, 0x10
adds r3, r0, 0 adds r3, r0, 0
@@ -4843,10 +4843,10 @@ sub_8030A54: @ 8030A54
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8030A54 thumb_func_end ActionSelectionCreateCursorAt
thumb_func_start sub_8030A98 thumb_func_start ActionSelectionDestroyCursorAt
sub_8030A98: @ 8030A98 ActionSelectionDestroyCursorAt: @ 8030A98
push {lr} push {lr}
sub sp, 0x10 sub sp, 0x10
adds r3, r0, 0 adds r3, r0, 0
@@ -4879,7 +4879,7 @@ sub_8030A98: @ 8030A98
add sp, 0x10 add sp, 0x10
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8030A98 thumb_func_end ActionSelectionDestroyCursorAt
thumb_func_start sub_8030ADC thumb_func_start sub_8030ADC
sub_8030ADC: @ 8030ADC sub_8030ADC: @ 8030ADC
@@ -7452,7 +7452,7 @@ sub_8031FF4: @ 8031FF4
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_80748A8 bl GetBankSpriteDefault_Y
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -8640,7 +8640,7 @@ _08032A10:
movs r0, 0 movs r0, 0
bl sub_8035450 bl sub_8035450
adds r0, r4, 0 adds r0, r4, 0
bl sub_807259C bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -8867,7 +8867,7 @@ sub_8032BD4: @ 8032BD4
_08032BF6: _08032BF6:
lsls r0, r4, 24 lsls r0, r4, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x3 cmp r4, 0x3
ble _08032BF6 ble _08032BF6
@@ -8877,9 +8877,9 @@ _08032BF6:
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_8030A54 bl ActionSelectionCreateCursorAt
ldr r0, _08032C40 @ =gUnknown_83FE6D5 ldr r0, _08032C40 @ =gUnknown_83FE6D5
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _08032C44 @ =gUnknown_202298C ldr r0, _08032C44 @ =gUnknown_202298C
movs r1, 0x1 movs r1, 0x1
bl sub_80D87BC bl sub_80D87BC
@@ -8967,7 +8967,7 @@ sub_8032CB4: @ 8032CB4
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
bl MoveSelectionDisplayPpString bl MoveSelectionDisplayPpString
bl MoveSelectionDisplayPpNumber bl MoveSelectionDisplayPpNumber
bl MoveSelectionDisplayMoveType bl MoveSelectionDisplayMoveType
@@ -9245,7 +9245,7 @@ _08032F16:
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
ldr r1, _08032F48 @ =sub_802FE24 ldr r1, _08032F48 @ =CompleteOnHealthbarDone
str r1, [r0] str r1, [r0]
add sp, 0x4 add sp, 0x4
pop {r3,r4} pop {r3,r4}
@@ -9260,7 +9260,7 @@ _08032F38: .4byte gUnknown_2024284
_08032F3C: .4byte gUnknown_3004FF0 _08032F3C: .4byte gUnknown_3004FF0
_08032F40: .4byte gUnknown_3004FE0 _08032F40: .4byte gUnknown_3004FE0
_08032F44: .4byte gUnknown_2023BC4 _08032F44: .4byte gUnknown_2023BC4
_08032F48: .4byte sub_802FE24 _08032F48: .4byte CompleteOnHealthbarDone
thumb_func_end sub_8032E4C thumb_func_end sub_8032E4C
thumb_func_start PlayerHandleExpUpdate thumb_func_start PlayerHandleExpUpdate
asm/battle_controller_pokedude.s
+89 -89
View File
@@ -79,7 +79,7 @@ _08156128: .4byte gUnknown_2023BC4
_0815612C: .4byte gUnknown_2022BC4 _0815612C: .4byte gUnknown_2022BC4
_08156130: .4byte gUnknown_8478F1C _08156130: .4byte gUnknown_8478F1C
_08156134: _08156134:
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08156138: _08156138:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -112,7 +112,7 @@ sub_815614C: @ 815614C
ldr r0, _08156180 @ =nullsub_8 ldr r0, _08156180 @ =nullsub_8
cmp r1, r0 cmp r1, r0
bne _08156170 bne _08156170
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08156170: _08156170:
pop {r0} pop {r0}
bx r0 bx r0
@@ -201,7 +201,7 @@ _081561F8:
bl FreeSpriteTilesByTag bl FreeSpriteTilesByTag
adds r0, r4, 0 adds r0, r4, 0
bl FreeSpritePaletteByTag bl FreeSpritePaletteByTag
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08156230: _08156230:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -214,11 +214,11 @@ _08156238: .4byte 0x000027f9
sub_815623C: @ 815623C sub_815623C: @ 815623C
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _0815624E bne _0815624E
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_0815624E: _0815624E:
pop {r0} pop {r0}
bx r0 bx r0
@@ -273,7 +273,7 @@ sub_8156294: @ 8156294
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _081562D4 bne _081562D4
ldr r0, _081562E4 @ =sub_802FDF4 ldr r0, _081562E4 @ =c3_0802FDF4
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
ldr r2, _081562E8 @ =gUnknown_2023BCE ldr r2, _081562E8 @ =gUnknown_2023BCE
@@ -286,7 +286,7 @@ sub_8156294: @ 8156294
ldr r2, _081562EC @ =gUnknown_2024284 ldr r2, _081562EC @ =gUnknown_2024284
adds r0, r2 adds r0, r2
bl HandleLowHpMusicChange bl HandleLowHpMusicChange
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_081562D4: _081562D4:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -294,7 +294,7 @@ _081562D4:
.align 2, 0 .align 2, 0
_081562DC: .4byte gUnknown_2024018 _081562DC: .4byte gUnknown_2024018
_081562E0: .4byte gUnknown_2023BC4 _081562E0: .4byte gUnknown_2023BC4
_081562E4: .4byte sub_802FDF4 _081562E4: .4byte c3_0802FDF4
_081562E8: .4byte gUnknown_2023BCE _081562E8: .4byte gUnknown_2023BCE
_081562EC: .4byte gUnknown_2024284 _081562EC: .4byte gUnknown_2024284
thumb_func_end sub_8156294 thumb_func_end sub_8156294
@@ -493,7 +493,7 @@ sub_8156484: @ 8156484
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _08156492 bne _08156492
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08156492: _08156492:
pop {r0} pop {r0}
bx r0 bx r0
@@ -529,7 +529,7 @@ sub_815649C: @ 815649C
adds r0, r2 adds r0, r2
movs r1, 0 movs r1, 0
strb r1, [r0, 0x9] strb r1, [r0, 0x9]
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_081564D4: _081564D4:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -618,7 +618,7 @@ _08156580:
movs r2, 0 movs r2, 0
bl EmitChosenMonReturnValue bl EmitChosenMonReturnValue
_0815658A: _0815658A:
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_0815658E: _0815658E:
pop {r0} pop {r0}
bx r0 bx r0
@@ -684,7 +684,7 @@ sub_81565E8: @ 81565E8
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1 movs r0, 0x1
bl EmitOneReturnValue bl EmitOneReturnValue
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_0815660E: _0815660E:
pop {r0} pop {r0}
bx r0 bx r0
@@ -981,7 +981,7 @@ _081567DA:
bl FreeSpriteTilesByTag bl FreeSpriteTilesByTag
adds r0, r4, 0 adds r0, r4, 0
bl FreeSpritePaletteByTag bl FreeSpritePaletteByTag
ldr r0, _081568C8 @ =sub_802FDF4 ldr r0, _081568C8 @ =c3_0802FDF4
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
ldr r2, _081568CC @ =gUnknown_2023BCE ldr r2, _081568CC @ =gUnknown_2023BCE
@@ -1015,7 +1015,7 @@ _081568B8: .4byte gUnknown_2023BC4
_081568BC: .4byte nullsub_8 _081568BC: .4byte nullsub_8
_081568C0: .4byte gUnknown_2024018 _081568C0: .4byte gUnknown_2024018
_081568C4: .4byte 0x000027f9 _081568C4: .4byte 0x000027f9
_081568C8: .4byte sub_802FDF4 _081568C8: .4byte c3_0802FDF4
_081568CC: .4byte gUnknown_2023BCE _081568CC: .4byte gUnknown_2023BCE
_081568D0: .4byte gUnknown_2024284 _081568D0: .4byte gUnknown_2024284
_081568D4: .4byte gUnknown_3004FE0 _081568D4: .4byte gUnknown_3004FE0
@@ -1667,7 +1667,7 @@ sub_8156DCC: @ 8156DCC
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
bl SetHealthboxSpriteInvisible bl SetHealthboxSpriteInvisible
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
b _08156E66 b _08156E66
.align 2, 0 .align 2, 0
_08156E2C: .4byte gUnknown_2023BC4 _08156E2C: .4byte gUnknown_2023BC4
@@ -1693,7 +1693,7 @@ _08156E3C:
adds r0, r3, r0 adds r0, r3, r0
ldrb r0, [r0] ldrb r0, [r0]
bl SetHealthboxSpriteInvisible bl SetHealthboxSpriteInvisible
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08156E66: _08156E66:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -1748,7 +1748,7 @@ _08156EC0:
ldr r2, _08156EE4 @ =gUnknown_2024284 ldr r2, _08156EE4 @ =gUnknown_2024284
adds r0, r2 adds r0, r2
bl HandleLowHpMusicChange bl HandleLowHpMusicChange
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08156EDA: _08156EDA:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -1762,11 +1762,11 @@ _08156EE4: .4byte gUnknown_2024284
sub_8156EE8: @ 8156EE8 sub_8156EE8: @ 8156EE8
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _08156EFA bne _08156EFA
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08156EFA: _08156EFA:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1800,7 +1800,7 @@ sub_8156F00: @ 8156F00
strb r0, [r2] strb r0, [r2]
ldr r0, _08156F48 @ =gUnknown_2024005 ldr r0, _08156F48 @ =gUnknown_2024005
strb r3, [r0] strb r3, [r0]
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
b _08156F76 b _08156F76
.align 2, 0 .align 2, 0
_08156F3C: .4byte gUnknown_2023D44 _08156F3C: .4byte gUnknown_2023D44
@@ -1875,7 +1875,7 @@ sub_8156F7C: @ 8156F7C
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
bl SetHealthboxSpriteInvisible bl SetHealthboxSpriteInvisible
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08156FD0: _08156FD0:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -1906,7 +1906,7 @@ sub_8156FEC: @ 8156FEC
ldr r0, _08157020 @ =nullsub_8 ldr r0, _08157020 @ =nullsub_8
cmp r1, r0 cmp r1, r0
bne _08157010 bne _08157010
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08157010: _08157010:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1934,7 +1934,7 @@ sub_8157024: @ 8157024
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _08157046 bne _08157046
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08157046: _08157046:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1960,7 +1960,7 @@ sub_8157054: @ 8157054
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _08157076 bne _08157076
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08157076: _08157076:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1969,8 +1969,8 @@ _0815707C: .4byte gUnknown_2024018
_08157080: .4byte gUnknown_2023BC4 _08157080: .4byte gUnknown_2023BC4
thumb_func_end sub_8157054 thumb_func_end sub_8157054
thumb_func_start sub_8157084 thumb_func_start PlayerPartnerBufferExecCompleted
sub_8157084: @ 8157084 PlayerPartnerBufferExecCompleted: @ 8157084
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
ldr r1, _081570C4 @ =gUnknown_3004FE0 ldr r1, _081570C4 @ =gUnknown_3004FE0
@@ -2024,10 +2024,10 @@ _081570EA:
.align 2, 0 .align 2, 0
_081570F4: .4byte gUnknown_2023BC8 _081570F4: .4byte gUnknown_2023BC8
_081570F8: .4byte gUnknown_825E45C _081570F8: .4byte gUnknown_825E45C
thumb_func_end sub_8157084 thumb_func_end PlayerPartnerBufferExecCompleted
thumb_func_start sub_81570FC thumb_func_start CompleteOnFinishedStatusAnimation_7
sub_81570FC: @ 81570FC CompleteOnFinishedStatusAnimation_7: @ 81570FC
push {lr} push {lr}
ldr r0, _08157124 @ =gUnknown_2024018 ldr r0, _08157124 @ =gUnknown_2024018
ldr r2, [r0] ldr r2, [r0]
@@ -2043,14 +2043,14 @@ sub_81570FC: @ 81570FC
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _0815711E bne _0815711E
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_0815711E: _0815711E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08157124: .4byte gUnknown_2024018 _08157124: .4byte gUnknown_2024018
_08157128: .4byte gUnknown_2023BC4 _08157128: .4byte gUnknown_2023BC4
thumb_func_end sub_81570FC thumb_func_end CompleteOnFinishedStatusAnimation_7
thumb_func_start sub_815712C thumb_func_start sub_815712C
sub_815712C: @ 815712C sub_815712C: @ 815712C
@@ -2103,7 +2103,7 @@ _08157186:
movs r0, 0x1 movs r0, 0x1
mov r2, sp mov r2, sp
bl EmitDataTransfer bl EmitDataTransfer
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
add sp, 0x100 add sp, 0x100
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -2843,7 +2843,7 @@ _0815779E:
cmp r5, 0x5 cmp r5, 0x5
bls _08157790 bls _08157790
_081577AA: _081577AA:
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -3884,7 +3884,7 @@ _081580D0: .4byte gUnknown_2024284
thumb_func_start sub_81580D4 thumb_func_start sub_81580D4
sub_81580D4: @ 81580D4 sub_81580D4: @ 81580D4
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_81580D4 thumb_func_end sub_81580D4
@@ -3922,7 +3922,7 @@ sub_81580E0: @ 81580E0
add r0, r10 add r0, r10
bl BattleLoadOpponentMonSpriteGfx bl BattleLoadOpponentMonSpriteGfx
ldrb r0, [r6] ldrb r0, [r6]
bl sub_80748A8 bl GetBankSpriteDefault_Y
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
@@ -4025,7 +4025,7 @@ sub_81580E0: @ 81580E0
adds r0, r1 adds r0, r1
ldr r1, _08158238 @ =sub_8156184 ldr r1, _08158238 @ =sub_8156184
str r1, [r0] str r1, [r0]
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
mov r9, r4 mov r9, r4
@@ -4157,7 +4157,7 @@ _081582FC:
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
bl SetHealthboxSpriteInvisible bl SetHealthboxSpriteInvisible
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08158332: _08158332:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -4497,7 +4497,7 @@ _0815860C: .4byte sub_8156FEC
thumb_func_start sub_8158610 thumb_func_start sub_8158610
sub_8158610: @ 8158610 sub_8158610: @ 8158610
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8158610 thumb_func_end sub_8158610
@@ -4648,7 +4648,7 @@ _08158744: .4byte sub_8156DCC
thumb_func_start sub_8158748 thumb_func_start sub_8158748
sub_8158748: @ 8158748 sub_8158748: @ 8158748
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8158748 thumb_func_end sub_8158748
@@ -4740,7 +4740,7 @@ _08158804: .4byte sub_8156484
thumb_func_start sub_8158808 thumb_func_start sub_8158808
sub_8158808: @ 8158808 sub_8158808: @ 8158808
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8158808 thumb_func_end sub_8158808
@@ -4849,7 +4849,7 @@ sub_8158814: @ 8158814
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0 cmp r3, 0
beq _0815890C beq _0815890C
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
b _0815892A b _0815892A
.align 2, 0 .align 2, 0
_081588E8: .4byte gUnknown_2022BC4 _081588E8: .4byte gUnknown_2022BC4
@@ -4966,7 +4966,7 @@ _081589C6:
movs r0, 0 movs r0, 0
bl sub_8035450 bl sub_8035450
adds r0, r4, 0 adds r0, r4, 0
bl sub_807259C bl DoMoveAnim
ldr r0, [r7] ldr r0, [r7]
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -5042,7 +5042,7 @@ _08158A40:
lsls r0, 2 lsls r0, 2
adds r0, r2 adds r0, r2
strb r4, [r0, 0x4] strb r4, [r0, 0x4]
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08158A7C: _08158A7C:
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3
@@ -5118,7 +5118,7 @@ sub_8158AFC: @ 8158AFC
.align 2, 0 .align 2, 0
_08158B14: .4byte gUnknown_2023BC4 _08158B14: .4byte gUnknown_2023BC4
_08158B18: _08158B18:
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_08158B1C: _08158B1C:
pop {r0} pop {r0}
bx r0 bx r0
@@ -5180,7 +5180,7 @@ sub_8158B60: @ 8158B60
_08158B8E: _08158B8E:
lsls r0, r4, 24 lsls r0, r4, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x3 cmp r4, 0x3
ble _08158B8E ble _08158B8E
@@ -5190,9 +5190,9 @@ _08158B8E:
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_8030A54 bl ActionSelectionCreateCursorAt
ldr r0, _08158BD4 @ =gUnknown_83FE6D5 ldr r0, _08158BD4 @ =gUnknown_83FE6D5
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _08158BD8 @ =gUnknown_202298C ldr r0, _08158BD8 @ =gUnknown_202298C
movs r1, 0x1 movs r1, 0x1
bl sub_80D87BC bl sub_80D87BC
@@ -5225,7 +5225,7 @@ _08158BF4: .4byte sub_8156140
thumb_func_start sub_8158BF8 thumb_func_start sub_8158BF8
sub_8158BF8: @ 8158BF8 sub_8158BF8: @ 8158BF8
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8158BF8 thumb_func_end sub_8158BF8
@@ -5452,7 +5452,7 @@ _08158DC8: .4byte gUnknown_2024004
thumb_func_start sub_8158DCC thumb_func_start sub_8158DCC
sub_8158DCC: @ 8158DCC sub_8158DCC: @ 8158DCC
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8158DCC thumb_func_end sub_8158DCC
@@ -5590,7 +5590,7 @@ sub_8158ED0: @ 8158ED0
bl GetMonData bl GetMonData
cmp r0, 0x63 cmp r0, 0x63
bls _08158F08 bls _08158F08
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
b _08158F54 b _08158F54
.align 2, 0 .align 2, 0
_08158EFC: .4byte gUnknown_2022BC4 _08158EFC: .4byte gUnknown_2022BC4
@@ -5824,7 +5824,7 @@ _081590BC:
movs r1, 0x37 movs r1, 0x37
mov r2, sp mov r2, sp
bl sub_804037C bl sub_804037C
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
add sp, 0x4 add sp, 0x4
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -5839,7 +5839,7 @@ _081590FC: .4byte gUnknown_2023BC4
thumb_func_start sub_8159100 thumb_func_start sub_8159100
sub_8159100: @ 8159100 sub_8159100: @ 8159100
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8159100 thumb_func_end sub_8159100
@@ -5847,7 +5847,7 @@ sub_8159100: @ 8159100
thumb_func_start sub_815910C thumb_func_start sub_815910C
sub_815910C: @ 815910C sub_815910C: @ 815910C
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_815910C thumb_func_end sub_815910C
@@ -5855,7 +5855,7 @@ sub_815910C: @ 815910C
thumb_func_start sub_8159118 thumb_func_start sub_8159118
sub_8159118: @ 8159118 sub_8159118: @ 8159118
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8159118 thumb_func_end sub_8159118
@@ -5863,7 +5863,7 @@ sub_8159118: @ 8159118
thumb_func_start sub_8159124 thumb_func_start sub_8159124
sub_8159124: @ 8159124 sub_8159124: @ 8159124
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8159124 thumb_func_end sub_8159124
@@ -5871,7 +5871,7 @@ sub_8159124: @ 8159124
thumb_func_start sub_8159130 thumb_func_start sub_8159130
sub_8159130: @ 8159130 sub_8159130: @ 8159130
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8159130 thumb_func_end sub_8159130
@@ -5879,7 +5879,7 @@ sub_8159130: @ 8159130
thumb_func_start sub_815913C thumb_func_start sub_815913C
sub_815913C: @ 815913C sub_815913C: @ 815913C
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_815913C thumb_func_end sub_815913C
@@ -5887,7 +5887,7 @@ sub_815913C: @ 815913C
thumb_func_start sub_8159148 thumb_func_start sub_8159148
sub_8159148: @ 8159148 sub_8159148: @ 8159148
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8159148 thumb_func_end sub_8159148
@@ -5895,7 +5895,7 @@ sub_8159148: @ 8159148
thumb_func_start sub_8159154 thumb_func_start sub_8159154
sub_8159154: @ 8159154 sub_8159154: @ 8159154
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8159154 thumb_func_end sub_8159154
@@ -5903,7 +5903,7 @@ sub_8159154: @ 8159154
thumb_func_start sub_8159160 thumb_func_start sub_8159160
sub_8159160: @ 8159160 sub_8159160: @ 8159160
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8159160 thumb_func_end sub_8159160
@@ -5911,7 +5911,7 @@ sub_8159160: @ 8159160
thumb_func_start sub_815916C thumb_func_start sub_815916C
sub_815916C: @ 815916C sub_815916C: @ 815916C
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_815916C thumb_func_end sub_815916C
@@ -5919,7 +5919,7 @@ sub_815916C: @ 815916C
thumb_func_start sub_8159178 thumb_func_start sub_8159178
sub_8159178: @ 8159178 sub_8159178: @ 8159178
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8159178 thumb_func_end sub_8159178
@@ -5927,7 +5927,7 @@ sub_8159178: @ 8159178
thumb_func_start sub_8159184 thumb_func_start sub_8159184
sub_8159184: @ 8159184 sub_8159184: @ 8159184
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8159184 thumb_func_end sub_8159184
@@ -5950,7 +5950,7 @@ sub_8159190: @ 8159190
lsls r0, 29 lsls r0, 29
cmp r0, 0 cmp r0, 0
bge _081591C4 bge _081591C4
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
b _081591EE b _081591EE
.align 2, 0 .align 2, 0
_081591B8: .4byte gUnknown_202063C _081591B8: .4byte gUnknown_202063C
@@ -5990,7 +5990,7 @@ _081591FC: .4byte sub_8156F00
thumb_func_start sub_8159200 thumb_func_start sub_8159200
sub_8159200: @ 8159200 sub_8159200: @ 8159200
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8159200 thumb_func_end sub_8159200
@@ -6011,7 +6011,7 @@ sub_815920C: @ 815920C
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
bl sub_80722CC bl sub_80722CC
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -6035,7 +6035,7 @@ sub_815923C: @ 815923C
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
bl PlayFanfare bl PlayFanfare
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -6082,7 +6082,7 @@ _081592AC:
lsrs r0, 16 lsrs r0, 16
movs r1, 0x19 movs r1, 0x19
bl PlayCry1 bl PlayCry1
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -6107,7 +6107,7 @@ sub_81592D0: @ 81592D0
movs r1, 0x1 movs r1, 0x1
orrs r0, r1 orrs r0, r1
strh r0, [r2] strh r0, [r2]
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -6346,7 +6346,7 @@ sub_8159478: @ 8159478
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
adds r0, r6, 0 adds r0, r6, 0
bl sub_80748A8 bl GetBankSpriteDefault_Y
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -6531,7 +6531,7 @@ sub_8159660: @ 8159660
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08159690 bne _08159690
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
b _081596CE b _081596CE
.align 2, 0 .align 2, 0
_08159688: .4byte gUnknown_2022BC4 _08159688: .4byte gUnknown_2022BC4
@@ -6565,7 +6565,7 @@ _08159690:
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r2 adds r1, r2
strb r0, [r1] strb r0, [r1]
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
_081596CE: _081596CE:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -6580,7 +6580,7 @@ _081596E0: .4byte gUnknown_2024000
thumb_func_start sub_81596E4 thumb_func_start sub_81596E4
sub_81596E4: @ 81596E4 sub_81596E4: @ 81596E4
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_81596E4 thumb_func_end sub_81596E4
@@ -6595,7 +6595,7 @@ sub_81596F0: @ 81596F0
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl dp11b_obj_free bl dp11b_obj_free
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -6606,7 +6606,7 @@ _08159710: .4byte gUnknown_2023BC4
thumb_func_start sub_8159714 thumb_func_start sub_8159714
sub_8159714: @ 8159714 sub_8159714: @ 8159714
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8159714 thumb_func_end sub_8159714
@@ -6637,7 +6637,7 @@ sub_8159720: @ 8159720
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08159760 beq _08159760
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
b _0815976C b _0815976C
.align 2, 0 .align 2, 0
_08159758: .4byte gUnknown_2022BC4 _08159758: .4byte gUnknown_2022BC4
@@ -6680,7 +6680,7 @@ sub_815977C: @ 815977C
movs r1, 0 movs r1, 0
bl dp11b_obj_free bl dp11b_obj_free
_081597A4: _081597A4:
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -6692,7 +6692,7 @@ _081597B4: .4byte gUnknown_2023BC4
thumb_func_start sub_81597B8 thumb_func_start sub_81597B8
sub_81597B8: @ 81597B8 sub_81597B8: @ 81597B8
push {lr} push {lr}
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_81597B8 thumb_func_end sub_81597B8
@@ -6713,7 +6713,7 @@ sub_81597C4: @ 81597C4
bl FadeOutMapMusic bl FadeOutMapMusic
movs r0, 0x3 movs r0, 0x3
bl BeginFastPaletteFade bl BeginFastPaletteFade
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
ldr r0, _08159814 @ =gUnknown_2022B4C ldr r0, _08159814 @ =gUnknown_2022B4C
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x6 movs r1, 0x6
@@ -6847,7 +6847,7 @@ _081598E6:
movs r2, 0 movs r2, 0
bl EmitTwoReturnValues bl EmitTwoReturnValues
_081598F0: _081598F0:
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
ldr r3, _08159924 @ =gUnknown_3005EE0 ldr r3, _08159924 @ =gUnknown_3005EE0
ldr r2, _08159928 @ =gUnknown_2023BC4 ldr r2, _08159928 @ =gUnknown_2023BC4
ldrb r0, [r2] ldrb r0, [r2]
@@ -6890,7 +6890,7 @@ _0815992C:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r2, r1, r5 adds r2, r1, r5
lsls r0, r1, 2 lsls r0, r1, 2
@@ -6906,7 +6906,7 @@ _0815992C:
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_8030A54 bl ActionSelectionCreateCursorAt
_08159972: _08159972:
ldr r1, _08159990 @ =gUnknown_3005EE0 ldr r1, _08159990 @ =gUnknown_3005EE0
ldr r0, _08159994 @ =gUnknown_2023BC4 ldr r0, _08159994 @ =gUnknown_2023BC4
@@ -6985,7 +6985,7 @@ _081599DE:
movs r0, 0x1 movs r0, 0x1
movs r1, 0xA movs r1, 0xA
bl EmitTwoReturnValues bl EmitTwoReturnValues
bl sub_8157084 bl PlayerPartnerBufferExecCompleted
ldrb r0, [r6] ldrb r0, [r6]
lsls r0, 2 lsls r0, 2
add r0, r8 add r0, r8
@@ -7027,7 +7027,7 @@ _08159A48:
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A14 bl MoveSelectionDestroyCursorAt
ldrb r1, [r6] ldrb r1, [r6]
adds r2, r1, r5 adds r2, r1, r5
lsls r0, r1, 2 lsls r0, r1, 2
@@ -7043,7 +7043,7 @@ _08159A48:
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80309CC bl MoveSelectionCreateCursorAt
_08159A8E: _08159A8E:
ldr r1, _08159AB0 @ =gUnknown_3005EE0 ldr r1, _08159AB0 @ =gUnknown_3005EE0
ldr r0, _08159AB4 @ =gUnknown_2023BC4 ldr r0, _08159AB4 @ =gUnknown_2023BC4
@@ -7266,7 +7266,7 @@ _08159C44:
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
bl sub_8159EF0 bl sub_8159EF0
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _08159C60 @ =gUnknown_202298C ldr r0, _08159C60 @ =gUnknown_202298C
movs r1, 0x18 movs r1, 0x18
bl sub_80D87BC bl sub_80D87BC
@@ -7276,7 +7276,7 @@ _08159C5C: .4byte gUnknown_2022976
_08159C60: .4byte gUnknown_202298C _08159C60: .4byte gUnknown_202298C
_08159C64: _08159C64:
movs r0, 0x18 movs r0, 0x18
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
cmp r4, 0 cmp r4, 0
@@ -7467,7 +7467,7 @@ _08159DEA:
_08159DF0: .4byte gUnknown_2037AB8 _08159DF0: .4byte gUnknown_2037AB8
_08159DF4: _08159DF4:
bl sub_8159EF0 bl sub_8159EF0
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _08159E08 @ =gUnknown_202298C ldr r0, _08159E08 @ =gUnknown_202298C
movs r1, 0x18 movs r1, 0x18
bl sub_80D87BC bl sub_80D87BC
@@ -7476,7 +7476,7 @@ _08159DF4:
_08159E08: .4byte gUnknown_202298C _08159E08: .4byte gUnknown_202298C
_08159E0C: _08159E0C:
movs r0, 0x18 movs r0, 0x18
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
cmp r4, 0 cmp r4, 0
asm/battle_controller_safari.s
+16 -16
View File
@@ -142,7 +142,7 @@ _080DD612:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -170,7 +170,7 @@ _080DD650:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -198,7 +198,7 @@ _080DD68C:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -210,7 +210,7 @@ _080DD6BE:
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_8030A54 bl ActionSelectionCreateCursorAt
b _080DD71A b _080DD71A
.align 2, 0 .align 2, 0
_080DD6D0: .4byte gUnknown_2023FF8 _080DD6D0: .4byte gUnknown_2023FF8
@@ -234,7 +234,7 @@ _080DD6D8:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r5 adds r1, r5
ldrb r0, [r1] ldrb r0, [r1]
@@ -245,7 +245,7 @@ _080DD6D8:
adds r0, r5 adds r0, r5
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_8030A54 bl ActionSelectionCreateCursorAt
_080DD71A: _080DD71A:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -288,7 +288,7 @@ _080DD75C: .4byte nullsub_8
CompleteOnInactiveTextPrinter_3: @ 80DD760 CompleteOnInactiveTextPrinter_3: @ 80DD760
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080DD772 bne _080DD772
@@ -969,7 +969,7 @@ sub_80DDC78: @ 80DDC78
_080DDC9A: _080DDC9A:
lsls r0, r4, 24 lsls r0, r4, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8030A98 bl ActionSelectionDestroyCursorAt
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x3 cmp r4, 0x3
ble _080DDC9A ble _080DDC9A
@@ -979,9 +979,9 @@ _080DDC9A:
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_8030A54 bl ActionSelectionCreateCursorAt
ldr r0, _080DDCE4 @ =gUnknown_83FE6E6 ldr r0, _080DDCE4 @ =gUnknown_83FE6E6
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080DDCE8 @ =gUnknown_202298C ldr r0, _080DDCE8 @ =gUnknown_202298C
movs r1, 0x1 movs r1, 0x1
bl sub_80D87BC bl sub_80D87BC
@@ -1078,8 +1078,8 @@ sub_80DDD68: @ 80DDD68
bx r0 bx r0
thumb_func_end sub_80DDD68 thumb_func_end sub_80DDD68
thumb_func_start sub_80DDD74 thumb_func_start SafariHandleStatusIconUpdate
sub_80DDD74: @ 80DDD74 SafariHandleStatusIconUpdate: @ 80DDD74
push {lr} push {lr}
ldr r0, _080DDDA0 @ =gUnknown_3004FF0 ldr r0, _080DDDA0 @ =gUnknown_3004FF0
ldr r1, _080DDDA4 @ =gUnknown_2023BC4 ldr r1, _080DDDA4 @ =gUnknown_2023BC4
@@ -1104,7 +1104,7 @@ _080DDDA0: .4byte gUnknown_3004FF0
_080DDDA4: .4byte gUnknown_2023BC4 _080DDDA4: .4byte gUnknown_2023BC4
_080DDDA8: .4byte gUnknown_2023BCE _080DDDA8: .4byte gUnknown_2023BCE
_080DDDAC: .4byte gUnknown_2024284 _080DDDAC: .4byte gUnknown_2024284
thumb_func_end sub_80DDD74 thumb_func_end SafariHandleStatusIconUpdate
thumb_func_start sub_80DDDB0 thumb_func_start sub_80DDDB0
sub_80DDDB0: @ 80DDDB0 sub_80DDDB0: @ 80DDDB0
@@ -1234,8 +1234,8 @@ sub_80DDE64: @ 80DDE64
bx r0 bx r0
thumb_func_end sub_80DDE64 thumb_func_end sub_80DDE64
thumb_func_start sub_80DDE70 thumb_func_start SafariHandlePlaySE
sub_80DDE70: @ 80DDE70 SafariHandlePlaySE: @ 80DDE70
push {r4,lr} push {r4,lr}
ldr r4, _080DDEAC @ =gUnknown_2023BC4 ldr r4, _080DDEAC @ =gUnknown_2023BC4
ldrb r0, [r4] ldrb r0, [r4]
@@ -1267,7 +1267,7 @@ _080DDE84:
.align 2, 0 .align 2, 0
_080DDEAC: .4byte gUnknown_2023BC4 _080DDEAC: .4byte gUnknown_2023BC4
_080DDEB0: .4byte gUnknown_2022BC4 _080DDEB0: .4byte gUnknown_2022BC4
thumb_func_end sub_80DDE70 thumb_func_end SafariHandlePlaySE
thumb_func_start sub_80DDEB4 thumb_func_start sub_80DDEB4
sub_80DDEB4: @ 80DDEB4 sub_80DDEB4: @ 80DDEB4
asm/battle_controllers.s
+8 -8
View File
@@ -80,7 +80,7 @@ _0800D298:
ldr r0, _0800D300 @ =gUnknown_2023BC8 ldr r0, _0800D300 @ =gUnknown_2023BC8
movs r4, 0 movs r4, 0
str r4, [r0] str r4, [r0]
bl sub_80724C0 bl ClearBattleAnimationVars
bl sub_8043FBC bl sub_8043FBC
bl sub_80C6D0C bl sub_80C6D0C
ldr r0, _0800D304 @ =gUnknown_2022B54 ldr r0, _0800D304 @ =gUnknown_2022B54
@@ -1519,7 +1519,7 @@ _0800DE16:
lsls r0, r1, 24 lsls r0, r1, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
_0800DE1C: _0800DE1C:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r4, r0 cmp r4, r0
@@ -3353,8 +3353,8 @@ sub_800EB54: @ 800EB54
_0800EB70: .4byte gUnknown_2022874 _0800EB70: .4byte gUnknown_2022874
thumb_func_end sub_800EB54 thumb_func_end sub_800EB54
thumb_func_start sub_800EB74 thumb_func_start EmitResetActionMoveSelection
sub_800EB74: @ 800EB74 EmitResetActionMoveSelection: @ 800EB74
push {lr} push {lr}
adds r3, r1, 0 adds r3, r1, 0
lsls r0, 24 lsls r0, 24
@@ -3369,10 +3369,10 @@ sub_800EB74: @ 800EB74
bx r0 bx r0
.align 2, 0 .align 2, 0
_0800EB90: .4byte gUnknown_2022874 _0800EB90: .4byte gUnknown_2022874
thumb_func_end sub_800EB74 thumb_func_end EmitResetActionMoveSelection
thumb_func_start sub_800EB94 thumb_func_start EmitCmd55
sub_800EB94: @ 800EB94 EmitCmd55: @ 800EB94
push {lr} push {lr}
adds r3, r1, 0 adds r3, r1, 0
lsls r0, 24 lsls r0, 24
@@ -3387,6 +3387,6 @@ sub_800EB94: @ 800EB94
bx r0 bx r0
.align 2, 0 .align 2, 0
_0800EBB0: .4byte gUnknown_2022874 _0800EBB0: .4byte gUnknown_2022874
thumb_func_end sub_800EB94 thumb_func_end EmitCmd55
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/battle_dome_cards.s
+1 -1
View File
@@ -666,7 +666,7 @@ sub_810C050: @ 810C050
lsrs r6, r3, 24 lsrs r6, r3, 24
adds r0, r2, 0 adds r0, r2, 0
movs r1, 0x7 movs r1, 0x7
bl sub_8004950 bl GetWindowAttribute
adds r3, r0, 0 adds r3, r0, 0
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
asm/battle_gfx_sfx_util.s
+11 -11
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_8033DB8 thumb_func_start AllocateBattleSpritesData
sub_8033DB8: @ 8033DB8 AllocateBattleSpritesData: @ 8033DB8
push {r4,lr} push {r4,lr}
ldr r4, _08033DF4 @ =gUnknown_2024018 ldr r4, _08033DF4 @ =gUnknown_2024018
movs r0, 0x10 movs r0, 0x10
@@ -33,10 +33,10 @@ sub_8033DB8: @ 8033DB8
bx r0 bx r0
.align 2, 0 .align 2, 0
_08033DF4: .4byte gUnknown_2024018 _08033DF4: .4byte gUnknown_2024018
thumb_func_end sub_8033DB8 thumb_func_end AllocateBattleSpritesData
thumb_func_start sub_8033DF8 thumb_func_start FreeBattleSpritesData
sub_8033DF8: @ 8033DF8 FreeBattleSpritesData: @ 8033DF8
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, _08033E38 @ =gUnknown_2024018 ldr r5, _08033E38 @ =gUnknown_2024018
ldr r0, [r5] ldr r0, [r5]
@@ -67,7 +67,7 @@ _08033E32:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08033E38: .4byte gUnknown_2024018 _08033E38: .4byte gUnknown_2024018
thumb_func_end sub_8033DF8 thumb_func_end FreeBattleSpritesData
thumb_func_start sub_8033E3C thumb_func_start sub_8033E3C
sub_8033E3C: @ 8033E3C sub_8033E3C: @ 8033E3C
@@ -1913,7 +1913,7 @@ _08034C16:
adds r0, r7, 0 adds r0, r7, 0
bl Free bl Free
mov r0, r9 mov r0, r9
bl sub_80748A8 bl GetBankSpriteDefault_Y
ldrb r2, [r4] ldrb r2, [r4]
lsls r1, r2, 4 lsls r1, r2, 4
adds r1, r2 adds r1, r2
@@ -2037,7 +2037,7 @@ _08034D88:
bl CpuSet bl CpuSet
_08034E0E: _08034E0E:
mov r0, r9 mov r0, r9
bl sub_80748A8 bl GetBankSpriteDefault_Y
ldrb r2, [r5] ldrb r2, [r5]
lsls r1, r2, 4 lsls r1, r2, 4
adds r1, r2 adds r1, r2
@@ -2284,7 +2284,7 @@ _08034FFC:
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r4] strb r0, [r4]
mov r0, r9 mov r0, r9
bl sub_80748A8 bl GetBankSpriteDefault_Y
ldr r1, [sp, 0x10] ldr r1, [sp, 0x10]
ldrb r2, [r1] ldrb r2, [r1]
lsls r1, r2, 4 lsls r1, r2, 4
@@ -2473,14 +2473,14 @@ LoadBattleMonGfxAndAnimate: @ 80351A8
cmp r5, 0 cmp r5, 0
bne _080351EC bne _080351EC
adds r0, r6, 0 adds r0, r6, 0
bl sub_80748BC bl GetSubstituteSpriteDefault_Y
b _080351F2 b _080351F2
.align 2, 0 .align 2, 0
_080351E4: .4byte gUnknown_202063C _080351E4: .4byte gUnknown_202063C
_080351E8: .4byte gUnknown_2024024 _080351E8: .4byte gUnknown_2024024
_080351EC: _080351EC:
adds r0, r6, 0 adds r0, r6, 0
bl sub_80748A8 bl GetBankSpriteDefault_Y
_080351F2: _080351F2:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
asm/battle_interface.s
+3 -3
View File
@@ -5524,7 +5524,7 @@ AddTextPrinterAndCreateWindowOnHealthbox: @ 804A648
str r0, [sp, 0x18] str r0, [sp, 0x18]
str r1, [sp, 0x1C] str r1, [sp, 0x1C]
add r0, sp, 0x18 add r0, sp, 0x18
bl sub_8003CE4 bl AddWindow
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 16 lsls r4, 16
lsrs r4, 16 lsrs r4, 16
@@ -5559,12 +5559,12 @@ AddTextPrinterAndCreateWindowOnHealthbox: @ 804A648
movs r1, 0 movs r1, 0
adds r2, r6, 0 adds r2, r6, 0
mov r3, r8 mov r3, r8
bl sub_812E5A4 bl AddTextPrinterParametrized2
mov r0, r10 mov r0, r10
str r4, [r0] str r4, [r0]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x7 movs r1, 0x7
bl sub_8004950 bl GetWindowAttribute
add sp, 0x20 add sp, 0x20
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
asm/battle_message.s
+15 -15
View File
@@ -690,7 +690,7 @@ _080D77D0:
ldr r7, [r0] ldr r7, [r0]
_080D77DC: _080D77DC:
adds r0, r7, 0 adds r0, r7, 0
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
_080D77E2: _080D77E2:
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
@@ -703,8 +703,8 @@ _080D77E2:
_080D77F0: .4byte gUnknown_83FDF3C _080D77F0: .4byte gUnknown_83FDF3C
thumb_func_end sub_80D7274 thumb_func_end sub_80D7274
thumb_func_start sub_80D77F4 thumb_func_start BattleStringExpandPlaceholdersToDisplayedString
sub_80D77F4: @ 80D77F4 BattleStringExpandPlaceholdersToDisplayedString: @ 80D77F4
push {lr} push {lr}
ldr r1, _080D7800 @ =gUnknown_202298C ldr r1, _080D7800 @ =gUnknown_202298C
bl sub_80D7868 bl sub_80D7868
@@ -712,10 +712,10 @@ sub_80D77F4: @ 80D77F4
bx r1 bx r1
.align 2, 0 .align 2, 0
_080D7800: .4byte gUnknown_202298C _080D7800: .4byte gUnknown_202298C
thumb_func_end sub_80D77F4 thumb_func_end BattleStringExpandPlaceholdersToDisplayedString
thumb_func_start sub_80D7804 thumb_func_start TryGetStatusString
sub_80D7804: @ 80D7804 TryGetStatusString: @ 80D7804
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
adds r4, r0, 0 adds r4, r0, 0
@@ -768,7 +768,7 @@ _080D785E:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80D7804 thumb_func_end TryGetStatusString
thumb_func_start sub_80D7868 thumb_func_start sub_80D7868
sub_80D7868: @ 80D7868 sub_80D7868: @ 80D7868
@@ -871,7 +871,7 @@ _080D7984: .4byte gUnknown_2022AB8
_080D7988: .4byte gUnknown_2021CD0 _080D7988: .4byte gUnknown_2021CD0
_080D798C: _080D798C:
adds r0, r5, 0 adds r0, r5, 0
bl sub_80D7804 bl TryGetStatusString
adds r4, r0, 0 adds r4, r0, 0
cmp r4, 0 cmp r4, 0
beq _080D799C beq _080D799C
@@ -2937,8 +2937,8 @@ _080D89D6:
bx r1 bx r1
thumb_func_end sub_80D89B0 thumb_func_end sub_80D89B0
thumb_func_start sub_80D89DC thumb_func_start SetPpNumbersPaletteInMoveSelection
sub_80D89DC: @ 80D89DC SetPpNumbersPaletteInMoveSelection: @ 80D89DC
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, _080D8A38 @ =gUnknown_2023BC4 ldr r0, _080D8A38 @ =gUnknown_2023BC4
ldrb r2, [r0] ldrb r2, [r0]
@@ -2956,7 +2956,7 @@ sub_80D89DC: @ 80D89DC
adds r1, 0xC adds r1, 0xC
adds r1, r2 adds r1, r2
ldrb r1, [r1] ldrb r1, [r1]
bl sub_80D8A50 bl GetCurrentPpToMaxPpState
lsls r0, 24 lsls r0, 24
ldr r5, _080D8A48 @ =gUnknown_20371F8 ldr r5, _080D8A48 @ =gUnknown_20371F8
lsrs r0, 22 lsrs r0, 22
@@ -2988,10 +2988,10 @@ _080D8A40: .4byte gUnknown_8D2FBB4
_080D8A44: .4byte gUnknown_2023FFC _080D8A44: .4byte gUnknown_2023FFC
_080D8A48: .4byte gUnknown_20371F8 _080D8A48: .4byte gUnknown_20371F8
_080D8A4C: .4byte gUnknown_20376B0 _080D8A4C: .4byte gUnknown_20376B0
thumb_func_end sub_80D89DC thumb_func_end SetPpNumbersPaletteInMoveSelection
thumb_func_start sub_80D8A50 thumb_func_start GetCurrentPpToMaxPpState
sub_80D8A50: @ 80D8A50 GetCurrentPpToMaxPpState: @ 80D8A50
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
@@ -3038,6 +3038,6 @@ _080D8A98:
_080D8A9A: _080D8A9A:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80D8A50 thumb_func_end GetCurrentPpToMaxPpState
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/battle_records.s
+14 -14
View File
@@ -101,7 +101,7 @@ _080CD2E2:
b _080CD324 b _080CD324
_080CD302: _080CD302:
ldr r0, _080CD310 @ =gUnknown_83F6C68 ldr r0, _080CD310 @ =gUnknown_83F6C68
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
b _080CD324 b _080CD324
.align 2, 0 .align 2, 0
@@ -777,12 +777,12 @@ _080CD836:
movs r4, 0x19 movs r4, 0x19
_080CD838: _080CD838:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8054EC4 bl GetGameStat
ldr r1, _080CD850 @ =0x0000270e ldr r1, _080CD850 @ =0x0000270e
cmp r0, r1 cmp r0, r1
bhi _080CD84A bhi _080CD84A
adds r0, r4, 0 adds r0, r4, 0
bl sub_8054E90 bl IncrementGameStat
_080CD84A: _080CD84A:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -1007,13 +1007,13 @@ sub_80CD9F4: @ 80CD9F4
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x14 sub sp, 0x14
movs r0, 0x17 movs r0, 0x17
bl sub_8054EC4 bl GetGameStat
adds r4, r0, 0 adds r4, r0, 0
movs r0, 0x18 movs r0, 0x18
bl sub_8054EC4 bl GetGameStat
adds r5, r0, 0 adds r5, r0, 0
movs r0, 0x19 movs r0, 0x19
bl sub_8054EC4 bl GetGameStat
adds r6, r0, 0 adds r6, r0, 0
ldr r0, _080CDAB0 @ =0x0000270f ldr r0, _080CDAB0 @ =0x0000270f
cmp r4, r0 cmp r4, r0
@@ -1080,7 +1080,7 @@ _080CDA72:
bls _080CDA54 bls _080CDA54
adds r0, r7, 0 adds r0, r7, 0
mov r1, r12 mov r1, r12
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
movs r1, 0x2 movs r1, 0x2
@@ -1092,7 +1092,7 @@ _080CDA72:
movs r1, 0x2 movs r1, 0x2
movs r2, 0xC movs r2, 0xC
movs r3, 0x18 movs r3, 0x18
bl sub_812E5A4 bl AddTextPrinterParametrized2
add sp, 0x14 add sp, 0x14
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -1138,7 +1138,7 @@ sub_80CDAD0: @ 80CDAD0
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
mov r3, r8 mov r3, r8
bl sub_812E5A4 bl AddTextPrinterParametrized2
movs r6, 0 movs r6, 0
_080CDB0E: _080CDB0E:
movs r4, 0x54 movs r4, 0x54
@@ -1161,7 +1161,7 @@ _080CDB1C:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
mov r3, r8 mov r3, r8
bl sub_812E5A4 bl AddTextPrinterParametrized2
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -1230,7 +1230,7 @@ _080CDBA6:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
mov r3, r8 mov r3, r8
bl sub_812E5A4 bl AddTextPrinterParametrized2
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -1268,7 +1268,7 @@ sub_80CDBE4: @ 80CDBE4
ldr r5, _080CDC9C @ =gUnknown_2021D18 ldr r5, _080CDC9C @ =gUnknown_2021D18
ldr r1, _080CDCA0 @ =gUnknown_8418174 ldr r1, _080CDCA0 @ =gUnknown_8418174
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r2, 0x1 movs r2, 0x1
negs r2, r2 negs r2, r2
movs r0, 0x2 movs r0, 0x2
@@ -1291,7 +1291,7 @@ sub_80CDBE4: @ 80CDBE4
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0x4 movs r3, 0x4
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldr r5, _080CDCA8 @ =gUnknown_300500C ldr r5, _080CDCA8 @ =gUnknown_300500C
ldr r0, [r5] ldr r0, [r5]
ldr r1, _080CDCAC @ =0x00000a98 ldr r1, _080CDCAC @ =0x00000a98
@@ -1309,7 +1309,7 @@ sub_80CDBE4: @ 80CDBE4
movs r1, 0x2 movs r1, 0x2
movs r2, 0x54 movs r2, 0x54
movs r3, 0x30 movs r3, 0x30
bl sub_812E5A4 bl AddTextPrinterParametrized2
adds r7, r5, 0 adds r7, r5, 0
movs r5, 0xF4 movs r5, 0xF4
lsls r5, 22 lsls r5, 22
asm/battle_script_commands.s
+27 -27
View File
@@ -1288,8 +1288,8 @@ _0801E1C2:
_0801E1D4: .4byte gUnknown_2023E82 _0801E1D4: .4byte gUnknown_2023E82
thumb_func_end sub_801DDC4 thumb_func_end sub_801DDC4
thumb_func_start sub_801E1D8 thumb_func_start atk02_attackstring
sub_801E1D8: @ 801E1D8 atk02_attackstring: @ 801E1D8
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, _0801E218 @ =gUnknown_2023BC8 ldr r0, _0801E218 @ =gUnknown_2023BC8
ldr r5, [r0] ldr r5, [r0]
@@ -1328,10 +1328,10 @@ _0801E21C: .4byte gUnknown_2023DD0
_0801E220: .4byte gUnknown_2023D6B _0801E220: .4byte gUnknown_2023D6B
_0801E224: .4byte gUnknown_2023D74 _0801E224: .4byte gUnknown_2023D74
_0801E228: .4byte gUnknown_2023E82 _0801E228: .4byte gUnknown_2023E82
thumb_func_end sub_801E1D8 thumb_func_end atk02_attackstring
thumb_func_start sub_801E22C thumb_func_start atk03_ppreduce
sub_801E22C: @ 801E22C atk03_ppreduce: @ 801E22C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -1561,7 +1561,7 @@ _0801E3F8: .4byte gUnknown_2023BC4
_0801E3FC: .4byte gUnknown_2023DD0 _0801E3FC: .4byte gUnknown_2023DD0
_0801E400: .4byte 0xfffff7ff _0801E400: .4byte 0xfffff7ff
_0801E404: .4byte gUnknown_2023D74 _0801E404: .4byte gUnknown_2023D74
thumb_func_end sub_801E22C thumb_func_end atk03_ppreduce
thumb_func_start sub_801E408 thumb_func_start sub_801E408
sub_801E408: @ 801E408 sub_801E408: @ 801E408
@@ -8928,7 +8928,7 @@ _08021EB6:
muls r1, r2 muls r1, r2
adds r1, r3 adds r1, r3
ldrh r1, [r1] ldrh r1, [r1]
bl sub_8043890 bl MonGainEVs
_08021F4C: _08021F4C:
ldr r0, _08021F5C @ =gUnknown_2023FE8 ldr r0, _08021F5C @ =gUnknown_2023FE8
ldr r1, [r0] ldr r1, [r0]
@@ -15314,7 +15314,7 @@ atk57: @ 80251C4
ldr r0, _080251F4 @ =gUnknown_2023E8A ldr r0, _080251F4 @ =gUnknown_2023E8A
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0 movs r0, 0
bl sub_800EB94 bl EmitCmd55
ldrb r0, [r4] ldrb r0, [r4]
bl MarkBufferBankForExecution bl MarkBufferBankForExecution
ldr r1, _080251F8 @ =gUnknown_2023D74 ldr r1, _080251F8 @ =gUnknown_2023D74
@@ -16510,7 +16510,7 @@ atk60_incrementgamestat: @ 8025B74
ldr r0, _08025BA0 @ =gUnknown_2023D74 ldr r0, _08025BA0 @ =gUnknown_2023D74
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
bl sub_8054E90 bl IncrementGameStat
_08025B8E: _08025B8E:
ldr r1, _08025BA0 @ =gUnknown_2023D74 ldr r1, _08025BA0 @ =gUnknown_2023D74
ldr r0, [r1] ldr r0, [r1]
@@ -18491,7 +18491,7 @@ _08026B78:
_08026B84: .4byte gUnknown_2023D6C _08026B84: .4byte gUnknown_2023D6C
_08026B88: .4byte gUnknown_2023BC4 _08026B88: .4byte gUnknown_2023BC4
_08026B8C: _08026B8C:
bl sub_8013D54 bl IsRunningFromBattleImpossible
ldr r1, _08026B98 @ =gUnknown_2023E82 ldr r1, _08026B98 @ =gUnknown_2023E82
strb r0, [r1] strb r0, [r1]
b _08026F4E b _08026F4E
@@ -23623,7 +23623,7 @@ _08029442:
strb r0, [r1] strb r0, [r1]
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
bl sub_800EB74 bl EmitResetActionMoveSelection
mov r2, r8 mov r2, r8
ldrb r0, [r2] ldrb r0, [r2]
bl MarkBufferBankForExecution bl MarkBufferBankForExecution
@@ -28073,8 +28073,8 @@ _0802B76C: .4byte gUnknown_2023FE8
_0802B770: .4byte gUnknown_2023D74 _0802B770: .4byte gUnknown_2023D74
thumb_func_end sub_802B678 thumb_func_end sub_802B678
thumb_func_start sub_802B774 thumb_func_start atkC2_selectfirstvalidtarget
sub_802B774: @ 802B774 atkC2_selectfirstvalidtarget: @ 802B774
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -28131,10 +28131,10 @@ _0802B7D8: .4byte gUnknown_2023D74
_0802B7DC: .4byte gUnknown_2023D6B _0802B7DC: .4byte gUnknown_2023D6B
_0802B7E0: .4byte gUnknown_825E45C _0802B7E0: .4byte gUnknown_825E45C
_0802B7E4: .4byte gUnknown_2023D70 _0802B7E4: .4byte gUnknown_2023D70
thumb_func_end sub_802B774 thumb_func_end atkC2_selectfirstvalidtarget
thumb_func_start sub_802B7E8 thumb_func_start atkC3_trysetfutureattack
sub_802B7E8: @ 802B7E8 atkC3_trysetfutureattack: @ 802B7E8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -28275,7 +28275,7 @@ _0802B8F6:
.align 2, 0 .align 2, 0
_0802B908: .4byte gUnknown_2023E82 _0802B908: .4byte gUnknown_2023E82
_0802B90C: .4byte gUnknown_2023D74 _0802B90C: .4byte gUnknown_2023D74
thumb_func_end sub_802B7E8 thumb_func_end atkC3_trysetfutureattack
thumb_func_start atkC4_trydobeatup thumb_func_start atkC4_trydobeatup
atkC4_trydobeatup: @ 802B910 atkC4_trydobeatup: @ 802B910
@@ -31165,7 +31165,7 @@ atkE7_trycastformdatachange: @ 802CF98
cmp r4, 0 cmp r4, 0
beq _0802CFC2 beq _0802CFC2
ldr r0, _0802CFD0 @ =gUnknown_81D92F8 ldr r0, _0802CFD0 @ =gUnknown_81D92F8
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
ldr r0, _0802CFD4 @ =gUnknown_2023FE8 ldr r0, _0802CFD4 @ =gUnknown_2023FE8
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x7F adds r0, 0x7F
@@ -32268,7 +32268,7 @@ _0802D88C:
movs r1, 0x2 movs r1, 0x2
bl GetMonData bl GetMonData
ldr r4, _0802D938 @ =gUnknown_2021D04 ldr r4, _0802D938 @ =gUnknown_2021D04
bl sub_80CC7A8 bl get_unknown_box_id
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl GetBoxNamePtr bl GetBoxNamePtr
@@ -32506,7 +32506,7 @@ _0802DAC0: .4byte 0x05006000
_0802DAC4: .4byte sub_80116F4 _0802DAC4: .4byte sub_80116F4
_0802DAC8: _0802DAC8:
bl sub_800F34C bl sub_800F34C
bl sub_800F420 bl LoadBattleTextboxAndBackground
ldr r1, _0802DADC @ =gUnknown_2022980 ldr r1, _0802DADC @ =gUnknown_2022980
movs r2, 0x80 movs r2, 0x80
lsls r2, 1 lsls r2, 1
@@ -33028,7 +33028,7 @@ _0802DE4E:
movs r0, 0x2 movs r0, 0x2
adds r2, r6, 0 adds r2, r6, 0
adds r3, r5, 0 adds r3, r5, 0
bl sub_809D954 bl DoNamingScreen
ldr r1, _0802DF14 @ =gUnknown_2023E82 ldr r1, _0802DF14 @ =gUnknown_2023E82
ldrb r0, [r1] ldrb r0, [r1]
adds r0, 0x1 adds r0, 0x1
@@ -33120,8 +33120,8 @@ _0802DFA6:
_0802DFB8: .4byte gUnknown_2023D74 _0802DFB8: .4byte gUnknown_2023D74
thumb_func_end sub_802DD38 thumb_func_end sub_802DD38
thumb_func_start sub_802DFBC thumb_func_start atkF4_subattackerhpbydmg
sub_802DFBC: @ 802DFBC atkF4_subattackerhpbydmg: @ 802DFBC
ldr r2, _0802DFDC @ =gUnknown_2023BE4 ldr r2, _0802DFDC @ =gUnknown_2023BE4
ldr r0, _0802DFE0 @ =gUnknown_2023D6B ldr r0, _0802DFE0 @ =gUnknown_2023D6B
ldrb r1, [r0] ldrb r1, [r0]
@@ -33143,10 +33143,10 @@ _0802DFDC: .4byte gUnknown_2023BE4
_0802DFE0: .4byte gUnknown_2023D6B _0802DFE0: .4byte gUnknown_2023D6B
_0802DFE4: .4byte gUnknown_2023D50 _0802DFE4: .4byte gUnknown_2023D50
_0802DFE8: .4byte gUnknown_2023D74 _0802DFE8: .4byte gUnknown_2023D74
thumb_func_end sub_802DFBC thumb_func_end atkF4_subattackerhpbydmg
thumb_func_start sub_802DFEC thumb_func_start atkF5_removeattackerstatus1
sub_802DFEC: @ 802DFEC atkF5_removeattackerstatus1: @ 802DFEC
ldr r1, _0802E008 @ =gUnknown_2023BE4 ldr r1, _0802E008 @ =gUnknown_2023BE4
ldr r0, _0802E00C @ =gUnknown_2023D6B ldr r0, _0802E00C @ =gUnknown_2023D6B
ldrb r2, [r0] ldrb r2, [r0]
@@ -33165,7 +33165,7 @@ sub_802DFEC: @ 802DFEC
_0802E008: .4byte gUnknown_2023BE4 _0802E008: .4byte gUnknown_2023BE4
_0802E00C: .4byte gUnknown_2023D6B _0802E00C: .4byte gUnknown_2023D6B
_0802E010: .4byte gUnknown_2023D74 _0802E010: .4byte gUnknown_2023D74
thumb_func_end sub_802DFEC thumb_func_end atkF5_removeattackerstatus1
thumb_func_start sub_802E014 thumb_func_start sub_802E014
sub_802E014: @ 802E014 sub_802E014: @ 802E014
asm/battle_setup.s
+65 -65
View File
@@ -78,7 +78,7 @@ sub_807F690: @ 807F690
adds r1, r2 adds r1, r2
strh r4, [r1, 0xA] strh r4, [r1, 0xA]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8044090 bl PlayMapChosenOrBattleBGM
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -122,7 +122,7 @@ _0807F6FE:
thumb_func_start sub_807F704 thumb_func_start sub_807F704
sub_807F704: @ 807F704 sub_807F704: @ 807F704
push {lr} push {lr}
bl sub_80A0E90 bl GetSafariZoneFlag
cmp r0, 0 cmp r0, 0
beq _0807F714 beq _0807F714
bl sub_807F7D8 bl sub_807F7D8
@@ -172,9 +172,9 @@ sub_807F748: @ 807F748
movs r1, 0 movs r1, 0
bl sub_807F690 bl sub_807F690
movs r0, 0x7 movs r0, 0x7
bl sub_8054E90 bl IncrementGameStat
movs r0, 0x8 movs r0, 0x8
bl sub_8054E90 bl IncrementGameStat
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -202,9 +202,9 @@ sub_807F78C: @ 807F78C
ldr r1, _0807F7D4 @ =0x00000155 ldr r1, _0807F7D4 @ =0x00000155
bl sub_807F690 bl sub_807F690
movs r0, 0x7 movs r0, 0x7
bl sub_8054E90 bl IncrementGameStat
movs r0, 0x8 movs r0, 0x8
bl sub_8054E90 bl IncrementGameStat
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -262,9 +262,9 @@ sub_807F810: @ 807F810
movs r1, 0x2 movs r1, 0x2
bl sub_804037C bl sub_804037C
movs r0, 0x7 movs r0, 0x7
bl sub_8054E90 bl IncrementGameStat
movs r0, 0x8 movs r0, 0x8
bl sub_8054E90 bl IncrementGameStat
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -284,9 +284,9 @@ sub_807F868: @ 807F868
movs r1, 0 movs r1, 0
bl sub_807F690 bl sub_807F690
movs r0, 0x7 movs r0, 0x7
bl sub_8054E90 bl IncrementGameStat
movs r0, 0x9 movs r0, 0x9
bl sub_8054E90 bl IncrementGameStat
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_807F868 thumb_func_end sub_807F868
@@ -335,9 +335,9 @@ sub_807F8C4: @ 807F8C4
movs r1, 0 movs r1, 0
bl sub_807F690 bl sub_807F690
movs r0, 0x7 movs r0, 0x7
bl sub_8054E90 bl IncrementGameStat
movs r0, 0x8 movs r0, 0x8
bl sub_8054E90 bl IncrementGameStat
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -398,9 +398,9 @@ _0807F960:
movs r1, 0x2 movs r1, 0x2
bl sub_804037C bl sub_804037C
movs r0, 0x7 movs r0, 0x7
bl sub_8054E90 bl IncrementGameStat
movs r0, 0x8 movs r0, 0x8
bl sub_8054E90 bl IncrementGameStat
add sp, 0xC add sp, 0xC
pop {r0} pop {r0}
bx r0 bx r0
@@ -427,9 +427,9 @@ sub_807F998: @ 807F998
movs r1, 0 movs r1, 0
bl sub_807F690 bl sub_807F690
movs r0, 0x7 movs r0, 0x7
bl sub_8054E90 bl IncrementGameStat
movs r0, 0x8 movs r0, 0x8
bl sub_8054E90 bl IncrementGameStat
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -503,9 +503,9 @@ _0807FA4C:
bl sub_807F690 bl sub_807F690
_0807FA56: _0807FA56:
movs r0, 0x7 movs r0, 0x7
bl sub_8054E90 bl IncrementGameStat
movs r0, 0x8 movs r0, 0x8
bl sub_8054E90 bl IncrementGameStat
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_807F9D8 thumb_func_end sub_807F9D8
@@ -542,9 +542,9 @@ _0807FAA0:
bl sub_807F690 bl sub_807F690
_0807FAAA: _0807FAAA:
movs r0, 0x7 movs r0, 0x7
bl sub_8054E90 bl IncrementGameStat
movs r0, 0x8 movs r0, 0x8
bl sub_8054E90 bl IncrementGameStat
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_807FA68 thumb_func_end sub_807FA68
@@ -565,9 +565,9 @@ sub_807FABC: @ 807FABC
movs r0, 0 movs r0, 0
bl sub_807F690 bl sub_807F690
movs r0, 0x7 movs r0, 0x7
bl sub_8054E90 bl IncrementGameStat
movs r0, 0x8 movs r0, 0x8
bl sub_8054E90 bl IncrementGameStat
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -814,7 +814,7 @@ _0807FCF4:
lsls r0, r5, 24 lsls r0, r5, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_8059F88 bl MetatileBehavior_IsMB_0B
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0807FD08 beq _0807FD08
@@ -854,7 +854,7 @@ _0807FD2C:
cmp r0, 0 cmp r0, 0
bne _0807FD70 bne _0807FD70
adds r0, r4, 0 adds r0, r4, 0
bl sub_8059F9C bl MetatileBehavior_IsMountain
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0807FD58 beq _0807FD58
@@ -1308,8 +1308,8 @@ _0808008A:
bx r1 bx r1
thumb_func_end sub_8080060 thumb_func_end sub_8080060
thumb_func_start sub_8080090 thumb_func_start TrainerBattleLoadArg32
sub_8080090: @ 8080090 TrainerBattleLoadArg32: @ 8080090
adds r2, r0, 0 adds r2, r0, 0
ldrb r0, [r2] ldrb r0, [r2]
ldrb r1, [r2, 0x1] ldrb r1, [r2, 0x1]
@@ -1322,26 +1322,26 @@ sub_8080090: @ 8080090
lsls r1, 24 lsls r1, 24
orrs r0, r1 orrs r0, r1
bx lr bx lr
thumb_func_end sub_8080090 thumb_func_end TrainerBattleLoadArg32
thumb_func_start sub_80800A8 thumb_func_start TrainerBattleLoadArg16
sub_80800A8: @ 80800A8 TrainerBattleLoadArg16: @ 80800A8
adds r1, r0, 0 adds r1, r0, 0
ldrb r0, [r1] ldrb r0, [r1]
ldrb r1, [r1, 0x1] ldrb r1, [r1, 0x1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
bx lr bx lr
thumb_func_end sub_80800A8 thumb_func_end TrainerBattleLoadArg16
thumb_func_start sub_80800B4 thumb_func_start TrainerBattleLoadArg8
sub_80800B4: @ 80800B4 TrainerBattleLoadArg8: @ 80800B4
ldrb r0, [r0] ldrb r0, [r0]
bx lr bx lr
thumb_func_end sub_80800B4 thumb_func_end TrainerBattleLoadArg8
thumb_func_start sub_80800B8 thumb_func_start trainerflag_opponent
sub_80800B8: @ 80800B8 trainerflag_opponent: @ 80800B8
ldr r1, _080800CC @ =gUnknown_20386AE ldr r1, _080800CC @ =gUnknown_20386AE
movs r2, 0xA0 movs r2, 0xA0
lsls r2, 3 lsls r2, 3
@@ -1353,7 +1353,7 @@ sub_80800B8: @ 80800B8
bx lr bx lr
.align 2, 0 .align 2, 0
_080800CC: .4byte gUnknown_20386AE _080800CC: .4byte gUnknown_20386AE
thumb_func_end sub_80800B8 thumb_func_end trainerflag_opponent
thumb_func_start sub_80800D0 thumb_func_start sub_80800D0
sub_80800D0: @ 80800D0 sub_80800D0: @ 80800D0
@@ -1425,8 +1425,8 @@ _08080160: .4byte gUnknown_20386C8
_08080164: .4byte gUnknown_20386CC _08080164: .4byte gUnknown_20386CC
thumb_func_end sub_8080110 thumb_func_end sub_8080110
thumb_func_start sub_8080168 thumb_func_start TrainerBattleLoadArgs
sub_8080168: @ 8080168 TrainerBattleLoadArgs: @ 8080168
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -1452,21 +1452,21 @@ _08080184:
.4byte _080801E4 .4byte _080801E4
_080801A0: _080801A0:
adds r0, r5, 0 adds r0, r5, 0
bl sub_80800B4 bl TrainerBattleLoadArg8
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1] strb r0, [r1]
adds r5, 0x1 adds r5, 0x1
b _080801E0 b _080801E0
_080801AE: _080801AE:
adds r0, r5, 0 adds r0, r5, 0
bl sub_80800A8 bl TrainerBattleLoadArg16
ldr r1, [r4] ldr r1, [r4]
strh r0, [r1] strh r0, [r1]
adds r5, 0x2 adds r5, 0x2
b _080801E0 b _080801E0
_080801BC: _080801BC:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8080090 bl TrainerBattleLoadArg32
ldr r1, [r4] ldr r1, [r4]
str r0, [r1] str r0, [r1]
adds r5, 0x4 adds r5, 0x4
@@ -1494,10 +1494,10 @@ _080801E4:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8080168 thumb_func_end TrainerBattleLoadArgs
thumb_func_start sub_80801F0 thumb_func_start battle_80801F0
sub_80801F0: @ 80801F0 battle_80801F0: @ 80801F0
push {lr} push {lr}
ldr r0, _08080218 @ =gUnknown_20386B0 ldr r0, _08080218 @ =gUnknown_20386B0
ldrh r1, [r0] ldrh r1, [r0]
@@ -1522,7 +1522,7 @@ _08080218: .4byte gUnknown_20386B0
_0808021C: .4byte gUnknown_20370D2 _0808021C: .4byte gUnknown_20370D2
_08080220: .4byte gUnknown_3005008 _08080220: .4byte gUnknown_3005008
_08080224: .4byte gUnknown_3005074 _08080224: .4byte gUnknown_3005074
thumb_func_end sub_80801F0 thumb_func_end battle_80801F0
thumb_func_start sub_8080228 thumb_func_start sub_8080228
sub_8080228: @ 8080228 sub_8080228: @ 8080228
@@ -1531,7 +1531,7 @@ sub_8080228: @ 8080228
bl sub_8080110 bl sub_8080110
ldr r4, _08080250 @ =gUnknown_20386AC ldr r4, _08080250 @ =gUnknown_20386AC
adds r0, r5, 0 adds r0, r5, 0
bl sub_80800B4 bl TrainerBattleLoadArg8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4] strh r0, [r4]
@@ -1577,8 +1577,8 @@ _08080294:
ldr r0, _080802A4 @ =gUnknown_83C6A68 ldr r0, _080802A4 @ =gUnknown_83C6A68
_08080296: _08080296:
adds r1, r5, 0 adds r1, r5, 0
bl sub_8080168 bl TrainerBattleLoadArgs
bl sub_80801F0 bl battle_80801F0
ldr r0, _080802A8 @ =gUnknown_81A4EE9 ldr r0, _080802A8 @ =gUnknown_81A4EE9
b _08080326 b _08080326
.align 2, 0 .align 2, 0
@@ -1588,8 +1588,8 @@ _080802AC:
bl sub_811231C bl sub_811231C
ldr r0, _080802CC @ =gUnknown_83C6990 ldr r0, _080802CC @ =gUnknown_83C6990
adds r1, r5, 0 adds r1, r5, 0
bl sub_8080168 bl TrainerBattleLoadArgs
bl sub_80801F0 bl battle_80801F0
ldr r4, _080802D0 @ =gUnknown_20386AE ldr r4, _080802D0 @ =gUnknown_20386AE
ldrh r0, [r4] ldrh r0, [r4]
bl sub_810CE64 bl sub_810CE64
@@ -1604,8 +1604,8 @@ _080802D8:
bl sub_811231C bl sub_811231C
ldr r0, _080802F8 @ =gUnknown_83C6900 ldr r0, _080802F8 @ =gUnknown_83C6900
adds r1, r5, 0 adds r1, r5, 0
bl sub_8080168 bl TrainerBattleLoadArgs
bl sub_80801F0 bl battle_80801F0
ldr r4, _080802FC @ =gUnknown_20386AE ldr r4, _080802FC @ =gUnknown_20386AE
ldrh r0, [r4] ldrh r0, [r4]
bl sub_810CE64 bl sub_810CE64
@@ -1620,7 +1620,7 @@ _08080304:
ldr r0, _08080310 @ =gUnknown_83C6A20 ldr r0, _08080310 @ =gUnknown_83C6A20
_08080306: _08080306:
adds r1, r5, 0 adds r1, r5, 0
bl sub_8080168 bl TrainerBattleLoadArgs
ldr r0, _08080314 @ =gUnknown_81A4F21 ldr r0, _08080314 @ =gUnknown_81A4F21
b _08080326 b _08080326
.align 2, 0 .align 2, 0
@@ -1630,8 +1630,8 @@ _08080318:
ldr r0, _0808032C @ =gUnknown_83C6900 ldr r0, _0808032C @ =gUnknown_83C6900
_0808031A: _0808031A:
adds r1, r5, 0 adds r1, r5, 0
bl sub_8080168 bl TrainerBattleLoadArgs
bl sub_80801F0 bl battle_80801F0
ldr r0, _08080330 @ =gUnknown_81A4EC1 ldr r0, _08080330 @ =gUnknown_81A4EC1
_08080326: _08080326:
pop {r4,r5} pop {r4,r5}
@@ -1673,11 +1673,11 @@ _08080370: .4byte gUnknown_2036E38
_08080374: .4byte gUnknown_81A4EB4 _08080374: .4byte gUnknown_81A4EB4
thumb_func_end sub_8080334 thumb_func_end sub_8080334
thumb_func_start sub_8080378 thumb_func_start GetTrainerFlagFromScriptPointer
sub_8080378: @ 8080378 GetTrainerFlagFromScriptPointer: @ 8080378
push {lr} push {lr}
adds r0, 0x2 adds r0, 0x2
bl sub_80800A8 bl TrainerBattleLoadArg16
lsls r0, 16 lsls r0, 16
movs r1, 0xA0 movs r1, 0xA0
lsls r1, 19 lsls r1, 19
@@ -1688,7 +1688,7 @@ sub_8080378: @ 8080378
lsrs r0, 24 lsrs r0, 24
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8080378 thumb_func_end GetTrainerFlagFromScriptPointer
thumb_func_start sub_8080398 thumb_func_start sub_8080398
sub_8080398: @ 8080398 sub_8080398: @ 8080398
@@ -1738,7 +1738,7 @@ _080803E0: .4byte gUnknown_20386CC
thumb_func_start sub_80803E4 thumb_func_start sub_80803E4
sub_80803E4: @ 80803E4 sub_80803E4: @ 80803E4
push {lr} push {lr}
bl sub_80800B8 bl trainerflag_opponent
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl FlagGet bl FlagGet
@@ -1751,7 +1751,7 @@ sub_80803E4: @ 80803E4
thumb_func_start sub_80803FC thumb_func_start sub_80803FC
sub_80803FC: @ 80803FC sub_80803FC: @ 80803FC
push {lr} push {lr}
bl sub_80800B8 bl trainerflag_opponent
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl FlagSet bl FlagSet
@@ -1762,7 +1762,7 @@ sub_80803FC: @ 80803FC
thumb_func_start sub_8080410 thumb_func_start sub_8080410
sub_8080410: @ 8080410 sub_8080410: @ 8080410
push {lr} push {lr}
bl sub_80800B8 bl trainerflag_opponent
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl FlagSet bl FlagSet
@@ -1866,7 +1866,7 @@ sub_80804AC: @ 80804AC
ands r1, r0 ands r1, r0
cmp r1, 0 cmp r1, 0
beq _08080530 beq _08080530
bl sub_80A0058 bl sp000_heal_pokemon
b _080804EE b _080804EE
.align 2, 0 .align 2, 0
_080804D8: .4byte gUnknown_20386AC _080804D8: .4byte gUnknown_20386AC
@@ -2136,7 +2136,7 @@ sub_80806EC: @ 80806EC
bl sub_80806C8 bl sub_80806C8
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -2155,7 +2155,7 @@ sub_8080710: @ 8080710
bl sub_80806C8 bl sub_80806C8
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
asm/battle_tower.s
+3 -3
View File
@@ -2110,7 +2110,7 @@ _080E6970:
movs r1, 0x1 movs r1, 0x1
bl CreateTask bl CreateTask
movs r0, 0 movs r0, 0
bl sub_8044090 bl PlayMapChosenOrBattleBGM
bl sub_8080060 bl sub_8080060
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2150,7 +2150,7 @@ _080E69A0:
movs r1, 0x1 movs r1, 0x1
bl CreateTask bl CreateTask
movs r0, 0 movs r0, 0
bl sub_8044090 bl PlayMapChosenOrBattleBGM
bl sub_8080060 bl sub_8080060
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -3317,7 +3317,7 @@ _080E7320:
cmp r0, 0 cmp r0, 0
beq _080E732E beq _080E732E
movs r0, 0x2A movs r0, 0x2A
bl sub_8054E90 bl IncrementGameStat
_080E732E: _080E732E:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
asm/battle_util.s
+64 -64
View File
@@ -605,7 +605,7 @@ _080172B4:
str r0, [r5] str r0, [r5]
adds r4, 0x1 adds r4, 0x1
_080172C2: _080172C2:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r4, r0 cmp r4, r0
@@ -1820,7 +1820,7 @@ _08017C2C:
adds r1, r4, r7 adds r1, r4, r7
ldrb r1, [r1] ldrb r1, [r1]
movs r2, 0 movs r2, 0
bl sub_8014CD8 bl GetWhoStrikesFirst
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08017C4C beq _08017C4C
@@ -1828,7 +1828,7 @@ _08017C2C:
lsrs r1, 24 lsrs r1, 24
mov r2, r8 mov r2, r8
lsrs r0, r2, 24 lsrs r0, r2, 24
bl sub_8014CA4 bl SwapTurnOrder
_08017C4C: _08017C4C:
adds r4, 0x1 adds r4, 0x1
ldr r0, _08017D18 @ =gUnknown_2023BCC ldr r0, _08017D18 @ =gUnknown_2023BCC
@@ -1900,7 +1900,7 @@ _08017C8E:
ands r0, r1 ands r0, r1
strh r0, [r3] strh r0, [r3]
ldr r0, _08017D38 @ =gUnknown_81D8B32 ldr r0, _08017D38 @ =gUnknown_81D8B32
bl sub_801BBE4 bl BattleScriptExecute
movs r0, 0xFD movs r0, 0xFD
strb r0, [r5] strb r0, [r5]
movs r0, 0x2 movs r0, 0x2
@@ -1995,7 +1995,7 @@ _08017D56:
ands r0, r1 ands r0, r1
strh r0, [r3] strh r0, [r3]
ldr r0, _08017DFC @ =gUnknown_81D8B32 ldr r0, _08017DFC @ =gUnknown_81D8B32
bl sub_801BBE4 bl BattleScriptExecute
ldr r0, _08017E00 @ =gUnknown_2023E82 ldr r0, _08017E00 @ =gUnknown_2023E82
strb r4, [r0, 0x5] strb r4, [r0, 0x5]
movs r0, 0xFD movs r0, 0xFD
@@ -2087,7 +2087,7 @@ _08017E20:
ands r0, r1 ands r0, r1
strh r0, [r2] strh r0, [r2]
ldr r0, _08017ED8 @ =gUnknown_81D8B32 ldr r0, _08017ED8 @ =gUnknown_81D8B32
bl sub_801BBE4 bl BattleScriptExecute
ldr r0, _08017EDC @ =gUnknown_2023E82 ldr r0, _08017EDC @ =gUnknown_2023E82
strb r4, [r0, 0x5] strb r4, [r0, 0x5]
movs r0, 0xFD movs r0, 0xFD
@@ -2190,7 +2190,7 @@ _08017EF4:
ands r0, r1 ands r0, r1
strh r0, [r3] strh r0, [r3]
ldr r0, _08017F94 @ =gUnknown_81D8B43 ldr r0, _08017F94 @ =gUnknown_81D8B43
bl sub_801BBE4 bl BattleScriptExecute
mov r0, r9 mov r0, r9
adds r0, 0x1 adds r0, 0x1
lsls r0, 24 lsls r0, 24
@@ -2281,7 +2281,7 @@ _08017FB0:
ldr r0, _08018044 @ =gUnknown_2023D6C ldr r0, _08018044 @ =gUnknown_2023D6C
strb r2, [r0] strb r2, [r0]
ldr r0, _08018048 @ =gUnknown_81D8ED5 ldr r0, _08018048 @ =gUnknown_81D8ED5
bl sub_801BBE4 bl BattleScriptExecute
mov r0, r9 mov r0, r9
adds r0, 0x1 adds r0, 0x1
lsls r0, 24 lsls r0, 24
@@ -2529,7 +2529,7 @@ _080181DC:
_080181EC: _080181EC:
ldr r0, [r3] ldr r0, [r3]
_080181EE: _080181EE:
bl sub_801BBE4 bl BattleScriptExecute
mov r0, r9 mov r0, r9
adds r0, 0x1 adds r0, 0x1
lsls r0, 24 lsls r0, 24
@@ -3190,7 +3190,7 @@ _08018734:
movs r0, 0x1 movs r0, 0x1
strb r0, [r1, 0x5] strb r0, [r1, 0x5]
ldr r0, _0801878C @ =gUnknown_81D904A ldr r0, _0801878C @ =gUnknown_81D904A
bl sub_801BBE4 bl BattleScriptExecute
ldr r4, _08018790 @ =gUnknown_2023BC4 ldr r4, _08018790 @ =gUnknown_2023BC4
ldrb r0, [r6] ldrb r0, [r6]
strb r0, [r4] strb r0, [r4]
@@ -3341,7 +3341,7 @@ _08018888:
bl CancelMultiTurnMoves bl CancelMultiTurnMoves
_08018894: _08018894:
ldr r0, _080188AC @ =gUnknown_81D90BC ldr r0, _080188AC @ =gUnknown_81D90BC
bl sub_801BBE4 bl BattleScriptExecute
movs r5, 0x1 movs r5, 0x1
mov r9, r5 mov r9, r5
_0801889E: _0801889E:
@@ -3432,7 +3432,7 @@ _08018926:
b _08018C08 b _08018C08
_08018944: _08018944:
ldr r0, _08018954 @ =gUnknown_81D90C5 ldr r0, _08018954 @ =gUnknown_81D90C5
bl sub_801BBE4 bl BattleScriptExecute
b _08018C08 b _08018C08
.align 2, 0 .align 2, 0
_0801894C: .4byte 0xffffefff _0801894C: .4byte 0xffffefff
@@ -3785,7 +3785,7 @@ _08018B6C:
strb r0, [r1] strb r0, [r1]
ldr r0, _08018C30 @ =gUnknown_81D91C7 ldr r0, _08018C30 @ =gUnknown_81D91C7
_08018C04: _08018C04:
bl sub_801BBE4 bl BattleScriptExecute
_08018C08: _08018C08:
mov r0, r9 mov r0, r9
adds r0, 0x1 adds r0, 0x1
@@ -4188,7 +4188,7 @@ _08018F40:
str r0, [r1] str r0, [r1]
ldr r0, [r1] ldr r0, [r1]
_08018F44: _08018F44:
bl sub_801BBE4 bl BattleScriptExecute
movs r0, 0x1 movs r0, 0x1
b _08018F74 b _08018F74
.align 2, 0 .align 2, 0
@@ -4226,8 +4226,8 @@ _08018F88: .4byte gUnknown_2023DD0
_08018F8C: .4byte 0xfeffffdf _08018F8C: .4byte 0xfeffffdf
thumb_func_end sub_8018C98 thumb_func_end sub_8018C98
thumb_func_start sub_8018F90 thumb_func_start HandleFaintedMonActions
sub_8018F90: @ 8018F90 HandleFaintedMonActions: @ 8018F90
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -4243,7 +4243,7 @@ sub_8018F90: @ 8018F90
_08018FA8: .4byte gUnknown_2022B4C _08018FA8: .4byte gUnknown_2022B4C
_08018FAC: _08018FAC:
ldr r0, _08018FBC @ =gUnknown_81D8694 ldr r0, _08018FBC @ =gUnknown_81D8694
bl sub_801BBE4 bl BattleScriptExecute
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x4D adds r0, 0x4D
movs r1, 0x2 movs r1, 0x2
@@ -4252,7 +4252,7 @@ _08018FAC:
_08018FBC: .4byte gUnknown_81D8694 _08018FBC: .4byte gUnknown_81D8694
_08018FC0: _08018FC0:
ldr r0, _08018FD4 @ =gUnknown_81D869D ldr r0, _08018FD4 @ =gUnknown_81D869D
bl sub_801BBE4 bl BattleScriptExecute
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x4D adds r0, 0x4D
movs r1, 0x5 movs r1, 0x5
@@ -4602,10 +4602,10 @@ _08019274:
bx r1 bx r1
.align 2, 0 .align 2, 0
_08019280: .4byte gUnknown_2023FE8 _08019280: .4byte gUnknown_2023FE8
thumb_func_end sub_8018F90 thumb_func_end HandleFaintedMonActions
thumb_func_start sub_8019284 thumb_func_start TryClearRageStatuses
sub_8019284: @ 8019284 TryClearRageStatuses: @ 8019284
push {r4-r6,lr} push {r4-r6,lr}
movs r3, 0 movs r3, 0
ldr r0, _080192C4 @ =gUnknown_2023BCC ldr r0, _080192C4 @ =gUnknown_2023BCC
@@ -4645,7 +4645,7 @@ _080192C4: .4byte gUnknown_2023BCC
_080192C8: .4byte gUnknown_2023DC4 _080192C8: .4byte gUnknown_2023DC4
_080192CC: .4byte gUnknown_2023C34 _080192CC: .4byte gUnknown_2023C34
_080192D0: .4byte 0xff7fffff _080192D0: .4byte 0xff7fffff
thumb_func_end sub_8019284 thumb_func_end TryClearRageStatuses
thumb_func_start sub_80192D4 thumb_func_start sub_80192D4
sub_80192D4: @ 80192D4 sub_80192D4: @ 80192D4
@@ -6518,7 +6518,7 @@ _0801A25A:
ldr r1, _0801A274 @ =gUnknown_2023E82 ldr r1, _0801A274 @ =gUnknown_2023E82
strb r0, [r1, 0x5] strb r0, [r1, 0x5]
ldr r0, _0801A278 @ =gUnknown_81D8B1F ldr r0, _0801A278 @ =gUnknown_81D8B1F
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
bl _0801BBAA bl _0801BBAA
.align 2, 0 .align 2, 0
_0801A26C: .4byte gUnknown_2023F1C _0801A26C: .4byte gUnknown_2023F1C
@@ -6537,7 +6537,7 @@ _0801A28C:
movs r0, 0x5 movs r0, 0x5
strh r0, [r2] strh r0, [r2]
ldr r0, _0801A2A4 @ =gUnknown_81D927F ldr r0, _0801A2A4 @ =gUnknown_81D927F
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
ldr r0, _0801A2A8 @ =gUnknown_2023FC4 ldr r0, _0801A2A8 @ =gUnknown_2023FC4
mov r1, r10 mov r1, r10
strb r1, [r0, 0x17] strb r1, [r0, 0x17]
@@ -6558,7 +6558,7 @@ _0801A2BC:
movs r0, 0x18 movs r0, 0x18
strh r0, [r2] strh r0, [r2]
ldr r0, _0801A2D4 @ =gUnknown_81D92BF ldr r0, _0801A2D4 @ =gUnknown_81D92BF
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
ldr r0, _0801A2D8 @ =gUnknown_2023FC4 ldr r0, _0801A2D8 @ =gUnknown_2023FC4
mov r2, r10 mov r2, r10
strb r2, [r0, 0x17] strb r2, [r0, 0x17]
@@ -6579,7 +6579,7 @@ _0801A2EC:
movs r0, 0x60 movs r0, 0x60
strh r0, [r2] strh r0, [r2]
ldr r0, _0801A304 @ =gUnknown_81D9379 ldr r0, _0801A304 @ =gUnknown_81D9379
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
ldr r0, _0801A308 @ =gUnknown_2023FC4 ldr r0, _0801A308 @ =gUnknown_2023FC4
mov r3, r10 mov r3, r10
strb r3, [r0, 0x17] strb r3, [r0, 0x17]
@@ -6625,7 +6625,7 @@ _0801A340:
bl _0801BBC6 bl _0801BBC6
_0801A354: _0801A354:
ldr r0, _0801A364 @ =gUnknown_81D92F8 ldr r0, _0801A364 @ =gUnknown_81D92F8
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
ldr r0, _0801A368 @ =gUnknown_2023FC4 ldr r0, _0801A368 @ =gUnknown_2023FC4
mov r1, r10 mov r1, r10
strb r1, [r0, 0x17] strb r1, [r0, 0x17]
@@ -6766,7 +6766,7 @@ _0801A476:
mov r0, r8 mov r0, r8
strb r5, [r0] strb r5, [r0]
ldr r0, _0801A4A0 @ =gUnknown_81D92AB ldr r0, _0801A4A0 @ =gUnknown_81D92AB
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
ldr r1, _0801A4A4 @ =gUnknown_2023D50 ldr r1, _0801A4A4 @ =gUnknown_2023D50
ldrh r0, [r4, 0x2C] ldrh r0, [r4, 0x2C]
lsrs r0, 4 lsrs r0, 4
@@ -6863,7 +6863,7 @@ _0801A52C:
strb r1, [r4] strb r1, [r4]
strb r1, [r0, 0x17] strb r1, [r0, 0x17]
ldr r0, _0801A588 @ =gUnknown_81D92D3 ldr r0, _0801A588 @ =gUnknown_81D92D3
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
str r5, [sp] str r5, [sp]
movs r0, 0 movs r0, 0
movs r1, 0x28 movs r1, 0x28
@@ -6911,7 +6911,7 @@ _0801A5B0:
strb r0, [r4, 0x10] strb r0, [r4, 0x10]
strb r1, [r4, 0x11] strb r1, [r4, 0x11]
ldr r0, _0801A5D4 @ =gUnknown_81D9293 ldr r0, _0801A5D4 @ =gUnknown_81D9293
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
mov r0, r10 mov r0, r10
strb r0, [r4, 0x17] strb r0, [r4, 0x17]
bl _0801BB5A bl _0801BB5A
@@ -9337,7 +9337,7 @@ _0801BA58: .4byte gUnknown_2023BE4
_0801BA5C: .4byte gUnknown_2023D6A _0801BA5C: .4byte gUnknown_2023D6A
_0801BA60: _0801BA60:
ldr r0, _0801BA78 @ =gUnknown_81D92F8 ldr r0, _0801BA78 @ =gUnknown_81D92F8
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
ldr r0, _0801BA7C @ =gUnknown_2023FC4 ldr r0, _0801BA7C @ =gUnknown_2023FC4
strb r4, [r0, 0x17] strb r4, [r0, 0x17]
_0801BA6A: _0801BA6A:
@@ -9354,7 +9354,7 @@ _0801BA7C: .4byte gUnknown_2023FC4
_0801BA80: .4byte gUnknown_2023FE8 _0801BA80: .4byte gUnknown_2023FE8
_0801BA84: _0801BA84:
ldr r0, _0801BAA0 @ =gUnknown_81D92F8 ldr r0, _0801BAA0 @ =gUnknown_81D92F8
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
ldr r0, _0801BAA4 @ =gUnknown_2023FC4 ldr r0, _0801BAA4 @ =gUnknown_2023FC4
mov r3, r10 mov r3, r10
strb r3, [r0, 0x17] strb r3, [r0, 0x17]
@@ -9377,14 +9377,14 @@ _0801BAAC:
ands r0, r1 ands r0, r1
str r0, [r2] str r0, [r2]
ldr r0, _0801BAC4 @ =gUnknown_81D9307 ldr r0, _0801BAC4 @ =gUnknown_81D9307
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
b _0801BB52 b _0801BB52
.align 2, 0 .align 2, 0
_0801BAC0: .4byte 0xfff7ffff _0801BAC0: .4byte 0xfff7ffff
_0801BAC4: .4byte gUnknown_81D9307 _0801BAC4: .4byte gUnknown_81D9307
_0801BAC8: _0801BAC8:
ldr r0, _0801BB18 @ =gUnknown_81D92A1 ldr r0, _0801BB18 @ =gUnknown_81D92A1
bl sub_801BC24 bl BattleScriptPushCursorAndCallback
ldr r1, _0801BB1C @ =gUnknown_2023DFC ldr r1, _0801BB1C @ =gUnknown_2023DFC
ldr r0, [sp, 0x18] ldr r0, [sp, 0x18]
adds r1, r0, r1 adds r1, r0, r1
@@ -9518,8 +9518,8 @@ _0801BBDC: .4byte gUnknown_2023BE4
_0801BBE0: .4byte gUnknown_2023D6A _0801BBE0: .4byte gUnknown_2023D6A
thumb_func_end sub_8019F18 thumb_func_end sub_8019F18
thumb_func_start sub_801BBE4 thumb_func_start BattleScriptExecute
sub_801BBE4: @ 801BBE4 BattleScriptExecute: @ 801BBE4
ldr r1, _0801BC10 @ =gUnknown_2023D74 ldr r1, _0801BC10 @ =gUnknown_2023D74
str r0, [r1] str r0, [r1]
ldr r0, _0801BC14 @ =gUnknown_2023FF4 ldr r0, _0801BC14 @ =gUnknown_2023FF4
@@ -9536,7 +9536,7 @@ sub_801BBE4: @ 801BBE4
ldr r1, _0801BC18 @ =gUnknown_3004F84 ldr r1, _0801BC18 @ =gUnknown_3004F84
ldr r0, [r1] ldr r0, [r1]
str r0, [r2] str r0, [r2]
ldr r0, _0801BC1C @ =sub_8015C00 ldr r0, _0801BC1C @ =RunBattleScriptCommands_PopCallbacksStack
str r0, [r1] str r0, [r1]
ldr r1, _0801BC20 @ =gUnknown_2023BE3 ldr r1, _0801BC20 @ =gUnknown_2023BE3
movs r0, 0 movs r0, 0
@@ -9546,12 +9546,12 @@ sub_801BBE4: @ 801BBE4
_0801BC10: .4byte gUnknown_2023D74 _0801BC10: .4byte gUnknown_2023D74
_0801BC14: .4byte gUnknown_2023FF4 _0801BC14: .4byte gUnknown_2023FF4
_0801BC18: .4byte gUnknown_3004F84 _0801BC18: .4byte gUnknown_3004F84
_0801BC1C: .4byte sub_8015C00 _0801BC1C: .4byte RunBattleScriptCommands_PopCallbacksStack
_0801BC20: .4byte gUnknown_2023BE3 _0801BC20: .4byte gUnknown_2023BE3
thumb_func_end sub_801BBE4 thumb_func_end BattleScriptExecute
thumb_func_start sub_801BC24 thumb_func_start BattleScriptPushCursorAndCallback
sub_801BC24: @ 801BC24 BattleScriptPushCursorAndCallback: @ 801BC24
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl BattleScriptPushCursor bl BattleScriptPushCursor
@@ -9581,7 +9581,7 @@ _0801BC58: .4byte gUnknown_2023D74
_0801BC5C: .4byte gUnknown_2023FF4 _0801BC5C: .4byte gUnknown_2023FF4
_0801BC60: .4byte gUnknown_3004F84 _0801BC60: .4byte gUnknown_3004F84
_0801BC64: .4byte sub_8015C74 _0801BC64: .4byte sub_8015C74
thumb_func_end sub_801BC24 thumb_func_end BattleScriptPushCursorAndCallback
thumb_func_start sub_801BC68 thumb_func_start sub_801BC68
sub_801BC68: @ 801BC68 sub_801BC68: @ 801BC68
@@ -9765,7 +9765,7 @@ _0801BDD0:
strb r7, [r0] strb r7, [r0]
strb r7, [r1] strb r7, [r1]
ldr r0, _0801BE00 @ =gUnknown_81D95D9 ldr r0, _0801BE00 @ =gUnknown_81D95D9
bl sub_801BBE4 bl BattleScriptExecute
bl _0801CFA6 bl _0801CFA6
.align 2, 0 .align 2, 0
_0801BDEC: .4byte gUnknown_2023BE4 _0801BDEC: .4byte gUnknown_2023BE4
@@ -9875,7 +9875,7 @@ _0801BF14:
negs r0, r0 negs r0, r0
str r0, [r4] str r0, [r4]
ldr r0, _0801BF28 @ =gUnknown_81D95EF ldr r0, _0801BF28 @ =gUnknown_81D95EF
bl sub_801BBE4 bl BattleScriptExecute
b _0801C27E b _0801C27E
.align 2, 0 .align 2, 0
_0801BF24: .4byte gUnknown_2023D50 _0801BF24: .4byte gUnknown_2023D50
@@ -9981,7 +9981,7 @@ _0801BFE0:
movs r0, 0xFF movs r0, 0xFF
strb r0, [r1, 0x4] strb r0, [r1, 0x4]
ldr r0, _0801C024 @ =gUnknown_81D960C ldr r0, _0801C024 @ =gUnknown_81D960C
bl sub_801BBE4 bl BattleScriptExecute
mov r1, r10 mov r1, r10
adds r1, 0x9 adds r1, 0x9
lsls r1, 24 lsls r1, 24
@@ -10043,7 +10043,7 @@ _0801C066:
strb r7, [r0] strb r7, [r0]
strb r7, [r1] strb r7, [r1]
ldr r0, _0801C094 @ =gUnknown_81D95D9 ldr r0, _0801C094 @ =gUnknown_81D95D9
bl sub_801BBE4 bl BattleScriptExecute
bl _0801C952 bl _0801C952
.align 2, 0 .align 2, 0
_0801C080: .4byte gUnknown_2023BE4 _0801C080: .4byte gUnknown_2023BE4
@@ -10089,7 +10089,7 @@ _0801C0D4:
negs r0, r0 negs r0, r0
str r0, [r3] str r0, [r3]
ldr r0, _0801C0F4 @ =gUnknown_81D961C ldr r0, _0801C0F4 @ =gUnknown_81D961C
bl sub_801BBE4 bl BattleScriptExecute
movs r0, 0x4 movs r0, 0x4
str r0, [sp, 0xC] str r0, [sp, 0xC]
adds r0, r7, 0 adds r0, r7, 0
@@ -10286,7 +10286,7 @@ _0801C248:
cmp r0, 0 cmp r0, 0
bge _0801C278 bge _0801C278
ldr r0, _0801C274 @ =gUnknown_81D964F ldr r0, _0801C274 @ =gUnknown_81D964F
bl sub_801BBE4 bl BattleScriptExecute
b _0801C27E b _0801C27E
.align 2, 0 .align 2, 0
_0801C26C: .4byte gUnknown_2022AB8 _0801C26C: .4byte gUnknown_2022AB8
@@ -10294,7 +10294,7 @@ _0801C270: .4byte gUnknown_2023D50
_0801C274: .4byte gUnknown_81D964F _0801C274: .4byte gUnknown_81D964F
_0801C278: _0801C278:
ldr r0, _0801C284 @ =gUnknown_81D95EF ldr r0, _0801C284 @ =gUnknown_81D95EF
bl sub_801BBE4 bl BattleScriptExecute
_0801C27E: _0801C27E:
movs r0, 0x4 movs r0, 0x4
str r0, [sp, 0xC] str r0, [sp, 0xC]
@@ -10362,7 +10362,7 @@ _0801C2DC:
bge _0801C30C bge _0801C30C
_0801C2F8: _0801C2F8:
ldr r0, _0801C308 @ =gUnknown_81D964F ldr r0, _0801C308 @ =gUnknown_81D964F
bl sub_801BBE4 bl BattleScriptExecute
b _0801C312 b _0801C312
.align 2, 0 .align 2, 0
_0801C300: .4byte gUnknown_2022AB8 _0801C300: .4byte gUnknown_2022AB8
@@ -10370,7 +10370,7 @@ _0801C304: .4byte gUnknown_2023D50
_0801C308: .4byte gUnknown_81D964F _0801C308: .4byte gUnknown_81D964F
_0801C30C: _0801C30C:
ldr r0, _0801C318 @ =gUnknown_81D95EF ldr r0, _0801C318 @ =gUnknown_81D95EF
bl sub_801BBE4 bl BattleScriptExecute
_0801C312: _0801C312:
movs r3, 0x4 movs r3, 0x4
str r3, [sp, 0xC] str r3, [sp, 0xC]
@@ -10437,7 +10437,7 @@ _0801C36E:
bge _0801C3A0 bge _0801C3A0
_0801C38A: _0801C38A:
ldr r0, _0801C39C @ =gUnknown_81D964F ldr r0, _0801C39C @ =gUnknown_81D964F
bl sub_801BBE4 bl BattleScriptExecute
b _0801C3A6 b _0801C3A6
.align 2, 0 .align 2, 0
_0801C394: .4byte gUnknown_2022AB8 _0801C394: .4byte gUnknown_2022AB8
@@ -10445,7 +10445,7 @@ _0801C398: .4byte gUnknown_2023D50
_0801C39C: .4byte gUnknown_81D964F _0801C39C: .4byte gUnknown_81D964F
_0801C3A0: _0801C3A0:
ldr r0, _0801C3AC @ =gUnknown_81D95EF ldr r0, _0801C3AC @ =gUnknown_81D95EF
bl sub_801BBE4 bl BattleScriptExecute
_0801C3A6: _0801C3A6:
movs r2, 0x4 movs r2, 0x4
str r2, [sp, 0xC] str r2, [sp, 0xC]
@@ -10632,7 +10632,7 @@ _0801C506:
strb r0, [r1, 0x10] strb r0, [r1, 0x10]
strb r6, [r1, 0x11] strb r6, [r1, 0x11]
ldr r0, _0801C524 @ =gUnknown_81D9679 ldr r0, _0801C524 @ =gUnknown_81D9679
bl sub_801BBE4 bl BattleScriptExecute
movs r2, 0x5 movs r2, 0x5
str r2, [sp, 0xC] str r2, [sp, 0xC]
b _0801C95A b _0801C95A
@@ -10682,7 +10682,7 @@ _0801C56C:
strb r0, [r1, 0x10] strb r0, [r1, 0x10]
strb r6, [r1, 0x11] strb r6, [r1, 0x11]
ldr r0, _0801C588 @ =gUnknown_81D9679 ldr r0, _0801C588 @ =gUnknown_81D9679
bl sub_801BBE4 bl BattleScriptExecute
movs r5, 0x5 movs r5, 0x5
str r5, [sp, 0xC] str r5, [sp, 0xC]
b _0801C95A b _0801C95A
@@ -10724,7 +10724,7 @@ _0801C5C2:
orrs r2, r3 orrs r2, r3
str r2, [r1] str r2, [r1]
ldr r0, _0801C5D4 @ =gUnknown_81D9694 ldr r0, _0801C5D4 @ =gUnknown_81D9694
bl sub_801BBE4 bl BattleScriptExecute
movs r2, 0x2 movs r2, 0x2
str r2, [sp, 0xC] str r2, [sp, 0xC]
b _0801C95A b _0801C95A
@@ -10832,7 +10832,7 @@ _0801C638:
strb r0, [r1, 0x10] strb r0, [r1, 0x10]
strb r2, [r1, 0x11] strb r2, [r1, 0x11]
ldr r0, _0801C6BC @ =gUnknown_81D9679 ldr r0, _0801C6BC @ =gUnknown_81D9679
bl sub_801BBE4 bl BattleScriptExecute
movs r0, 0x5 movs r0, 0x5
str r0, [sp, 0xC] str r0, [sp, 0xC]
b _0801C95A b _0801C95A
@@ -10862,7 +10862,7 @@ _0801C6D8:
ands r2, r0 ands r2, r0
str r2, [r1] str r2, [r1]
ldr r0, _0801C6EC @ =gUnknown_81D9531 ldr r0, _0801C6EC @ =gUnknown_81D9531
bl sub_801BBE4 bl BattleScriptExecute
movs r1, 0x1 movs r1, 0x1
str r1, [sp, 0xC] str r1, [sp, 0xC]
b _0801C95A b _0801C95A
@@ -10886,7 +10886,7 @@ _0801C708:
ands r2, r0 ands r2, r0
str r2, [r1] str r2, [r1]
ldr r0, _0801C720 @ =gUnknown_81D9549 ldr r0, _0801C720 @ =gUnknown_81D9549
bl sub_801BBE4 bl BattleScriptExecute
movs r2, 0x1 movs r2, 0x1
str r2, [sp, 0xC] str r2, [sp, 0xC]
b _0801C95A b _0801C95A
@@ -10912,7 +10912,7 @@ _0801C73C:
ands r2, r0 ands r2, r0
str r2, [r1] str r2, [r1]
ldr r0, _0801C750 @ =gUnknown_81D9561 ldr r0, _0801C750 @ =gUnknown_81D9561
bl sub_801BBE4 bl BattleScriptExecute
movs r3, 0x1 movs r3, 0x1
str r3, [sp, 0xC] str r3, [sp, 0xC]
b _0801C95A b _0801C95A
@@ -10937,7 +10937,7 @@ _0801C76C:
ands r2, r0 ands r2, r0
str r2, [r1] str r2, [r1]
ldr r0, _0801C780 @ =gUnknown_81D9579 ldr r0, _0801C780 @ =gUnknown_81D9579
bl sub_801BBE4 bl BattleScriptExecute
movs r5, 0x1 movs r5, 0x1
str r5, [sp, 0xC] str r5, [sp, 0xC]
b _0801C95A b _0801C95A
@@ -10992,7 +10992,7 @@ _0801C7D8:
ands r2, r0 ands r2, r0
str r2, [r1] str r2, [r1]
ldr r0, _0801C7EC @ =gUnknown_81D95A9 ldr r0, _0801C7EC @ =gUnknown_81D95A9
bl sub_801BBE4 bl BattleScriptExecute
movs r1, 0x2 movs r1, 0x2
str r1, [sp, 0xC] str r1, [sp, 0xC]
b _0801C95A b _0801C95A
@@ -11133,7 +11133,7 @@ _0801C8E4:
str r0, [r3] str r0, [r3]
ldr r0, _0801C918 @ =gUnknown_81D95BF ldr r0, _0801C918 @ =gUnknown_81D95BF
_0801C906: _0801C906:
bl sub_801BBE4 bl BattleScriptExecute
movs r0, 0x1 movs r0, 0x1
str r0, [sp, 0xC] str r0, [sp, 0xC]
b _0801C95A b _0801C95A
@@ -11161,7 +11161,7 @@ _0801C91C:
ldr r1, _0801C980 @ =gUnknown_82500C4 ldr r1, _0801C980 @ =gUnknown_82500C4
bl StringCopy bl StringCopy
ldr r0, _0801C984 @ =gUnknown_81D95BF ldr r0, _0801C984 @ =gUnknown_81D95BF
bl sub_801BBE4 bl BattleScriptExecute
ldr r1, _0801C988 @ =gUnknown_2023E82 ldr r1, _0801C988 @ =gUnknown_2023E82
movs r0, 0 movs r0, 0
strb r0, [r1, 0x5] strb r0, [r1, 0x5]
asm/berry.s
+10 -10
View File
@@ -47,7 +47,7 @@ _0809C740:
ldr r0, [r4] ldr r0, [r4]
ldr r3, _0809C780 @ =0x000030ec ldr r3, _0809C780 @ =0x000030ec
adds r0, r3 adds r0, r3
bl sub_809C838 bl GetEnigmaBerryChecksum
ldr r1, [r4] ldr r1, [r4]
ldr r4, _0809C790 @ =0x0000311c ldr r4, _0809C790 @ =0x0000311c
adds r1, r4 adds r1, r4
@@ -133,7 +133,7 @@ _0809C7F0:
adds r1, 0x1 adds r1, 0x1
strb r0, [r1] strb r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl sub_809C838 bl GetEnigmaBerryChecksum
str r0, [r4, 0x30] str r0, [r4, 0x30]
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -146,8 +146,8 @@ _0809C830: .4byte 0x00000516
_0809C834: .4byte 0x00000529 _0809C834: .4byte 0x00000529
thumb_func_end sub_809C7C4 thumb_func_end sub_809C7C4
thumb_func_start sub_809C838 thumb_func_start GetEnigmaBerryChecksum
sub_809C838: @ 809C838 GetEnigmaBerryChecksum: @ 809C838
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
movs r2, 0 movs r2, 0
@@ -162,10 +162,10 @@ _0809C840:
adds r0, r2, 0 adds r0, r2, 0
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809C838 thumb_func_end GetEnigmaBerryChecksum
thumb_func_start sub_809C854 thumb_func_start IsEnigmaBerryValid
sub_809C854: @ 809C854 IsEnigmaBerryValid: @ 809C854
push {r4,lr} push {r4,lr}
ldr r4, _0809C888 @ =gUnknown_3005008 ldr r4, _0809C888 @ =gUnknown_3005008
ldr r1, [r4] ldr r1, [r4]
@@ -182,7 +182,7 @@ sub_809C854: @ 809C854
beq _0809C898 beq _0809C898
ldr r2, _0809C890 @ =0x000030ec ldr r2, _0809C890 @ =0x000030ec
adds r0, r1, r2 adds r0, r1, r2
bl sub_809C838 bl GetEnigmaBerryChecksum
ldr r1, [r4] ldr r1, [r4]
ldr r2, _0809C894 @ =0x0000311c ldr r2, _0809C894 @ =0x0000311c
adds r1, r2 adds r1, r2
@@ -202,7 +202,7 @@ _0809C89A:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809C854 thumb_func_end IsEnigmaBerryValid
thumb_func_start sub_809C8A0 thumb_func_start sub_809C8A0
sub_809C8A0: @ 809C8A0 sub_809C8A0: @ 809C8A0
@@ -211,7 +211,7 @@ sub_809C8A0: @ 809C8A0
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0x2B cmp r4, 0x2B
bne _0809C8C4 bne _0809C8C4
bl sub_809C854 bl IsEnigmaBerryValid
cmp r0, 0 cmp r0, 0
beq _0809C8C4 beq _0809C8C4
ldr r0, _0809C8BC @ =gUnknown_3005008 ldr r0, _0809C8BC @ =gUnknown_3005008
asm/berry_pouch.s
+17 -17
View File
@@ -871,7 +871,7 @@ sub_813D430: @ 813D430
ldr r4, _0813D4A8 @ =gUnknown_2021D18 ldr r4, _0813D4A8 @ =gUnknown_2021D18
ldr r1, _0813D4AC @ =gUnknown_84162B9 ldr r1, _0813D4AC @ =gUnknown_84162B9
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
str r5, [sp] str r5, [sp]
movs r0, 0 movs r0, 0
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -1549,7 +1549,7 @@ sub_813D940: @ 813D940
ldr r0, _0813D9F0 @ =gUnknown_2021D18 ldr r0, _0813D9F0 @ =gUnknown_2021D18
mov r9, r0 mov r9, r0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [sp] str r0, [sp]
movs r6, 0x1 movs r6, 0x1
@@ -1576,7 +1576,7 @@ sub_813D940: @ 813D940
bl sub_8008E78 bl sub_8008E78
ldr r1, _0813D9F4 @ =gUnknown_84162B9 ldr r1, _0813D9F4 @ =gUnknown_84162B9
mov r0, r9 mov r0, r9
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
str r0, [sp] str r0, [sp]
str r6, [sp, 0x4] str r6, [sp, 0x4]
@@ -1633,7 +1633,7 @@ sub_813D9F8: @ 813D9F8
ldr r4, _0813DA60 @ =gUnknown_2021D18 ldr r4, _0813DA60 @ =gUnknown_2021D18
ldr r1, _0813DA64 @ =gUnknown_84162B9 ldr r1, _0813DA64 @ =gUnknown_84162B9
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
str r0, [sp] str r0, [sp]
movs r1, 0x1 movs r1, 0x1
@@ -1987,7 +1987,7 @@ _0813DC86:
ldr r5, _0813DD6C @ =gUnknown_2021D18 ldr r5, _0813DD6C @ =gUnknown_2021D18
ldr r1, _0813DD70 @ =gUnknown_84162FF ldr r1, _0813DD70 @ =gUnknown_84162FF
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [sp] str r0, [sp]
movs r1, 0x1 movs r1, 0x1
@@ -2259,7 +2259,7 @@ sub_813DF54: @ 813DF54
ldr r5, _0813DFBC @ =gUnknown_2021D18 ldr r5, _0813DFBC @ =gUnknown_2021D18
ldr r1, _0813DFC0 @ =gUnknown_8416409 ldr r1, _0813DFC0 @ =gUnknown_8416409
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x7 movs r0, 0x7
bl sub_813EA08 bl sub_813EA08
lsls r0, 24 lsls r0, 24
@@ -2436,7 +2436,7 @@ sub_813E0DC: @ 813E0DC
ldr r5, _0813E158 @ =gUnknown_2021D18 ldr r5, _0813E158 @ =gUnknown_2021D18
ldr r1, _0813E15C @ =gUnknown_84163F4 ldr r1, _0813E15C @ =gUnknown_84163F4
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x9 movs r0, 0x9
bl sub_813EA08 bl sub_813EA08
lsls r0, 24 lsls r0, 24
@@ -2740,7 +2740,7 @@ sub_813E37C: @ 813E37C
ldr r4, _0813E3CC @ =gUnknown_2021D18 ldr r4, _0813E3CC @ =gUnknown_2021D18
ldr r1, _0813E3D0 @ =gUnknown_8416374 ldr r1, _0813E3D0 @ =gUnknown_8416374
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r3, _0813E3D4 @ =sub_813E290 ldr r3, _0813E3D4 @ =sub_813E290
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x2 movs r1, 0x2
@@ -2819,7 +2819,7 @@ sub_813E428: @ 813E428
ldr r4, _0813E47C @ =gUnknown_2021D18 ldr r4, _0813E47C @ =gUnknown_2021D18
ldr r1, _0813E480 @ =gUnknown_84168F1 ldr r1, _0813E480 @ =gUnknown_84168F1
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
@@ -2859,7 +2859,7 @@ _0813E4A8:
ldr r4, _0813E4D8 @ =gUnknown_2021D18 ldr r4, _0813E4D8 @ =gUnknown_2021D18
ldr r1, _0813E4DC @ =gUnknown_8416911 ldr r1, _0813E4DC @ =gUnknown_8416911
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
@@ -2909,7 +2909,7 @@ sub_813E4E4: @ 813E4E4
ldr r4, _0813E548 @ =gUnknown_2021D18 ldr r4, _0813E548 @ =gUnknown_2021D18
ldr r1, _0813E54C @ =gUnknown_8416936 ldr r1, _0813E54C @ =gUnknown_8416936
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
@@ -3006,7 +3006,7 @@ sub_813E5B8: @ 813E5B8
mov r8, r2 mov r8, r2
ldr r1, _0813E660 @ =gUnknown_84162B9 ldr r1, _0813E660 @ =gUnknown_84162B9
mov r0, r8 mov r0, r8
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
str r0, [sp] str r0, [sp]
movs r1, 0x1 movs r1, 0x1
@@ -3208,7 +3208,7 @@ sub_813E768: @ 813E768
ldr r4, _0813E7E4 @ =gUnknown_2021D18 ldr r4, _0813E7E4 @ =gUnknown_2021D18
ldr r1, _0813E7E8 @ =gUnknown_8416959 ldr r1, _0813E7E8 @ =gUnknown_8416959
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r3, _0813E7EC @ =sub_813E7F0 ldr r3, _0813E7EC @ =sub_813E7F0
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x2 movs r1, 0x2
@@ -3362,7 +3362,7 @@ _0813E90C: .4byte gUnknown_30030F0
sub_813E910: @ 813E910 sub_813E910: @ 813E910
push {r4,lr} push {r4,lr}
ldr r0, _0813E994 @ =gUnknown_84643B8 ldr r0, _0813E994 @ =gUnknown_84643B8
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
@@ -3465,7 +3465,7 @@ sub_813E9A0: @ 813E9A0
str r4, [sp, 0xC] str r4, [sp, 0xC]
str r2, [sp, 0x10] str r2, [sp, 0x10]
mov r2, r9 mov r2, r9
bl sub_812E5A4 bl AddTextPrinterParametrized2
add sp, 0x14 add sp, 0x14
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3
@@ -3490,7 +3490,7 @@ sub_813EA08: @ 813EA08
lsls r0, r4, 3 lsls r0, r4, 3
ldr r1, _0813EA50 @ =gUnknown_84643D8 ldr r1, _0813EA50 @ =gUnknown_84643D8
adds r0, r1 adds r0, r1
bl sub_8003CE4 bl AddWindow
strb r0, [r5] strb r0, [r5]
cmp r4, 0x2 cmp r4, 0x2
beq _0813EA38 beq _0813EA38
@@ -3639,7 +3639,7 @@ sub_813EB20: @ 813EB20
cmp r0, 0xFF cmp r0, 0xFF
bne _0813EB44 bne _0813EB44
ldr r0, _0813EB78 @ =gUnknown_8464400 ldr r0, _0813EB78 @ =gUnknown_8464400
bl sub_8003CE4 bl AddWindow
strb r0, [r4, 0x5] strb r0, [r4, 0x5]
_0813EB44: _0813EB44:
bl sub_80F78A8 bl sub_80F78A8
asm/bike.s
+6 -6
View File
@@ -681,8 +681,8 @@ _080BD582:
bx r1 bx r1
thumb_func_end sub_80BD540 thumb_func_end sub_80BD540
thumb_func_start sub_80BD58C thumb_func_start player_should_look_direction_be_enforced_upon_movement
sub_80BD58C: @ 80BD58C player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
push {lr} push {lr}
movs r0, 0x4 movs r0, 0x4
bl TestPlayerAvatarFlags bl TestPlayerAvatarFlags
@@ -711,7 +711,7 @@ _080BD5C0:
_080BD5C2: _080BD5C2:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80BD58C thumb_func_end player_should_look_direction_be_enforced_upon_movement
thumb_func_start sub_80BD5C8 thumb_func_start sub_80BD5C8
sub_80BD5C8: @ 80BD5C8 sub_80BD5C8: @ 80BD5C8
@@ -728,8 +728,8 @@ sub_80BD5C8: @ 80BD5C8
cmp r0, 0 cmp r0, 0
beq _080BD5F8 beq _080BD5F8
movs r0, 0x1 movs r0, 0x1
bl sub_805BDEC bl SetPlayerAvatarTransitionFlags
bl sub_8055E84 bl sav1_reset_battle_music_maybe
bl sub_8055DC4 bl sub_8055DC4
b _080BD618 b _080BD618
.align 2, 0 .align 2, 0
@@ -737,7 +737,7 @@ _080BD5F0: .4byte gUnknown_2036E2C
_080BD5F4: .4byte gUnknown_2037078 _080BD5F4: .4byte gUnknown_2037078
_080BD5F8: _080BD5F8:
adds r0, r2, 0 adds r0, r2, 0
bl sub_805BDEC bl SetPlayerAvatarTransitionFlags
movs r4, 0x8D movs r4, 0x8D
lsls r4, 1 lsls r4, 1
adds r0, r4, 0 adds r0, r4, 0
asm/blit.s
+6 -6
View File
@@ -402,8 +402,8 @@ _08004D30:
bx r0 bx r0
thumb_func_end FillBitmapRect4Bit thumb_func_end FillBitmapRect4Bit
thumb_func_start sub_8004D40 thumb_func_start BlitBitmapRect4BitTo8Bit
sub_8004D40: @ 8004D40 BlitBitmapRect4BitTo8Bit: @ 8004D40
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -716,10 +716,10 @@ _08004F7E:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8004D40 thumb_func_end BlitBitmapRect4BitTo8Bit
thumb_func_start sub_8004F90 thumb_func_start FillBitmapRect8Bit
sub_8004F90: @ 8004F90 FillBitmapRect8Bit: @ 8004F90
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -808,6 +808,6 @@ _08005024:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8004F90 thumb_func_end FillBitmapRect8Bit
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/braille_text.s
+1 -1
View File
@@ -360,7 +360,7 @@ _0814FB38:
_0814FB3A: _0814FB3A:
strb r0, [r6, 0x1C] strb r0, [r6, 0x1C]
adds r0, r6, 0 adds r0, r6, 0
bl sub_80054C8 bl TextPrinterInitDownArrowCounters
_0814FB42: _0814FB42:
movs r0, 0x3 movs r0, 0x3
b _0814FC96 b _0814FC96
asm/buy_menu_helpers.s
+3 -3
View File
@@ -12,13 +12,13 @@ sub_813F66C: @ 813F66C
cmp r4, 0x1 cmp r4, 0x1
beq _0813F680 beq _0813F680
ldr r0, _0813F67C @ =gUnknown_8464804 ldr r0, _0813F67C @ =gUnknown_8464804
bl sub_8003B24 bl InitWindows
b _0813F686 b _0813F686
.align 2, 0 .align 2, 0
_0813F67C: .4byte gUnknown_8464804 _0813F67C: .4byte gUnknown_8464804
_0813F680: _0813F680:
ldr r0, _0813F6CC @ =gUnknown_846483C ldr r0, _0813F6CC @ =gUnknown_846483C
bl sub_8003B24 bl InitWindows
_0813F686: _0813F686:
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
movs r0, 0 movs r0, 0
@@ -114,7 +114,7 @@ sub_813F6F4: @ 813F6F4
str r4, [sp, 0xC] str r4, [sp, 0xC]
str r2, [sp, 0x10] str r2, [sp, 0x10]
mov r2, r9 mov r2, r9
bl sub_812E5A4 bl AddTextPrinterParametrized2
add sp, 0x14 add sp, 0x14
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3
asm/cable_club.s
+9 -9
View File
@@ -59,7 +59,7 @@ sub_808078C: @ 808078C
ldr r5, _080807E0 @ =gUnknown_2021D18 ldr r5, _080807E0 @ =gUnknown_2021D18
ldr r1, _080807E4 @ =gUnknown_841DF82 ldr r1, _080807E4 @ =gUnknown_841DF82
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r1, 0 movs r1, 0
str r1, [sp] str r1, [sp]
movs r0, 0xFF movs r0, 0xFF
@@ -388,7 +388,7 @@ sub_80809F8: @ 80809F8
bl sub_800AA24 bl sub_800AA24
bl sub_800A270 bl sub_800A270
ldr r0, _08080A2C @ =gUnknown_83C6AB0 ldr r0, _08080A2C @ =gUnknown_83C6AB0
bl sub_8003CE4 bl AddWindow
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
b _08080A3C b _08080A3C
.align 2, 0 .align 2, 0
@@ -817,7 +817,7 @@ _08080DA8:
adds r4, 0x1C adds r4, 0x1C
adds r5, 0x1 adds r5, 0x1
_08080DAC: _08080DAC:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r5, r0 cmp r5, r0
@@ -975,7 +975,7 @@ _08080EF2:
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
_08080EF8: _08080EF8:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r5, r0 cmp r5, r0
@@ -1587,7 +1587,7 @@ _080813B8:
cmp r0, 0 cmp r0, 0
beq _080813D4 beq _080813D4
ldr r0, _080813D0 @ =0x00000109 ldr r0, _080813D0 @ =0x00000109
bl sub_8044090 bl PlayMapChosenOrBattleBGM
b _080813DC b _080813DC
.align 2, 0 .align 2, 0
_080813CC: .4byte gUnknown_202273C _080813CC: .4byte gUnknown_202273C
@@ -1595,7 +1595,7 @@ _080813D0: .4byte 0x00000109
_080813D4: _080813D4:
movs r0, 0x85 movs r0, 0x85
lsls r0, 1 lsls r0, 1
bl sub_8044090 bl PlayMapChosenOrBattleBGM
_080813DC: _080813DC:
ldr r0, _080813F0 @ =gUnknown_20370C0 ldr r0, _080813F0 @ =gUnknown_20370C0
ldrh r0, [r0] ldrh r0, [r0]
@@ -1763,7 +1763,7 @@ _08081510:
adds r5, 0x1C adds r5, 0x1C
adds r4, 0x1 adds r4, 0x1
_08081536: _08081536:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r4, r0 cmp r4, r0
@@ -1805,7 +1805,7 @@ _0808157A:
cmp r0, 0 cmp r0, 0
beq _08081598 beq _08081598
ldr r0, _08081594 @ =0x00000109 ldr r0, _08081594 @ =0x00000109
bl sub_8044090 bl PlayMapChosenOrBattleBGM
b _080815A0 b _080815A0
.align 2, 0 .align 2, 0
_08081590: .4byte gUnknown_202273C _08081590: .4byte gUnknown_202273C
@@ -1813,7 +1813,7 @@ _08081594: .4byte 0x00000109
_08081598: _08081598:
movs r0, 0x85 movs r0, 0x85
lsls r0, 1 lsls r0, 1
bl sub_8044090 bl PlayMapChosenOrBattleBGM
_080815A0: _080815A0:
ldr r0, _080815B8 @ =gUnknown_202273C ldr r0, _080815B8 @ =gUnknown_202273C
ldr r1, _080815BC @ =0x00002211 ldr r1, _080815BC @ =0x00002211
asm/clear_save_data_screen.s
+4 -4
View File
@@ -134,7 +134,7 @@ _080F5660:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl sub_812E5A4 bl AddTextPrinterParametrized2
movs r0, 0x1 movs r0, 0x1
movs r1, 0x2 movs r1, 0x2
bl CopyWindowToVram bl CopyWindowToVram
@@ -204,7 +204,7 @@ sub_80F5708: @ 80F5708
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080F578C bne _080F578C
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r4, r0, 24 asrs r4, r0, 24
movs r0, 0x1 movs r0, 0x1
@@ -241,7 +241,7 @@ _080F5744:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl sub_812E5A4 bl AddTextPrinterParametrized2
movs r0, 0x1 movs r0, 0x1
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
@@ -445,7 +445,7 @@ _080F5846:
movs r2, 0 movs r2, 0
bl ChangeBgY bl ChangeBgY
ldr r0, _080F5948 @ =gUnknown_841EE68 ldr r0, _080F5948 @ =gUnknown_841EE68
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
movs r1, 0x82 movs r1, 0x82
lsls r1, 5 lsls r1, 5
asm/coins.s
+3 -3
View File
@@ -141,7 +141,7 @@ sub_80D060C: @ 80D060C
ldr r0, _080D066C @ =gUnknown_2021D18 ldr r0, _080D066C @ =gUnknown_2021D18
mov r9, r0 mov r9, r0
ldr r1, _080D0670 @ =gUnknown_84162C4 ldr r1, _080D0670 @ =gUnknown_84162C4
bl sub_8008FCC bl StringExpandPlaceholders
str r4, [sp] str r4, [sp]
str r5, [sp, 0x4] str r5, [sp, 0x4]
movs r0, 0 movs r0, 0
@@ -223,7 +223,7 @@ sub_80D06D0: @ 80D06D0
ldr r4, _080D0720 @ =gUnknown_2021D18 ldr r4, _080D0720 @ =gUnknown_2021D18
ldr r1, _080D0724 @ =gUnknown_84162C4 ldr r1, _080D0724 @ =gUnknown_84162C4
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
@@ -287,7 +287,7 @@ sub_80D072C: @ 80D072C
str r1, [sp, 0x1C] str r1, [sp, 0x1C]
ldr r4, _080D07BC @ =gUnknown_2039A28 ldr r4, _080D07BC @ =gUnknown_2039A28
add r0, sp, 0x18 add r0, sp, 0x18
bl sub_8003CE4 bl AddWindow
strb r0, [r4] strb r0, [r4]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
asm/coord_event_weather.s
+3 -3
View File
@@ -70,8 +70,8 @@ nullsub_39: @ 806E7D8
bx lr bx lr
thumb_func_end nullsub_39 thumb_func_end nullsub_39
thumb_func_start sub_806E7DC thumb_func_start trigger_activate_weather
sub_806E7DC: @ 806E7DC trigger_activate_weather: @ 806E7DC
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -100,6 +100,6 @@ _0806E80A:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_806E7DC thumb_func_end trigger_activate_weather
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/credits.s
+8 -8
View File
@@ -141,7 +141,7 @@ sub_80F3AA4: @ 80F3AA4
sub_80F3AC4: @ 80F3AC4 sub_80F3AC4: @ 80F3AC4
push {r4,lr} push {r4,lr}
ldr r0, _080F3AFC @ =gUnknown_8410E08 ldr r0, _080F3AFC @ =gUnknown_8410E08
bl sub_8003CE4 bl AddWindow
ldr r4, _080F3B00 @ =gUnknown_203AB40 ldr r4, _080F3B00 @ =gUnknown_203AB40
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0xA] strb r0, [r1, 0xA]
@@ -422,7 +422,7 @@ _080F3D0A:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x8 movs r2, 0x8
movs r3, 0x29 movs r3, 0x29
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldr r1, [r7] ldr r1, [r7]
movs r0, 0x5 movs r0, 0x5
b _080F413C b _080F413C
@@ -649,7 +649,7 @@ _080F3EB4:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x2 movs r2, 0x2
movs r3, 0x6 movs r3, 0x6
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldr r1, [r7] ldr r1, [r7]
movs r0, 0x8 movs r0, 0x8
b _080F3FB8 b _080F3FB8
@@ -696,7 +696,7 @@ _080F3F24:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x8 movs r2, 0x8
movs r3, 0x6 movs r3, 0x6
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldr r1, [r7] ldr r1, [r7]
movs r0, 0x9 movs r0, 0x9
b _080F3FB8 b _080F3FB8
@@ -1002,7 +1002,7 @@ _080F41BA:
b _080F42C2 b _080F42C2
_080F41C4: _080F41C4:
ldr r0, _080F41F4 @ =gUnknown_840C5B0 ldr r0, _080F41F4 @ =gUnknown_840C5B0
bl sub_8003B24 bl InitWindows
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
@@ -1027,7 +1027,7 @@ _080F41F8: .4byte gUnknown_840CB8C
_080F41FC: .4byte gUnknown_840D228 _080F41FC: .4byte gUnknown_840D228
_080F4200: _080F4200:
ldr r0, _080F4234 @ =gUnknown_840C5D0 ldr r0, _080F4234 @ =gUnknown_840C5D0
bl sub_8003B24 bl InitWindows
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
@@ -1053,7 +1053,7 @@ _080F4238: .4byte gUnknown_840E158
_080F423C: .4byte gUnknown_840E904 _080F423C: .4byte gUnknown_840E904
_080F4240: _080F4240:
ldr r0, _080F427C @ =gUnknown_840C5F0 ldr r0, _080F427C @ =gUnknown_840C5F0
bl sub_8003B24 bl InitWindows
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
@@ -1084,7 +1084,7 @@ _080F4280: .4byte gUnknown_840F240
_080F4284: .4byte gUnknown_840F944 _080F4284: .4byte gUnknown_840F944
_080F4288: _080F4288:
ldr r0, _080F42E4 @ =gUnknown_840C610 ldr r0, _080F42E4 @ =gUnknown_840C610
bl sub_8003B24 bl InitWindows
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
asm/daycare.s
+15 -15
View File
@@ -222,8 +222,8 @@ _08045554: .4byte gUnknown_3005008
_08045558: .4byte 0x00002cd0 _08045558: .4byte 0x00002cd0
thumb_func_end StorePokemonInDaycare thumb_func_end StorePokemonInDaycare
thumb_func_start sub_804555C thumb_func_start StorePokemonInEmptyDaycareSlot
sub_804555C: @ 804555C StorePokemonInEmptyDaycareSlot: @ 804555C
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r4, r1, 0 adds r4, r1, 0
@@ -240,10 +240,10 @@ sub_804555C: @ 804555C
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_804555C thumb_func_end StorePokemonInEmptyDaycareSlot
thumb_func_start sub_8045580 thumb_func_start StoreSelectedPokemonInDaycare
sub_8045580: @ 8045580 StoreSelectedPokemonInDaycare: @ 8045580
push {lr} push {lr}
bl GetCursorSelectionMonId bl GetCursorSelectionMonId
lsls r0, 24 lsls r0, 24
@@ -257,13 +257,13 @@ sub_8045580: @ 8045580
movs r2, 0xBE movs r2, 0xBE
lsls r2, 6 lsls r2, 6
adds r1, r2 adds r1, r2
bl sub_804555C bl StorePokemonInEmptyDaycareSlot
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080455A4: .4byte gUnknown_2024284 _080455A4: .4byte gUnknown_2024284
_080455A8: .4byte gUnknown_3005008 _080455A8: .4byte gUnknown_3005008
thumb_func_end sub_8045580 thumb_func_end StoreSelectedPokemonInDaycare
thumb_func_start ShiftDaycareSlots thumb_func_start ShiftDaycareSlots
ShiftDaycareSlots: @ 80455AC ShiftDaycareSlots: @ 80455AC
@@ -1763,7 +1763,7 @@ sub_80460D4: @ 80460D4
ldrh r1, [r4] ldrh r1, [r4]
mov r0, sp mov r0, sp
adds r2, r5, 0 adds r2, r5, 0
bl sub_8046208 bl SetInitialEggData
mov r0, sp mov r0, sp
adds r1, r5, 0 adds r1, r5, 0
bl InheritIVs bl InheritIVs
@@ -1803,8 +1803,8 @@ sub_80460D4: @ 80460D4
_0804614C: .4byte gUnknown_2024284 _0804614C: .4byte gUnknown_2024284
thumb_func_end sub_80460D4 thumb_func_end sub_80460D4
thumb_func_start sub_8046150 thumb_func_start CreateEgg
sub_8046150: @ 8046150 CreateEgg: @ 8046150
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -1889,10 +1889,10 @@ _080461E2:
.align 2, 0 .align 2, 0
_08046200: .4byte gUnknown_825F83E _08046200: .4byte gUnknown_825F83E
_08046204: .4byte gUnknown_8254795 _08046204: .4byte gUnknown_8254795
thumb_func_end sub_8046150 thumb_func_end CreateEgg
thumb_func_start sub_8046208 thumb_func_start SetInitialEggData
sub_8046208: @ 8046208 SetInitialEggData: @ 8046208
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
@@ -1967,7 +1967,7 @@ sub_8046208: @ 8046208
.align 2, 0 .align 2, 0
_080462A4: .4byte gUnknown_825F83E _080462A4: .4byte gUnknown_825F83E
_080462A8: .4byte gUnknown_8254795 _080462A8: .4byte gUnknown_8254795
thumb_func_end sub_8046208 thumb_func_end SetInitialEggData
thumb_func_start sub_80462AC thumb_func_start sub_80462AC
sub_80462AC: @ 80462AC sub_80462AC: @ 80462AC
@@ -3054,7 +3054,7 @@ ShowDaycareLevelMenu: @ 8046AB8
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x18 sub sp, 0x18
ldr r0, _08046B18 @ =gUnknown_825F7F4 ldr r0, _08046B18 @ =gUnknown_825F7F4
bl sub_8003CE4 bl AddWindow
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
asm/diploma.s
+4 -4
View File
@@ -395,7 +395,7 @@ _080F4E66:
movs r2, 0 movs r2, 0
bl ChangeBgY bl ChangeBgY
ldr r0, _080F4F94 @ =gUnknown_8415A10 ldr r0, _080F4F94 @ =gUnknown_8415A10
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
movs r1, 0x82 movs r1, 0x82
lsls r1, 5 lsls r1, 5
@@ -559,7 +559,7 @@ _080F5050:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0x4 movs r3, 0x4
bl sub_812E51C bl box_print
ldr r1, _080F50EC @ =gUnknown_841B619 ldr r1, _080F50EC @ =gUnknown_841B619
add r0, sp, 0xC add r0, sp, 0xC
bl UnkTextUtil_StringExpandPlaceholders bl UnkTextUtil_StringExpandPlaceholders
@@ -579,7 +579,7 @@ _080F5050:
movs r1, 0x2 movs r1, 0x2
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0x1E movs r3, 0x1E
bl sub_812E51C bl box_print
str r6, [sp] str r6, [sp]
movs r0, 0 movs r0, 0
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -589,7 +589,7 @@ _080F5050:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x78 movs r2, 0x78
movs r3, 0x69 movs r3, 0x69
bl sub_812E51C bl box_print
movs r0, 0 movs r0, 0
bl PutWindowTilemap bl PutWindowTilemap
add sp, 0xAC add sp, 0xAC
asm/easy_chat.s
+6 -6
View File
@@ -42,8 +42,8 @@ _080BD74E:
bx r1 bx r1
thumb_func_end sub_80BD718 thumb_func_end sub_80BD718
thumb_func_start sub_80BD754 thumb_func_start start_menu_is_selected_item_valid
sub_80BD754: @ 80BD754 start_menu_is_selected_item_valid: @ 80BD754
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -51,7 +51,7 @@ sub_80BD754: @ 80BD754
cmp r0, 0x15 cmp r0, 0x15
bne _080BD76C bne _080BD76C
movs r0, 0 movs r0, 0
bl sub_8088E8C bl pokedex_count
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
b _080BD782 b _080BD782
@@ -73,7 +73,7 @@ _080BD782:
bx r1 bx r1
.align 2, 0 .align 2, 0
_080BD788: .4byte gUnknown_83ECED4 _080BD788: .4byte gUnknown_83ECED4
thumb_func_end sub_80BD754 thumb_func_end start_menu_is_selected_item_valid
thumb_func_start sub_80BD78C thumb_func_start sub_80BD78C
sub_80BD78C: @ 80BD78C sub_80BD78C: @ 80BD78C
@@ -808,7 +808,7 @@ sub_80BDCA8: @ 80BDCA8
sub_80BDCB8: @ 80BDCB8 sub_80BDCB8: @ 80BDCB8
push {r4-r7,lr} push {r4-r7,lr}
movs r0, 0 movs r0, 0
bl sub_80BD754 bl start_menu_is_selected_item_valid
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
cmp r4, 0 cmp r4, 0
@@ -1054,7 +1054,7 @@ sub_80BDE88: @ 80BDE88
ldr r1, [r4] ldr r1, [r4]
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
bl sub_8088E8C bl pokedex_count
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080BDEB0 beq _080BDEB0
asm/egg_hatch.s
+17 -17
View File
@@ -506,7 +506,7 @@ sub_8047004: @ 8047004
cmp r0, 0 cmp r0, 0
bne _0804702C bne _0804702C
bl sub_80563F0 bl sub_80563F0
ldr r0, _08047038 @ =sub_8047044 ldr r0, _08047038 @ =CB2_EggHatch_0
bl SetMainCallback2 bl SetMainCallback2
ldr r1, _0804703C @ =gUnknown_3005020 ldr r1, _0804703C @ =gUnknown_3005020
ldr r0, _08047040 @ =sub_807DD24 ldr r0, _08047040 @ =sub_807DD24
@@ -519,13 +519,13 @@ _0804702C:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08047034: .4byte gUnknown_2037AB8 _08047034: .4byte gUnknown_2037AB8
_08047038: .4byte sub_8047044 _08047038: .4byte CB2_EggHatch_0
_0804703C: .4byte gUnknown_3005020 _0804703C: .4byte gUnknown_3005020
_08047040: .4byte sub_807DD24 _08047040: .4byte sub_807DD24
thumb_func_end sub_8047004 thumb_func_end sub_8047004
thumb_func_start sub_8047044 thumb_func_start CB2_EggHatch_0
sub_8047044: @ 8047044 CB2_EggHatch_0: @ 8047044
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
ldr r0, _08047064 @ =gUnknown_30030F0 ldr r0, _08047064 @ =gUnknown_30030F0
@@ -632,7 +632,7 @@ _08047154: .4byte gUnknown_20370C2
_08047158: .4byte gUnknown_826019C _08047158: .4byte gUnknown_826019C
_0804715C: _0804715C:
ldr r0, _0804716C @ =gUnknown_82601A4 ldr r0, _0804716C @ =gUnknown_82601A4
bl sub_8003B24 bl InitWindows
ldr r0, _08047170 @ =gUnknown_3000E74 ldr r0, _08047170 @ =gUnknown_3000E74
ldr r1, [r0] ldr r1, [r0]
movs r0, 0 movs r0, 0
@@ -765,10 +765,10 @@ _0804727A:
.align 2, 0 .align 2, 0
_08047298: .4byte sub_8047338 _08047298: .4byte sub_8047338
_0804729C: .4byte gUnknown_3000E74 _0804729C: .4byte gUnknown_3000E74
thumb_func_end sub_8047044 thumb_func_end CB2_EggHatch_0
thumb_func_start sub_80472A0 thumb_func_start EggHatchSetMonNickname
sub_80472A0: @ 80472A0 EggHatchSetMonNickname: @ 80472A0
push {lr} push {lr}
ldr r0, _080472D0 @ =gUnknown_20370C0 ldr r0, _080472D0 @ =gUnknown_20370C0
ldrh r1, [r0] ldrh r1, [r0]
@@ -794,7 +794,7 @@ _080472D4: .4byte gUnknown_2024284
_080472D8: .4byte gUnknown_2021D04 _080472D8: .4byte gUnknown_2021D04
_080472DC: .4byte gUnknown_3000E74 _080472DC: .4byte gUnknown_3000E74
_080472E0: .4byte c2_exit_to_overworld_2_switch _080472E0: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80472A0 thumb_func_end EggHatchSetMonNickname
thumb_func_start sub_80472E4 thumb_func_start sub_80472E4
sub_80472E4: @ 80472E4 sub_80472E4: @ 80472E4
@@ -1004,7 +1004,7 @@ _08047482:
ldr r4, _080474DC @ =gUnknown_2021D18 ldr r4, _080474DC @ =gUnknown_2021D18
ldr r1, _080474E0 @ =gUnknown_841B6FD ldr r1, _080474E0 @ =gUnknown_841B6FD
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, [r5] ldr r0, [r5]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
movs r1, 0xFF movs r1, 0xFF
@@ -1061,7 +1061,7 @@ _08047504:
ldr r4, _08047540 @ =gUnknown_2021D18 ldr r4, _08047540 @ =gUnknown_2021D18
ldr r1, _08047544 @ =gUnknown_841B716 ldr r1, _08047544 @ =gUnknown_841B716
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, [r5] ldr r0, [r5]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
movs r1, 0x1 movs r1, 0x1
@@ -1080,7 +1080,7 @@ _08047544: .4byte gUnknown_841B716
_08047548: _08047548:
ldr r0, [r5] ldr r0, [r5]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r6, r0, 16 lsrs r6, r0, 16
cmp r6, 0 cmp r6, 0
@@ -1108,7 +1108,7 @@ _0804755A:
.align 2, 0 .align 2, 0
_08047584: .4byte gUnknown_82601B4 _08047584: .4byte gUnknown_82601B4
_08047588: _08047588:
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -1173,19 +1173,19 @@ _080475A8:
movs r2, 0 movs r2, 0
bl GetMonData bl GetMonData
str r0, [sp] str r0, [sp]
ldr r0, _08047630 @ =sub_80472A0 ldr r0, _08047630 @ =EggHatchSetMonNickname
str r0, [sp, 0x4] str r0, [sp, 0x4]
movs r0, 0x3 movs r0, 0x3
mov r1, r10 mov r1, r10
adds r2, r5, 0 adds r2, r5, 0
adds r3, r4, 0 adds r3, r4, 0
bl sub_809D954 bl DoNamingScreen
b _08047684 b _08047684
.align 2, 0 .align 2, 0
_08047624: .4byte gUnknown_3000E74 _08047624: .4byte gUnknown_3000E74
_08047628: .4byte gUnknown_2024284 _08047628: .4byte gUnknown_2024284
_0804762C: .4byte gUnknown_2021D04 _0804762C: .4byte gUnknown_2021D04
_08047630: .4byte sub_80472A0 _08047630: .4byte EggHatchSetMonNickname
_08047634: _08047634:
movs r0, 0x1 movs r0, 0x1
negs r0, r0 negs r0, r0
@@ -1806,7 +1806,7 @@ EggHatchPrintMessage: @ 8047A9C
movs r1, 0x3 movs r1, 0x3
adds r2, r6, 0 adds r2, r6, 0
ldr r3, [sp, 0x14] ldr r3, [sp, 0x14]
bl sub_812E5A4 bl AddTextPrinterParametrized2
add sp, 0x18 add sp, 0x18
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
asm/evolution_scene.s
+57 -57
View File
@@ -196,7 +196,7 @@ EvolutionScene: @ 80CDDF4
movs r0, 0x9 movs r0, 0x9
strb r0, [r1] strb r0, [r1]
bl sub_800F34C bl sub_800F34C
bl sub_800F420 bl LoadBattleTextboxAndBackground
bl ResetSpriteData bl ResetSpriteData
bl remove_some_task bl remove_some_task
bl ResetTasks bl ResetTasks
@@ -517,7 +517,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
movs r0, 0x9 movs r0, 0x9
strb r0, [r1] strb r0, [r1]
bl sub_800F34C bl sub_800F34C
bl sub_800F420 bl LoadBattleTextboxAndBackground
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
ldr r1, _080CE2B4 @ =gUnknown_3003E58 ldr r1, _080CE2B4 @ =gUnknown_3003E58
@@ -1494,7 +1494,7 @@ _080CEAA0:
ldr r4, _080CEAC4 @ =gUnknown_2021D18 ldr r4, _080CEAC4 @ =gUnknown_2021D18
ldr r1, _080CEAC8 @ =gUnknown_83FE672 ldr r1, _080CEAC8 @ =gUnknown_83FE672
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -1511,7 +1511,7 @@ _080CEAC8: .4byte gUnknown_83FE672
_080CEACC: .4byte gUnknown_3005090 _080CEACC: .4byte gUnknown_3005090
_080CEAD0: _080CEAD0:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CEAE0 beq _080CEAE0
@@ -1799,7 +1799,7 @@ _080CED3A:
ldr r4, _080CEDA8 @ =gUnknown_2021D18 ldr r4, _080CEDA8 @ =gUnknown_2021D18
ldr r1, _080CEDAC @ =gUnknown_83FE688 ldr r1, _080CEDAC @ =gUnknown_83FE688
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -1837,7 +1837,7 @@ _080CED3A:
movs r1, 0x3 movs r1, 0x3
bl sub_8088E74 bl sub_8088E74
movs r0, 0xE movs r0, 0xE
bl sub_8054E90 bl IncrementGameStat
b _080CF528 b _080CF528
.align 2, 0 .align 2, 0
_080CEDA8: .4byte gUnknown_2021D18 _080CEDA8: .4byte gUnknown_2021D18
@@ -1846,7 +1846,7 @@ _080CEDB0: .4byte 0x00000103
_080CEDB4: .4byte gUnknown_3005090 _080CEDB4: .4byte gUnknown_3005090
_080CEDB8: _080CEDB8:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CEDC6 beq _080CEDC6
@@ -2042,7 +2042,7 @@ _080CEF48:
beq _080CEF70 beq _080CEF70
ldr r0, _080CEF68 @ =gUnknown_2021D18 ldr r0, _080CEF68 @ =gUnknown_2021D18
ldr r1, _080CEF6C @ =gUnknown_83FE6D0 ldr r1, _080CEF6C @ =gUnknown_83FE6D0
bl sub_8008FCC bl StringExpandPlaceholders
b _080CEF78 b _080CEF78
.align 2, 0 .align 2, 0
_080CEF64: .4byte gUnknown_3005090 _080CEF64: .4byte gUnknown_3005090
@@ -2051,7 +2051,7 @@ _080CEF6C: .4byte gUnknown_83FE6D0
_080CEF70: _080CEF70:
ldr r0, _080CEF90 @ =gUnknown_2021D18 ldr r0, _080CEF90 @ =gUnknown_2021D18
ldr r1, _080CEF94 @ =gUnknown_83FE6B5 ldr r1, _080CEF94 @ =gUnknown_83FE6B5
bl sub_8008FCC bl StringExpandPlaceholders
_080CEF78: _080CEF78:
ldr r0, _080CEF90 @ =gUnknown_2021D18 ldr r0, _080CEF90 @ =gUnknown_2021D18
movs r1, 0 movs r1, 0
@@ -2070,7 +2070,7 @@ _080CEF94: .4byte gUnknown_83FE6B5
_080CEF98: .4byte gUnknown_3005090 _080CEF98: .4byte gUnknown_3005090
_080CEF9C: _080CEF9C:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CEFAA beq _080CEFAA
@@ -2087,7 +2087,7 @@ _080CEFB6:
bl PlayFanfare bl PlayFanfare
ldr r0, _080CEFEC @ =gUnknown_83FDF3C ldr r0, _080CEFEC @ =gUnknown_83FDF3C
ldr r0, [r0, 0xC] ldr r0, [r0, 0xC]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CEFF0 @ =gUnknown_202298C ldr r0, _080CEFF0 @ =gUnknown_202298C
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -2110,7 +2110,7 @@ _080CEFF0: .4byte gUnknown_202298C
_080CEFF4: .4byte gUnknown_3005090 _080CEFF4: .4byte gUnknown_3005090
_080CEFF8: _080CEFF8:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CF006 beq _080CF006
@@ -2175,7 +2175,7 @@ _080CF054:
.4byte _080CF504 .4byte _080CF504
_080CF088: _080CF088:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CF096 beq _080CF096
@@ -2190,7 +2190,7 @@ _080CF0A2:
bl BufferMoveToLearnIntoBattleTextBuff2 bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, _080CF0C8 @ =gUnknown_83FDF3C ldr r0, _080CF0C8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x10] ldr r0, [r0, 0x10]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF0CC @ =gUnknown_202298C ldr r0, _080CF0CC @ =gUnknown_202298C
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -2208,7 +2208,7 @@ _080CF0CC: .4byte gUnknown_202298C
_080CF0D0: .4byte gUnknown_3005090 _080CF0D0: .4byte gUnknown_3005090
_080CF0D4: _080CF0D4:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CF0E2 beq _080CF0E2
@@ -2222,7 +2222,7 @@ _080CF0E2:
_080CF0EE: _080CF0EE:
ldr r0, _080CF110 @ =gUnknown_83FDF3C ldr r0, _080CF110 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x14] ldr r0, [r0, 0x14]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF114 @ =gUnknown_202298C ldr r0, _080CF114 @ =gUnknown_202298C
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -2240,7 +2240,7 @@ _080CF114: .4byte gUnknown_202298C
_080CF118: .4byte gUnknown_3005090 _080CF118: .4byte gUnknown_3005090
_080CF11C: _080CF11C:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080CF15A bne _080CF15A
@@ -2250,7 +2250,7 @@ _080CF11C:
bne _080CF15A bne _080CF15A
ldr r0, _080CF1A8 @ =gUnknown_83FDF3C ldr r0, _080CF1A8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x18] ldr r0, [r0, 0x18]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF1AC @ =gUnknown_202298C ldr r0, _080CF1AC @ =gUnknown_202298C
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -2268,7 +2268,7 @@ _080CF11C:
strh r0, [r1, 0x14] strh r0, [r1, 0x14]
_080CF15A: _080CF15A:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CF168 beq _080CF168
@@ -2507,7 +2507,7 @@ _080CF34C:
ldr r3, _080CF38C @ =0x000004cc ldr r3, _080CF38C @ =0x000004cc
adds r0, r3 adds r0, r3
ldr r0, [r0] ldr r0, [r0]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF390 @ =gUnknown_202298C ldr r0, _080CF390 @ =gUnknown_202298C
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -2563,7 +2563,7 @@ _080CF3E0:
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF40C @ =gUnknown_202298C ldr r0, _080CF40C @ =gUnknown_202298C
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -2581,7 +2581,7 @@ _080CF40C: .4byte gUnknown_202298C
_080CF410: .4byte gUnknown_3005090 _080CF410: .4byte gUnknown_3005090
_080CF414: _080CF414:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CF422 beq _080CF422
@@ -2595,7 +2595,7 @@ _080CF422:
_080CF42E: _080CF42E:
ldr r0, _080CF450 @ =gUnknown_83FDF3C ldr r0, _080CF450 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x1C] ldr r0, [r0, 0x1C]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF454 @ =gUnknown_202298C ldr r0, _080CF454 @ =gUnknown_202298C
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -2613,7 +2613,7 @@ _080CF454: .4byte gUnknown_202298C
_080CF458: .4byte gUnknown_3005090 _080CF458: .4byte gUnknown_3005090
_080CF45C: _080CF45C:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080CF528 bne _080CF528
@@ -2626,7 +2626,7 @@ _080CF45C:
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF49C @ =gUnknown_202298C ldr r0, _080CF49C @ =gUnknown_202298C
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -2645,7 +2645,7 @@ _080CF4A0: .4byte gUnknown_3005090
_080CF4A4: _080CF4A4:
ldr r0, _080CF4CC @ =gUnknown_83FDF3C ldr r0, _080CF4CC @ =gUnknown_83FDF3C
ldr r0, [r0, 0x20] ldr r0, [r0, 0x20]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF4D0 @ =gUnknown_202298C ldr r0, _080CF4D0 @ =gUnknown_202298C
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -2668,7 +2668,7 @@ _080CF4D4: .4byte gUnknown_3005090
_080CF4D8: _080CF4D8:
ldr r0, _080CF4F8 @ =gUnknown_83FDF3C ldr r0, _080CF4F8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x24] ldr r0, [r0, 0x24]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF4FC @ =gUnknown_202298C ldr r0, _080CF4FC @ =gUnknown_202298C
movs r1, 0 movs r1, 0
bl sub_80D87BC bl sub_80D87BC
@@ -2687,7 +2687,7 @@ _080CF4FC: .4byte gUnknown_202298C
_080CF500: .4byte gUnknown_3005090 _080CF500: .4byte gUnknown_3005090
_080CF504: _080CF504:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080CF528 bne _080CF528
@@ -2813,7 +2813,7 @@ _080CF620:
ldr r4, _080CF640 @ =gUnknown_2021D18 ldr r4, _080CF640 @ =gUnknown_2021D18
ldr r1, _080CF644 @ =gUnknown_83FE672 ldr r1, _080CF644 @ =gUnknown_83FE672
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x1 movs r2, 0x1
@@ -2829,7 +2829,7 @@ _080CF644: .4byte gUnknown_83FE672
_080CF648: .4byte gUnknown_3005090 _080CF648: .4byte gUnknown_3005090
_080CF64C: _080CF64C:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CF65C beq _080CF65C
@@ -3106,7 +3106,7 @@ _080CF8A8:
ldr r4, _080CF914 @ =gUnknown_2021D18 ldr r4, _080CF914 @ =gUnknown_2021D18
ldr r1, _080CF918 @ =gUnknown_83FE688 ldr r1, _080CF918 @ =gUnknown_83FE688
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x1 movs r2, 0x1
@@ -3144,7 +3144,7 @@ _080CF8A8:
movs r1, 0x3 movs r1, 0x3
bl sub_8088E74 bl sub_8088E74
movs r0, 0xE movs r0, 0xE
bl sub_8054E90 bl IncrementGameStat
b _080D003A b _080D003A
.align 2, 0 .align 2, 0
_080CF914: .4byte gUnknown_2021D18 _080CF914: .4byte gUnknown_2021D18
@@ -3153,7 +3153,7 @@ _080CF91C: .4byte 0x00000103
_080CF920: .4byte gUnknown_3005090 _080CF920: .4byte gUnknown_3005090
_080CF924: _080CF924:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CF932 beq _080CF932
@@ -3233,7 +3233,7 @@ _080CF9C8: .4byte gUnknown_841E325
_080CF9CC: .4byte gUnknown_3005090 _080CF9CC: .4byte gUnknown_3005090
_080CF9D0: _080CF9D0:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
cmp r5, 0 cmp r5, 0
@@ -3337,7 +3337,7 @@ _080CFAA8:
ldr r4, _080CFACC @ =gUnknown_2021D18 ldr r4, _080CFACC @ =gUnknown_2021D18
ldr r1, _080CFAD0 @ =gUnknown_83FE6D0 ldr r1, _080CFAD0 @ =gUnknown_83FE6D0
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x1 movs r2, 0x1
@@ -3355,7 +3355,7 @@ _080CFAD0: .4byte gUnknown_83FE6D0
_080CFAD4: .4byte gUnknown_3005090 _080CFAD4: .4byte gUnknown_3005090
_080CFAD8: _080CFAD8:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CFAE6 beq _080CFAE6
@@ -3372,7 +3372,7 @@ _080CFAF2:
bl PlayFanfare bl PlayFanfare
ldr r0, _080CFB28 @ =gUnknown_83FDF3C ldr r0, _080CFB28 @ =gUnknown_83FDF3C
ldr r0, [r0, 0xC] ldr r0, [r0, 0xC]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFB2C @ =gUnknown_202298C ldr r1, _080CFB2C @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3395,7 +3395,7 @@ _080CFB2C: .4byte gUnknown_202298C
_080CFB30: .4byte gUnknown_3005090 _080CFB30: .4byte gUnknown_3005090
_080CFB34: _080CFB34:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CFB42 beq _080CFB42
@@ -3458,7 +3458,7 @@ _080CFB90:
.4byte _080D0018 .4byte _080D0018
_080CFBC0: _080CFBC0:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CFBCE beq _080CFBCE
@@ -3473,7 +3473,7 @@ _080CFBDA:
bl BufferMoveToLearnIntoBattleTextBuff2 bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, _080CFC00 @ =gUnknown_83FDF3C ldr r0, _080CFC00 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x10] ldr r0, [r0, 0x10]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFC04 @ =gUnknown_202298C ldr r1, _080CFC04 @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3491,7 +3491,7 @@ _080CFC04: .4byte gUnknown_202298C
_080CFC08: .4byte gUnknown_3005090 _080CFC08: .4byte gUnknown_3005090
_080CFC0C: _080CFC0C:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CFC1A beq _080CFC1A
@@ -3505,7 +3505,7 @@ _080CFC1A:
_080CFC26: _080CFC26:
ldr r0, _080CFC48 @ =gUnknown_83FDF3C ldr r0, _080CFC48 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x14] ldr r0, [r0, 0x14]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFC4C @ =gUnknown_202298C ldr r1, _080CFC4C @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3523,7 +3523,7 @@ _080CFC4C: .4byte gUnknown_202298C
_080CFC50: .4byte gUnknown_3005090 _080CFC50: .4byte gUnknown_3005090
_080CFC54: _080CFC54:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080CFC92 bne _080CFC92
@@ -3533,7 +3533,7 @@ _080CFC54:
bne _080CFC92 bne _080CFC92
ldr r0, _080CFCE8 @ =gUnknown_83FDF3C ldr r0, _080CFCE8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x18] ldr r0, [r0, 0x18]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFCEC @ =gUnknown_202298C ldr r1, _080CFCEC @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3551,7 +3551,7 @@ _080CFC54:
strh r0, [r1, 0x14] strh r0, [r1, 0x14]
_080CFC92: _080CFC92:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CFCA0 beq _080CFCA0
@@ -3597,7 +3597,7 @@ _080CFCF0: .4byte gUnknown_3005090
_080CFCF4: .4byte gUnknown_826D1CC _080CFCF4: .4byte gUnknown_826D1CC
_080CFCF8: .4byte gUnknown_2023E82 _080CFCF8: .4byte gUnknown_2023E82
_080CFCFC: _080CFCFC:
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r4, r0, 24 asrs r4, r0, 24
cmp r4, 0 cmp r4, 0
@@ -3621,7 +3621,7 @@ _080CFD1C:
lsls r3, 3 lsls r3, 3
adds r0, r3 adds r0, r3
ldr r0, [r0] ldr r0, [r0]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFD68 @ =gUnknown_202298C ldr r1, _080CFD68 @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3661,7 +3661,7 @@ _080CFD70:
lsls r1, 3 lsls r1, 3
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFDA4 @ =gUnknown_202298C ldr r1, _080CFDA4 @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3778,7 +3778,7 @@ _080CFE74:
ldr r3, _080CFEB4 @ =0x000004cc ldr r3, _080CFEB4 @ =0x000004cc
adds r0, r3 adds r0, r3
ldr r0, [r0] ldr r0, [r0]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFEB8 @ =gUnknown_202298C ldr r1, _080CFEB8 @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3821,7 +3821,7 @@ _080CFEC0:
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFF20 @ =gUnknown_202298C ldr r1, _080CFF20 @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3841,7 +3841,7 @@ _080CFF20: .4byte gUnknown_202298C
_080CFF24: .4byte gUnknown_3005090 _080CFF24: .4byte gUnknown_3005090
_080CFF28: _080CFF28:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080CFF36 beq _080CFF36
@@ -3855,7 +3855,7 @@ _080CFF36:
_080CFF42: _080CFF42:
ldr r0, _080CFF64 @ =gUnknown_83FDF3C ldr r0, _080CFF64 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x1C] ldr r0, [r0, 0x1C]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFF68 @ =gUnknown_202298C ldr r1, _080CFF68 @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3873,7 +3873,7 @@ _080CFF68: .4byte gUnknown_202298C
_080CFF6C: .4byte gUnknown_3005090 _080CFF6C: .4byte gUnknown_3005090
_080CFF70: _080CFF70:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080D003A bne _080D003A
@@ -3886,7 +3886,7 @@ _080CFF70:
lsls r3, 2 lsls r3, 2
adds r0, r3 adds r0, r3
ldr r0, [r0] ldr r0, [r0]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFFB0 @ =gUnknown_202298C ldr r1, _080CFFB0 @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3905,7 +3905,7 @@ _080CFFB4: .4byte gUnknown_3005090
_080CFFB8: _080CFFB8:
ldr r0, _080CFFE0 @ =gUnknown_83FDF3C ldr r0, _080CFFE0 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x20] ldr r0, [r0, 0x20]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFFE4 @ =gUnknown_202298C ldr r1, _080CFFE4 @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3928,7 +3928,7 @@ _080CFFE8: .4byte gUnknown_3005090
_080CFFEC: _080CFFEC:
ldr r0, _080D000C @ =gUnknown_83FDF3C ldr r0, _080D000C @ =gUnknown_83FDF3C
ldr r0, [r0, 0x24] ldr r0, [r0, 0x24]
bl sub_80D77F4 bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080D0010 @ =gUnknown_202298C ldr r1, _080D0010 @ =gUnknown_202298C
movs r0, 0 movs r0, 0
movs r2, 0x1 movs r2, 0x1
@@ -3947,7 +3947,7 @@ _080D0010: .4byte gUnknown_202298C
_080D0014: .4byte gUnknown_3005090 _080D0014: .4byte gUnknown_3005090
_080D0018: _080D0018:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080D003A bne _080D003A
asm/fame_checker.s
+14 -14
View File
@@ -220,7 +220,7 @@ _0812C540:
b _0812C5BE b _0812C5BE
_0812C578: _0812C578:
ldr r0, _0812C598 @ =gUnknown_845FC04 ldr r0, _0812C598 @ =gUnknown_845FC04
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
bl sub_812CEC0 bl sub_812CEC0
ldr r4, _0812C59C @ =gUnknown_203B100 ldr r4, _0812C59C @ =gUnknown_203B100
@@ -515,7 +515,7 @@ _0812C7DC:
cmp r0, 0 cmp r0, 0
beq _0812C828 beq _0812C828
movs r0, 0x2 movs r0, 0x2
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _0812C8EA bne _0812C8EA
@@ -887,7 +887,7 @@ sub_812CAD8: @ 812CAD8
cmp r0, 0 cmp r0, 0
beq _0812CB2E beq _0812CB2E
movs r0, 0x2 movs r0, 0x2
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _0812CB2E bne _0812CB2E
@@ -1228,7 +1228,7 @@ _0812CDAC:
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
bl sub_80F78A8 bl sub_80F78A8
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
@@ -1299,7 +1299,7 @@ sub_812CE04: @ 812CE04
adds r0, r2 adds r0, r2
ldr r1, [r0] ldr r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl sub_8008FCC bl StringExpandPlaceholders
bl sub_80F78A8 bl sub_80F78A8
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
@@ -1665,7 +1665,7 @@ _0812D10A:
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
movs r3, 0 movs r3, 0
bl sub_812E5A4 bl AddTextPrinterParametrized2
movs r0, 0x1 movs r0, 0x1
bl sub_812CEE0 bl sub_812CEE0
add sp, 0x14 add sp, 0x14
@@ -2172,7 +2172,7 @@ sub_812D558: @ 812D558
bl dp13_810BB8C bl dp13_810BB8C
bl ResetPaletteFade bl ResetPaletteFade
movs r0, 0 movs r0, 0
bl sub_805FECC bl npc_paltag_set_load
ldr r1, _0812D580 @ =gUnknown_3003E58 ldr r1, _0812D580 @ =gUnknown_3003E58
movs r0, 0x7 movs r0, 0x7
strb r0, [r1] strb r0, [r1]
@@ -2855,13 +2855,13 @@ sub_812DA14: @ 812DA14
movs r0, 0x3 movs r0, 0x3
movs r1, 0 movs r1, 0
movs r3, 0 movs r3, 0
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldr r6, _0812DB08 @ =gUnknown_2021CD0 ldr r6, _0812DB08 @ =gUnknown_2021CD0
ldr r0, _0812DB0C @ =gUnknown_845FA1C ldr r0, _0812DB0C @ =gUnknown_845FA1C
adds r5, r0 adds r5, r0
ldr r1, [r5] ldr r1, [r5]
adds r0, r6, 0 adds r0, r6, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0 movs r2, 0
@@ -2883,7 +2883,7 @@ sub_812DA14: @ 812DA14
movs r0, 0x3 movs r0, 0x3
movs r1, 0 movs r1, 0
movs r3, 0xA movs r3, 0xA
bl sub_812E5A4 bl AddTextPrinterParametrized2
movs r0, 0x3 movs r0, 0x3
bl sub_812CEE0 bl sub_812CEE0
add sp, 0x14 add sp, 0x14
@@ -3315,7 +3315,7 @@ sub_812DDF0: @ 812DDF0
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r2, 0x8 movs r2, 0x8
bl sub_812E5A4 bl AddTextPrinterParametrized2
cmp r5, 0 cmp r5, 0
bne _0812DEC0 bne _0812DEC0
add r0, sp, 0x14 add r0, sp, 0x14
@@ -3370,7 +3370,7 @@ _0812DE88:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r2, 0x8 movs r2, 0x8
bl sub_812E5A4 bl AddTextPrinterParametrized2
_0812DEC0: _0812DEC0:
ldr r1, _0812DEE4 @ =gUnknown_203B0FC ldr r1, _0812DEE4 @ =gUnknown_203B0FC
ldr r0, [r1] ldr r0, [r1]
@@ -4137,7 +4137,7 @@ sub_812E4A4: @ 812E4A4
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
bl sub_812E5A4 bl AddTextPrinterParametrized2
b _0812E50A b _0812E50A
.align 2, 0 .align 2, 0
_0812E4E0: .4byte gUnknown_203B0FC _0812E4E0: .4byte gUnknown_203B0FC
@@ -4157,7 +4157,7 @@ _0812E4EC:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
bl sub_812E5A4 bl AddTextPrinterParametrized2
_0812E50A: _0812E50A:
add sp, 0x14 add sp, 0x14
pop {r4} pop {r4}
asm/field_control_avatar.s
+29 -29
View File
@@ -363,7 +363,7 @@ sub_806CAC8: @ 806CAC8
cmp r0, 0 cmp r0, 0
beq _0806CB74 beq _0806CB74
movs r0, 0x5 movs r0, 0x5
bl sub_8054E90 bl IncrementGameStat
bl sub_8146CA4 bl sub_8146CA4
bl sub_815D8C8 bl sub_815D8C8
bl sub_80CC918 bl sub_80CC918
@@ -791,7 +791,7 @@ sub_806CEA0: @ 806CEA0
lsrs r2, 24 lsrs r2, 24
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
bl sub_806CEE0 bl TryGetScriptOnPressingA
adds r4, r0, 0 adds r4, r0, 0
cmp r4, 0 cmp r4, 0
bne _0806CEB8 bne _0806CEB8
@@ -819,8 +819,8 @@ _0806CED8: .4byte gUnknown_8168CE4
_0806CEDC: .4byte gUnknown_81A6955 _0806CEDC: .4byte gUnknown_81A6955
thumb_func_end sub_806CEA0 thumb_func_end sub_806CEA0
thumb_func_start sub_806CEE0 thumb_func_start TryGetScriptOnPressingA
sub_806CEE0: @ 806CEE0 TryGetScriptOnPressingA: @ 806CEE0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -861,7 +861,7 @@ _0806CF2C:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_806CEE0 thumb_func_end TryGetScriptOnPressingA
thumb_func_start sub_806CF38 thumb_func_start sub_806CF38
sub_806CF38: @ 806CF38 sub_806CF38: @ 806CF38
@@ -1648,7 +1648,7 @@ _0806D59C: .4byte 0x00000824
_0806D5A0: .4byte gUnknown_81A6AC8 _0806D5A0: .4byte gUnknown_81A6AC8
_0806D5A4: _0806D5A4:
adds r0, r4, 0 adds r0, r4, 0
bl sub_805A104 bl MetatileBehavior_IsWaterfall
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -1833,7 +1833,7 @@ _0806D704:
cmp r0, 0 cmp r0, 0
beq _0806D720 beq _0806D720
movs r0, 0xD movs r0, 0xD
bl sub_8054E90 bl IncrementGameStat
ldr r0, _0806D71C @ =gUnknown_81BF546 ldr r0, _0806D71C @ =gUnknown_81BF546
bl ScriptContext1_SetupScript bl ScriptContext1_SetupScript
b _0806D730 b _0806D730
@@ -2176,7 +2176,7 @@ sub_806D964: @ 806D964
ldr r0, _0806D9B8 @ =gUnknown_2036DFC ldr r0, _0806D9B8 @ =gUnknown_2036DFC
mov r8, r0 mov r8, r0
adds r1, r7, 0 adds r1, r7, 0
bl sub_806DC30 bl map_warp_check_packed
lsls r0, 24 lsls r0, 24
asrs r5, r0, 24 asrs r5, r0, 24
movs r0, 0x1 movs r0, 0x1
@@ -2185,7 +2185,7 @@ sub_806D964: @ 806D964
beq _0806DA00 beq _0806DA00
adds r0, r4, 0 adds r0, r4, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_806DBD8 bl is_non_stair_warp_tile
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -2216,7 +2216,7 @@ _0806D9BC:
cmp r0, 0 cmp r0, 0
beq _0806D9E2 beq _0806D9E2
movs r0, 0x1 movs r0, 0x1
bl sub_805BDEC bl SetPlayerAvatarTransitionFlags
movs r4, 0xC movs r4, 0xC
_0806D9E2: _0806D9E2:
bl sub_8055A08 bl sub_8055A08
@@ -2252,7 +2252,7 @@ sub_806DA10: @ 806DA10
ldr r7, _0806DA68 @ =gUnknown_2036DFC ldr r7, _0806DA68 @ =gUnknown_2036DFC
adds r0, r7, 0 adds r0, r7, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_806DC30 bl map_warp_check_packed
lsls r0, 24 lsls r0, 24
asrs r4, r0, 24 asrs r4, r0, 24
movs r0, 0x1 movs r0, 0x1
@@ -2296,7 +2296,7 @@ _0806DA6C:
b _0806DAEE b _0806DAEE
_0806DA82: _0806DA82:
adds r0, r4, 0 adds r0, r4, 0
bl sub_805A15C bl MetatileBehavior_IsLavaridge1FWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -2306,7 +2306,7 @@ _0806DA82:
b _0806DAEE b _0806DAEE
_0806DA98: _0806DA98:
adds r0, r4, 0 adds r0, r4, 0
bl sub_805A170 bl MetatileBehavior_IsAquaHideoutWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -2356,7 +2356,7 @@ sub_806DAF4: @ 806DAF4
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_8059BC8 bl MetatileBehavior_IsWarpDoor
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -2386,13 +2386,13 @@ sub_806DAF4: @ 806DAF4
cmp r0, 0x1 cmp r0, 0x1
beq _0806DB7C beq _0806DB7C
adds r0, r4, 0 adds r0, r4, 0
bl sub_805A15C bl MetatileBehavior_IsLavaridge1FWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _0806DB7C beq _0806DB7C
adds r0, r4, 0 adds r0, r4, 0
bl sub_805A170 bl MetatileBehavior_IsAquaHideoutWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -2467,8 +2467,8 @@ _0806DBD2:
bx r1 bx r1
thumb_func_end sub_806DB84 thumb_func_end sub_806DB84
thumb_func_start sub_806DBD8 thumb_func_start is_non_stair_warp_tile
sub_806DBD8: @ 806DBD8 is_non_stair_warp_tile: @ 806DBD8
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -2501,12 +2501,12 @@ _0806DC06:
_0806DC10: _0806DC10:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8059CF0 bl MetatileBehavior_IsWestArrowWarp
b _0806DC22 b _0806DC22
_0806DC1A: _0806DC1A:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8059CDC bl MetatileBehavior_IsEastArrowWarp
_0806DC22: _0806DC22:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2516,10 +2516,10 @@ _0806DC28:
_0806DC2A: _0806DC2A:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_806DBD8 thumb_func_end is_non_stair_warp_tile
thumb_func_start sub_806DC30 thumb_func_start map_warp_check_packed
sub_806DC30: @ 806DC30 map_warp_check_packed: @ 806DC30
push {lr} push {lr}
adds r3, r1, 0 adds r3, r1, 0
ldrh r1, [r3] ldrh r1, [r3]
@@ -2536,7 +2536,7 @@ sub_806DC30: @ 806DC30
asrs r0, 24 asrs r0, 24
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_806DC30 thumb_func_end map_warp_check_packed
thumb_func_start sub_806DC54 thumb_func_start sub_806DC54
sub_806DC54: @ 806DC54 sub_806DC54: @ 806DC54
@@ -2612,7 +2612,7 @@ sub_806DCD0: @ 806DCD0
bne _0806DD30 bne _0806DD30
lsls r0, r5, 24 lsls r0, r5, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8059BC8 bl MetatileBehavior_IsWarpDoor
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -2620,7 +2620,7 @@ sub_806DCD0: @ 806DCD0
ldr r7, _0806DD2C @ =gUnknown_2036DFC ldr r7, _0806DD2C @ =gUnknown_2036DFC
adds r0, r7, 0 adds r0, r7, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_806DC30 bl map_warp_check_packed
lsls r0, 24 lsls r0, 24
asrs r4, r0, 24 asrs r4, r0, 24
movs r0, 0x1 movs r0, 0x1
@@ -2706,7 +2706,7 @@ trigger_activate: @ 806DD80
cmp r1, 0 cmp r1, 0
bne _0806DD96 bne _0806DD96
ldrb r0, [r4, 0x6] ldrb r0, [r4, 0x6]
bl sub_806E7DC bl trigger_activate_weather
b _0806DDB6 b _0806DDB6
_0806DD96: _0806DD96:
ldrh r0, [r4, 0x6] ldrh r0, [r4, 0x6]
@@ -2990,7 +2990,7 @@ _0806DF98:
cmp r0, 0 cmp r0, 0
beq _0806DFB0 beq _0806DFB0
bl sub_8055A08 bl sub_8055A08
bl sub_807E470 bl sp13E_warp_to_last_warp
movs r0, 0xE2 movs r0, 0xE2
bl sub_80722CC bl sub_80722CC
movs r0, 0x1 movs r0, 0x1
@@ -3125,7 +3125,7 @@ sub_806E08C: @ 806E08C
ldr r4, _0806E0CC @ =gUnknown_2036DFC ldr r4, _0806E0CC @ =gUnknown_2036DFC
adds r0, r4, 0 adds r0, r4, 0
mov r1, sp mov r1, sp
bl sub_806DC30 bl map_warp_check_packed
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
asm/field_door.s
+12 -12
View File
@@ -244,8 +244,8 @@ _0805B0BC:
bx r1 bx r1
thumb_func_end sub_805B060 thumb_func_end sub_805B060
thumb_func_start sub_805B0C4 thumb_func_start door_find
sub_805B0C4: @ 805B0C4 door_find: @ 805B0C4
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
lsls r1, 16 lsls r1, 16
@@ -267,10 +267,10 @@ _0805B0DA:
_0805B0E2: _0805B0E2:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_805B0C4 thumb_func_end door_find
thumb_func_start sub_805B0E8 thumb_func_start task_overworld_door_add_if_inactive
sub_805B0E8: @ 805B0E8 task_overworld_door_add_if_inactive: @ 805B0E8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -319,7 +319,7 @@ _0805B140:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_805B0E8 thumb_func_end task_overworld_door_add_if_inactive
thumb_func_start sub_805B14C thumb_func_start sub_805B14C
sub_805B14C: @ 805B14C sub_805B14C: @ 805B14C
@@ -342,7 +342,7 @@ sub_805B158: @ 805B158
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
adds r0, r4, 0 adds r0, r4, 0
bl sub_805B0C4 bl door_find
adds r4, r0, 0 adds r4, r0, 0
cmp r0, 0 cmp r0, 0
beq _0805B196 beq _0805B196
@@ -397,7 +397,7 @@ sub_805B1B8: @ 805B1B8
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
adds r0, r4, 0 adds r0, r4, 0
bl sub_805B0C4 bl door_find
adds r2, r0, 0 adds r2, r0, 0
adds r4, r2, 0 adds r4, r2, 0
cmp r2, 0 cmp r2, 0
@@ -420,7 +420,7 @@ _0805B1F4:
_0805B1F8: _0805B1F8:
adds r2, r5, 0 adds r2, r5, 0
adds r3, r6, 0 adds r3, r6, 0
bl sub_805B0E8 bl task_overworld_door_add_if_inactive
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
_0805B204: _0805B204:
@@ -444,7 +444,7 @@ sub_805B210: @ 805B210
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
adds r0, r4, 0 adds r0, r4, 0
bl sub_805B0C4 bl door_find
adds r2, r0, 0 adds r2, r0, 0
adds r4, r2, 0 adds r4, r2, 0
cmp r2, 0 cmp r2, 0
@@ -467,7 +467,7 @@ _0805B24C:
_0805B250: _0805B250:
adds r2, r5, 0 adds r2, r5, 0
adds r3, r6, 0 adds r3, r6, 0
bl sub_805B0E8 bl task_overworld_door_add_if_inactive
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
_0805B25C: _0805B25C:
@@ -648,7 +648,7 @@ sub_805B388: @ 805B388
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
adds r0, r4, 0 adds r0, r4, 0
bl sub_805B0C4 bl door_find
cmp r0, 0 cmp r0, 0
beq _0805B3AC beq _0805B3AC
ldrb r0, [r0, 0x2] ldrb r0, [r0, 0x2]
asm/field_effect.s
+4 -4
View File
@@ -2540,7 +2540,7 @@ sub_8084708: @ 8084708
movs r1, 0x1 movs r1, 0x1
bl VarSet bl VarSet
movs r0, 0x8 movs r0, 0x8
bl sub_805BDEC bl SetPlayerAvatarTransitionFlags
movs r0, 0x16 movs r0, 0x16
bl sub_812B1F0 bl sub_812B1F0
_08084760: _08084760:
@@ -3398,7 +3398,7 @@ sub_8084DCC: @ 8084DCC
b _08084E1E b _08084E1E
_08084DE2: _08084DE2:
ldrb r0, [r4, 0x1E] ldrb r0, [r4, 0x1E]
bl sub_805A104 bl MetatileBehavior_IsWaterfall
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0 cmp r4, 0
@@ -6948,7 +6948,7 @@ sub_8086944: @ 8086944
ldr r0, _08086988 @ =gUnknown_20386E0 ldr r0, _08086988 @ =gUnknown_20386E0
ldr r0, [r0] ldr r0, [r0]
strh r0, [r1, 0x26] strh r0, [r1, 0x26]
bl sub_8055E84 bl sav1_reset_battle_music_maybe
ldr r4, _0808698C @ =0x00000131 ldr r4, _0808698C @ =0x00000131
adds r0, r4, 0 adds r0, r4, 0
bl sub_8056124 bl sub_8056124
@@ -7723,7 +7723,7 @@ sub_8086F64: @ 8086F64
movs r0, 0x10 movs r0, 0x10
strh r0, [r4, 0xC] strh r0, [r4, 0xC]
movs r0, 0x1 movs r0, 0x1
bl sub_805BDEC bl SetPlayerAvatarTransitionFlags
ldr r0, _08086FA0 @ =gUnknown_2037078 ldr r0, _08086FA0 @ =gUnknown_2037078
ldrb r1, [r0, 0x5] ldrb r1, [r0, 0x5]
lsls r0, r1, 3 lsls r0, r1, 3
asm/field_effect_helpers.s
+2 -2
View File
@@ -202,7 +202,7 @@ _080DAEF4:
b _080DAF12 b _080DAF12
_080DAF02: _080DAF02:
adds r0, r4, 0 adds r0, r4, 0
bl sub_805FF34 bl npc_paltag_by_palslot
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
adds r1, r4, 0 adds r1, r4, 0
@@ -2857,7 +2857,7 @@ sub_80DC348: @ 80DC348
movs r2, 0x32 movs r2, 0x32
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
ldrh r2, [r4, 0x34] ldrh r2, [r4, 0x34]
bl sub_8058FA4 bl MapGridSetMetatileIdAt
movs r1, 0x30 movs r1, 0x30
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
movs r2, 0x32 movs r2, 0x32
asm/field_fadetransition.s
+19 -19
View File
@@ -505,10 +505,10 @@ _0807DEE8:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _0807DF04 bne _0807DF04
ldr r5, _0807DF00 @ =sub_807E20C ldr r5, _0807DF00 @ =task_map_chg_seq_0807E20C
b _0807DF2E b _0807DF2E
.align 2, 0 .align 2, 0
_0807DF00: .4byte sub_807E20C _0807DF00: .4byte task_map_chg_seq_0807E20C
_0807DF04: _0807DF04:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8059C5C bl sub_8059C5C
@@ -518,17 +518,17 @@ _0807DF04:
bne _0807DF2C bne _0807DF2C
ldr r0, _0807DF20 @ =gUnknown_2031DE0 ldr r0, _0807DF20 @ =gUnknown_2031DE0
ldrb r0, [r0] ldrb r0, [r0]
ldr r5, _0807DF24 @ =sub_807E2CC ldr r5, _0807DF24 @ =task_map_chg_seq_0807E2CC
cmp r0, 0 cmp r0, 0
bne _0807DF2E bne _0807DF2E
ldr r5, _0807DF28 @ =sub_807EC34 ldr r5, _0807DF28 @ =sub_807EC34
b _0807DF2E b _0807DF2E
.align 2, 0 .align 2, 0
_0807DF20: .4byte gUnknown_2031DE0 _0807DF20: .4byte gUnknown_2031DE0
_0807DF24: .4byte sub_807E2CC _0807DF24: .4byte task_map_chg_seq_0807E2CC
_0807DF28: .4byte sub_807EC34 _0807DF28: .4byte sub_807EC34
_0807DF2C: _0807DF2C:
ldr r5, _0807DF44 @ =sub_807E2CC ldr r5, _0807DF44 @ =task_map_chg_seq_0807E2CC
_0807DF2E: _0807DF2E:
ldr r1, _0807DF48 @ =gUnknown_2031DE0 ldr r1, _0807DF48 @ =gUnknown_2031DE0
movs r0, 0 movs r0, 0
@@ -541,7 +541,7 @@ _0807DF2E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0807DF44: .4byte sub_807E2CC _0807DF44: .4byte task_map_chg_seq_0807E2CC
_0807DF48: .4byte gUnknown_2031DE0 _0807DF48: .4byte gUnknown_2031DE0
thumb_func_end sub_807DE78 thumb_func_end sub_807DE78
@@ -871,8 +871,8 @@ _0807E206:
bx r0 bx r0
thumb_func_end sub_807DFBC thumb_func_end sub_807DFBC
thumb_func_start sub_807E20C thumb_func_start task_map_chg_seq_0807E20C
sub_807E20C: @ 807E20C task_map_chg_seq_0807E20C: @ 807E20C
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -960,10 +960,10 @@ _0807E2C6:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_807E20C thumb_func_end task_map_chg_seq_0807E20C
thumb_func_start sub_807E2CC thumb_func_start task_map_chg_seq_0807E2CC
sub_807E2CC: @ 807E2CC task_map_chg_seq_0807E2CC: @ 807E2CC
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -1000,7 +1000,7 @@ _0807E316:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_807E2CC thumb_func_end task_map_chg_seq_0807E2CC
thumb_func_start sub_807E31C thumb_func_start sub_807E31C
sub_807E31C: @ 807E31C sub_807E31C: @ 807E31C
@@ -1176,8 +1176,8 @@ _0807E468: .4byte sub_807DF64
_0807E46C: .4byte sub_807E718 _0807E46C: .4byte sub_807E718
thumb_func_end sub_807E438 thumb_func_end sub_807E438
thumb_func_start sub_807E470 thumb_func_start sp13E_warp_to_last_warp
sub_807E470: @ 807E470 sp13E_warp_to_last_warp: @ 807E470
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_8055F88 bl sub_8055F88
@@ -1195,7 +1195,7 @@ sub_807E470: @ 807E470
_0807E494: .4byte gUnknown_3005020 _0807E494: .4byte gUnknown_3005020
_0807E498: .4byte sub_807DF64 _0807E498: .4byte sub_807DF64
_0807E49C: .4byte sub_807E718 _0807E49C: .4byte sub_807E718
thumb_func_end sub_807E470 thumb_func_end sp13E_warp_to_last_warp
thumb_func_start sub_807E4A0 thumb_func_start sub_807E4A0
sub_807E4A0: @ 807E4A0 sub_807E4A0: @ 807E4A0
@@ -1282,10 +1282,10 @@ _0807E540: .4byte sub_807DF64
_0807E544: .4byte sub_807E784 _0807E544: .4byte sub_807E784
thumb_func_end sub_807E524 thumb_func_end sub_807E524
thumb_func_start sub_807E548 thumb_func_start sp13F_fall_to_last_warp
sub_807E548: @ 807E548 sp13F_fall_to_last_warp: @ 807E548
push {lr} push {lr}
bl sub_807E470 bl sp13E_warp_to_last_warp
ldr r1, _0807E558 @ =gUnknown_3005020 ldr r1, _0807E558 @ =gUnknown_3005020
ldr r0, _0807E55C @ =sub_8084454 ldr r0, _0807E55C @ =sub_8084454
str r0, [r1] str r0, [r1]
@@ -1294,7 +1294,7 @@ sub_807E548: @ 807E548
.align 2, 0 .align 2, 0
_0807E558: .4byte gUnknown_3005020 _0807E558: .4byte gUnknown_3005020
_0807E55C: .4byte sub_8084454 _0807E55C: .4byte sub_8084454
thumb_func_end sub_807E548 thumb_func_end sp13F_fall_to_last_warp
thumb_func_start sub_807E560 thumb_func_start sub_807E560
sub_807E560: @ 807E560 sub_807E560: @ 807E560
asm/field_ground_effect.s
+3 -3
View File
@@ -486,12 +486,12 @@ GetGroundEffectFlags_HotSprings: @ 8067EBC
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
ldrb r0, [r4, 0x1E] ldrb r0, [r4, 0x1E]
bl sub_805A0F0 bl MetatileBehavior_IsHotSprings
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08067EFA beq _08067EFA
ldrb r0, [r4, 0x1F] ldrb r0, [r4, 0x1F]
bl sub_805A0F0 bl MetatileBehavior_IsHotSprings
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08067EFA beq _08067EFA
@@ -755,7 +755,7 @@ GetReflectionTypeByMetatileBehavior: @ 80680C8
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_8059BB4 bl MetatileBehavior_IsIce
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080680DE beq _080680DE
asm/field_map_obj.s
+23 -23
View File
@@ -2314,7 +2314,7 @@ _0805EEDC:
bne _0805EF6A bne _0805EF6A
mov r0, r8 mov r0, r8
adds r1, r7, 0 adds r1, r7, 0
bl sub_805F02C bl SetPlayerAvatarFieldObjectIdAndObjectId
bl sub_80DB0C4 bl sub_80DB0C4
strb r0, [r6, 0x1B] strb r0, [r6, 0x1B]
_0805EF6A: _0805EF6A:
@@ -2413,8 +2413,8 @@ sub_805EFF4: @ 805EFF4
bx r0 bx r0
thumb_func_end sub_805EFF4 thumb_func_end sub_805EFF4
thumb_func_start sub_805F02C thumb_func_start SetPlayerAvatarFieldObjectIdAndObjectId
sub_805F02C: @ 805F02C SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2438,7 +2438,7 @@ sub_805F02C: @ 805F02C
.align 2, 0 .align 2, 0
_0805F058: .4byte gUnknown_2037078 _0805F058: .4byte gUnknown_2037078
_0805F05C: .4byte gUnknown_2036E38 _0805F05C: .4byte gUnknown_2036E38
thumb_func_end sub_805F02C thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId
thumb_func_start sub_805F060 thumb_func_start sub_805F060
sub_805F060: @ 805F060 sub_805F060: @ 805F060
@@ -4474,8 +4474,8 @@ _0805FEC2:
_0805FEC8: .4byte gUnknown_2036E38 _0805FEC8: .4byte gUnknown_2036E38
thumb_func_end sub_805FE94 thumb_func_end sub_805FE94
thumb_func_start sub_805FECC thumb_func_start npc_paltag_set_load
sub_805FECC: @ 805FECC npc_paltag_set_load: @ 805FECC
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@@ -4522,10 +4522,10 @@ _0805FF2A:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0805FF30: .4byte gUnknown_83A5330 _0805FF30: .4byte gUnknown_83A5330
thumb_func_end sub_805FECC thumb_func_end npc_paltag_set_load
thumb_func_start sub_805FF34 thumb_func_start npc_paltag_by_palslot
sub_805FF34: @ 805FF34 npc_paltag_by_palslot: @ 805FF34
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
@@ -4591,7 +4591,7 @@ _0805FFA2:
_0805FFA8: .4byte gUnknown_83A5278 _0805FFA8: .4byte gUnknown_83A5278
_0805FFAC: .4byte 0x000011ff _0805FFAC: .4byte 0x000011ff
_0805FFB0: .4byte gUnknown_203709A _0805FFB0: .4byte gUnknown_203709A
thumb_func_end sub_805FF34 thumb_func_end npc_paltag_by_palslot
thumb_func_start sub_805FFB4 thumb_func_start sub_805FFB4
sub_805FFB4: @ 805FFB4 sub_805FFB4: @ 805FFB4
@@ -10995,7 +10995,7 @@ oac_hopping: @ 8062D98
movs r3, 0x2 movs r3, 0x2
bl sub_8063A6C bl sub_8063A6C
adds r0, r6, 0 adds r0, r6, 0
bl sub_8064110 bl GetJumpLedgeAnimId
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 24 lsls r2, 24
lsrs r2, 24 lsrs r2, 24
@@ -13759,8 +13759,8 @@ _080640FC:
_0806410C: .4byte gUnknown_83A652D _0806410C: .4byte gUnknown_83A652D
thumb_func_end sub_80640E4 thumb_func_end sub_80640E4
thumb_func_start sub_8064110 thumb_func_start GetJumpLedgeAnimId
sub_8064110: @ 8064110 GetJumpLedgeAnimId: @ 8064110
push {r4,lr} push {r4,lr}
sub sp, 0x8 sub sp, 0x8
lsls r0, 24 lsls r0, 24
@@ -13782,7 +13782,7 @@ _08064128:
bx r1 bx r1
.align 2, 0 .align 2, 0
_08064138: .4byte gUnknown_83A6532 _08064138: .4byte gUnknown_83A6532
thumb_func_end sub_8064110 thumb_func_end GetJumpLedgeAnimId
thumb_func_start sub_806413C thumb_func_start sub_806413C
sub_806413C: @ 806413C sub_806413C: @ 806413C
@@ -14791,8 +14791,8 @@ sub_8064830: @ 8064830
bx r0 bx r0
thumb_func_end sub_8064830 thumb_func_end sub_8064830
thumb_func_start sub_806485C thumb_func_start an_walk_any_2
sub_806485C: @ 806485C an_walk_any_2: @ 806485C
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -14821,7 +14821,7 @@ _0806488E:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_806485C thumb_func_end an_walk_any_2
thumb_func_start sub_8064894 thumb_func_start sub_8064894
sub_8064894: @ 8064894 sub_8064894: @ 8064894
@@ -15103,7 +15103,7 @@ sub_8064A68: @ 8064A68
sub_8064A88: @ 8064A88 sub_8064A88: @ 8064A88
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_806485C bl an_walk_any_2
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08064A9A bne _08064A9A
@@ -15140,7 +15140,7 @@ sub_8064AA8: @ 8064AA8
sub_8064AC8: @ 8064AC8 sub_8064AC8: @ 8064AC8
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_806485C bl an_walk_any_2
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08064ADA bne _08064ADA
@@ -15177,7 +15177,7 @@ sub_8064AE8: @ 8064AE8
sub_8064B08: @ 8064B08 sub_8064B08: @ 8064B08
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_806485C bl an_walk_any_2
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08064B1A bne _08064B1A
@@ -15214,7 +15214,7 @@ sub_8064B28: @ 8064B28
sub_8064B48: @ 8064B48 sub_8064B48: @ 8064B48
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_806485C bl an_walk_any_2
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08064B5A bne _08064B5A
@@ -19861,7 +19861,7 @@ sub_8066BB0: @ 8066BB0
sub_8066BE4: @ 8066BE4 sub_8066BE4: @ 8066BE4
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_806485C bl an_walk_any_2
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08066BF6 bne _08066BF6
@@ -19913,7 +19913,7 @@ sub_8066C10: @ 8066C10
sub_8066C44: @ 8066C44 sub_8066C44: @ 8066C44
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_806485C bl an_walk_any_2
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08066C56 bne _08066C56
asm/field_message_box.s
+1 -1
View File
@@ -224,7 +224,7 @@ textbox_fdecode_auto_and_task_add: @ 80694C8
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldr r0, _080694E0 @ =gUnknown_2021D18 ldr r0, _080694E0 @ =gUnknown_2021D18
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
bl sub_80F6D5C bl sub_80F6D5C
bl task_add_textbox bl task_add_textbox
asm/field_player_avatar.s
+30 -30
View File
@@ -67,7 +67,7 @@ sub_805B3E0: @ 805B3E0
bne _0805B448 bne _0805B448
adds r0, r5, 0 adds r0, r5, 0
bl npc_clear_strange_bits bl npc_clear_strange_bits
bl sub_805BE08 bl DoPlayerAvatarTransition
bl sub_805B5A0 bl sub_805B5A0
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
@@ -1150,7 +1150,7 @@ _0805BBF8:
cmp r0, 0 cmp r0, 0
beq _0805BC1C beq _0805BC1C
movs r0, 0x2B movs r0, 0x2B
bl sub_8054E90 bl IncrementGameStat
movs r0, 0x6 movs r0, 0x6
b _0805BC50 b _0805BC50
_0805BC1C: _0805BC1C:
@@ -1394,8 +1394,8 @@ _0805BDE6:
bx r0 bx r0
thumb_func_end sub_805BDAC thumb_func_end sub_805BDAC
thumb_func_start sub_805BDEC thumb_func_start SetPlayerAvatarTransitionFlags
sub_805BDEC: @ 805BDEC SetPlayerAvatarTransitionFlags: @ 805BDEC
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1403,15 +1403,15 @@ sub_805BDEC: @ 805BDEC
ldrb r1, [r2, 0x1] ldrb r1, [r2, 0x1]
orrs r0, r1 orrs r0, r1
strb r0, [r2, 0x1] strb r0, [r2, 0x1]
bl sub_805BE08 bl DoPlayerAvatarTransition
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0805BE04: .4byte gUnknown_2037078 _0805BE04: .4byte gUnknown_2037078
thumb_func_end sub_805BDEC thumb_func_end SetPlayerAvatarTransitionFlags
thumb_func_start sub_805BE08 thumb_func_start DoPlayerAvatarTransition
sub_805BE08: @ 805BE08 DoPlayerAvatarTransition: @ 805BE08
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, _0805BE50 @ =gUnknown_2037078 ldr r0, _0805BE50 @ =gUnknown_2037078
ldrb r4, [r0, 0x1] ldrb r4, [r0, 0x1]
@@ -1453,7 +1453,7 @@ _0805BE48:
_0805BE50: .4byte gUnknown_2037078 _0805BE50: .4byte gUnknown_2037078
_0805BE54: .4byte gUnknown_835B844 _0805BE54: .4byte gUnknown_835B844
_0805BE58: .4byte gUnknown_2036E38 _0805BE58: .4byte gUnknown_2036E38
thumb_func_end sub_805BE08 thumb_func_end DoPlayerAvatarTransition
thumb_func_start nullsub_22 thumb_func_start nullsub_22
nullsub_22: @ 805BE5C nullsub_22: @ 805BE5C
@@ -2022,7 +2022,7 @@ sub_805C23C: @ 805C23C
movs r0, 0xA movs r0, 0xA
bl sub_80722CC bl sub_80722CC
adds r0, r4, 0 adds r0, r4, 0
bl sub_8064110 bl GetJumpLedgeAnimId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x8 movs r1, 0x8
@@ -2052,7 +2052,7 @@ sub_805C270: @ 805C270
cmp r0, 0 cmp r0, 0
bne _0805C2A6 bne _0805C2A6
_0805C27E: _0805C27E:
bl sub_80BD58C bl player_should_look_direction_be_enforced_upon_movement
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0805C2A6 beq _0805C2A6
@@ -2365,7 +2365,7 @@ _0805C4A0:
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_8059BC8 bl MetatileBehavior_IsWarpDoor
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0805C4DE bne _0805C4DE
@@ -3081,7 +3081,7 @@ SetPlayerAvatarExtraStateTransition: @ 805CA0C
ldrb r1, [r5, 0x1] ldrb r1, [r5, 0x1]
orrs r0, r1 orrs r0, r1
strb r0, [r5, 0x1] strb r0, [r5, 0x1]
bl sub_805BE08 bl DoPlayerAvatarTransition
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -3965,8 +3965,8 @@ sub_805D0F8: @ 805D0F8
lsrs r4, 24 lsrs r4, 24
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl player_bitmagic bl player_bitmagic
bl sub_8055E84 bl sav1_reset_battle_music_maybe
bl sub_8055F1C bl Overworld_ChangeMusicToDefault
ldr r2, _0805D148 @ =gUnknown_2037078 ldr r2, _0805D148 @ =gUnknown_2037078
ldrb r1, [r2] ldrb r1, [r2]
movs r0, 0xF7 movs r0, 0xF7
@@ -3976,7 +3976,7 @@ sub_805D0F8: @ 805D0F8
strb r0, [r2] strb r0, [r2]
movs r0, 0x1 movs r0, 0x1
strb r0, [r2, 0x6] strb r0, [r2, 0x6]
ldr r5, _0805D14C @ =sub_805D1D4 ldr r5, _0805D14C @ =taskFF_0805D1D4
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0xFF movs r1, 0xFF
bl CreateTask bl CreateTask
@@ -3994,7 +3994,7 @@ sub_805D0F8: @ 805D0F8
bx r0 bx r0
.align 2, 0 .align 2, 0
_0805D148: .4byte gUnknown_2037078 _0805D148: .4byte gUnknown_2037078
_0805D14C: .4byte sub_805D1D4 _0805D14C: .4byte taskFF_0805D1D4
_0805D150: .4byte gUnknown_3005090 _0805D150: .4byte gUnknown_3005090
thumb_func_end sub_805D0F8 thumb_func_end sub_805D0F8
@@ -4015,7 +4015,7 @@ sub_805D154: @ 805D154
strb r0, [r2] strb r0, [r2]
movs r0, 0x1 movs r0, 0x1
strb r0, [r2, 0x6] strb r0, [r2, 0x6]
ldr r5, _0805D1A0 @ =sub_805D1D4 ldr r5, _0805D1A0 @ =taskFF_0805D1D4
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0xFF movs r1, 0xFF
bl CreateTask bl CreateTask
@@ -4033,7 +4033,7 @@ sub_805D154: @ 805D154
bx r0 bx r0
.align 2, 0 .align 2, 0
_0805D19C: .4byte gUnknown_2037078 _0805D19C: .4byte gUnknown_2037078
_0805D1A0: .4byte sub_805D1D4 _0805D1A0: .4byte taskFF_0805D1D4
_0805D1A4: .4byte gUnknown_3005090 _0805D1A4: .4byte gUnknown_3005090
thumb_func_end sub_805D154 thumb_func_end sub_805D154
@@ -4060,8 +4060,8 @@ _0805D1CC: .4byte gUnknown_3005E88
_0805D1D0: .4byte gUnknown_835B820 _0805D1D0: .4byte gUnknown_835B820
thumb_func_end sub_805D1A8 thumb_func_end sub_805D1A8
thumb_func_start sub_805D1D4 thumb_func_start taskFF_0805D1D4
sub_805D1D4: @ 805D1D4 taskFF_0805D1D4: @ 805D1D4
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
@@ -4109,7 +4109,7 @@ _0805D230: .4byte gUnknown_2037078
_0805D234: .4byte gUnknown_2036E38 _0805D234: .4byte gUnknown_2036E38
_0805D238: .4byte gUnknown_3005090 _0805D238: .4byte gUnknown_3005090
_0805D23C: .4byte sub_805D240 _0805D23C: .4byte sub_805D240
thumb_func_end sub_805D1D4 thumb_func_end taskFF_0805D1D4
thumb_func_start sub_805D240 thumb_func_start sub_805D240
sub_805D240: @ 805D240 sub_805D240: @ 805D240
@@ -4250,8 +4250,8 @@ sub_805D33C: @ 805D33C
_0805D358: .4byte gUnknown_2037078 _0805D358: .4byte gUnknown_2037078
thumb_func_end sub_805D33C thumb_func_end sub_805D33C
thumb_func_start sub_805D35C thumb_func_start fish1
sub_805D35C: @ 805D35C fish1: @ 805D35C
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x10 sub sp, 0x10
adds r5, r0, 0 adds r5, r0, 0
@@ -4318,10 +4318,10 @@ _0805D3E4: .4byte gUnknown_835B90C
_0805D3E8: .4byte gUnknown_835B912 _0805D3E8: .4byte gUnknown_835B912
_0805D3EC: .4byte gUnknown_2036E38 _0805D3EC: .4byte gUnknown_2036E38
_0805D3F0: .4byte gUnknown_2037078 _0805D3F0: .4byte gUnknown_2037078
thumb_func_end sub_805D35C thumb_func_end fish1
thumb_func_start sub_805D3F4 thumb_func_start fish2
sub_805D3F4: @ 805D3F4 fish2: @ 805D3F4
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r0, _0805D428 @ =gUnknown_2037078 ldr r0, _0805D428 @ =gUnknown_2037078
@@ -4350,7 +4350,7 @@ _0805D41E:
.align 2, 0 .align 2, 0
_0805D428: .4byte gUnknown_2037078 _0805D428: .4byte gUnknown_2037078
_0805D42C: .4byte gUnknown_202063C _0805D42C: .4byte gUnknown_202063C
thumb_func_end sub_805D3F4 thumb_func_end fish2
thumb_func_start sub_805D430 thumb_func_start sub_805D430
sub_805D430: @ 805D430 sub_805D430: @ 805D430
@@ -4717,7 +4717,7 @@ _0805D6EA:
cmp r0, 0 cmp r0, 0
bne _0805D788 bne _0805D788
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r6, r0, 16 lsrs r6, r0, 16
cmp r6, 0 cmp r6, 0
@@ -5032,7 +5032,7 @@ sub_805D980: @ 805D980
push {lr} push {lr}
bl sub_8002DE8 bl sub_8002DE8
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r1, r0, 16 lsrs r1, r0, 16
cmp r1, 0 cmp r1, 0
asm/field_screen_effect.s
+9 -9
View File
@@ -373,17 +373,17 @@ _0807F0AC: .4byte gUnknown_83C68D4
sub_807F0B0: @ 807F0B0 sub_807F0B0: @ 807F0B0
push {lr} push {lr}
bl sub_8055FD4 bl sub_8055FD4
ldr r0, _0807F0C4 @ =sub_807F0C8 ldr r0, _0807F0C4 @ =task50_0807F0C8
movs r1, 0x50 movs r1, 0x50
bl CreateTask bl CreateTask
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0807F0C4: .4byte sub_807F0C8 _0807F0C4: .4byte task50_0807F0C8
thumb_func_end sub_807F0B0 thumb_func_end sub_807F0B0
thumb_func_start sub_807F0C8 thumb_func_start task50_0807F0C8
sub_807F0C8: @ 807F0C8 task50_0807F0C8: @ 807F0C8
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -399,7 +399,7 @@ _0807F0E4:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_807F0C8 thumb_func_end task50_0807F0C8
thumb_func_start sub_807F0EC thumb_func_start sub_807F0EC
sub_807F0EC: @ 807F0EC sub_807F0EC: @ 807F0EC
@@ -771,7 +771,7 @@ _0807F3E0:
ldr r5, _0807F424 @ =gUnknown_2021D18 ldr r5, _0807F424 @ =gUnknown_2021D18
adds r0, r5, 0 adds r0, r5, 0
mov r1, r8 mov r1, r8
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
mov r8, r0 mov r8, r0
str r0, [sp] str r0, [sp]
@@ -785,7 +785,7 @@ _0807F3E0:
movs r1, 0x2 movs r1, 0x2
mov r2, r10 mov r2, r10
mov r3, r9 mov r3, r9
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldr r2, _0807F42C @ =gUnknown_3003E50 ldr r2, _0807F42C @ =gUnknown_3003E50
ldrb r1, [r2] ldrb r1, [r2]
movs r0, 0x2 movs r0, 0x2
@@ -802,7 +802,7 @@ _0807F42C: .4byte gUnknown_3003E50
_0807F430: _0807F430:
bl sub_8002DE8 bl sub_8002DE8
adds r0, r7, 0 adds r0, r7, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
cmp r0, 0 cmp r0, 0
@@ -859,7 +859,7 @@ _0807F48C:
.4byte _0807F5D0 .4byte _0807F5D0
_0807F4A8: _0807F4A8:
ldr r0, _0807F518 @ =gUnknown_83C68E4 ldr r0, _0807F518 @ =gUnknown_83C68E4
bl sub_8003CE4 bl AddWindow
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r1, _0807F51C @ =gUnknown_3005090 ldr r1, _0807F51C @ =gUnknown_3005090
asm/field_specials.s
+71 -71
View File
@@ -28,7 +28,7 @@ sub_80CA630: @ 80CA630
cmp r0, 0 cmp r0, 0
beq _080CA644 beq _080CA644
movs r0, 0x2 movs r0, 0x2
bl sub_805BDEC bl SetPlayerAvatarTransitionFlags
_080CA644: _080CA644:
movs r4, 0x8D movs r4, 0x8D
lsls r4, 1 lsls r4, 1
@@ -200,7 +200,7 @@ _080CA768: .4byte gUnknown_20370C0
thumb_func_start sub_80CA76C thumb_func_start sub_80CA76C
sub_80CA76C: @ 80CA76C sub_80CA76C: @ 80CA76C
push {r4,lr} push {r4,lr}
bl sub_80CACFC bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -495,7 +495,7 @@ _080CA96E:
adds r2, r3, 0 adds r2, r3, 0
orrs r4, r2 orrs r4, r2
adds r2, r4, 0 adds r2, r4, 0
bl sub_8058FA4 bl MapGridSetMetatileIdAt
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
@@ -571,7 +571,7 @@ _080CA9F6:
adds r2, r3, 0 adds r2, r3, 0
orrs r4, r2 orrs r4, r2
adds r2, r4, 0 adds r2, r4, 0
bl sub_8058FA4 bl MapGridSetMetatileIdAt
bl DrawWholeMapView bl DrawWholeMapView
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -581,8 +581,8 @@ _080CAA2C: .4byte 0x0000028f
_080CAA30: .4byte gUnknown_3005008 _080CAA30: .4byte gUnknown_3005008
thumb_func_end sub_80CA9A8 thumb_func_end sub_80CA9A8
thumb_func_start sub_80CAA34 thumb_func_start SpawnScriptFieldObject
sub_80CAA34: @ 80CAA34 SpawnScriptFieldObject: @ 80CAA34
push {lr} push {lr}
sub sp, 0x8 sub sp, 0x8
ldr r0, _080CAA80 @ =gUnknown_3005008 ldr r0, _080CAA80 @ =gUnknown_3005008
@@ -621,10 +621,10 @@ sub_80CAA34: @ 80CAA34
.align 2, 0 .align 2, 0
_080CAA80: .4byte gUnknown_3005008 _080CAA80: .4byte gUnknown_3005008
_080CAA84: .4byte gUnknown_2036E38 _080CAA84: .4byte gUnknown_2036E38
thumb_func_end sub_80CAA34 thumb_func_end SpawnScriptFieldObject
thumb_func_start sub_80CAA88 thumb_func_start RemoveScriptFieldObject
sub_80CAA88: @ 80CAA88 RemoveScriptFieldObject: @ 80CAA88
push {lr} push {lr}
bl GetPlayerAvatarObjectId bl GetPlayerAvatarObjectId
lsls r0, 24 lsls r0, 24
@@ -640,7 +640,7 @@ sub_80CAA88: @ 80CAA88
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CAAA8: .4byte gUnknown_3005008 _080CAAA8: .4byte gUnknown_3005008
thumb_func_end sub_80CAA88 thumb_func_end RemoveScriptFieldObject
thumb_func_start sub_80CAAAC thumb_func_start sub_80CAAAC
sub_80CAAAC: @ 80CAAAC sub_80CAAAC: @ 80CAAAC
@@ -675,7 +675,7 @@ _080CAADC: .4byte gUnknown_83F5B1A
thumb_func_start sub_80CAAE0 thumb_func_start sub_80CAAE0
sub_80CAAE0: @ 80CAAE0 sub_80CAAE0: @ 80CAAE0
push {lr} push {lr}
bl sub_80CACFC bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -698,13 +698,13 @@ sub_80CAB08: @ 80CAB08
push {lr} push {lr}
sub sp, 0x4 sub sp, 0x4
movs r0, 0x2A movs r0, 0x2A
bl sub_8054E90 bl IncrementGameStat
ldr r0, _080CAB3C @ =0x0000083b ldr r0, _080CAB3C @ =0x0000083b
bl FlagSet bl FlagSet
movs r1, 0x1 movs r1, 0x1
mov r0, sp mov r0, sp
strb r1, [r0] strb r1, [r0]
bl sub_80CACFC bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -725,14 +725,14 @@ _080CAB40: .4byte gUnknown_2024284
thumb_func_start sub_80CAB44 thumb_func_start sub_80CAB44
sub_80CAB44: @ 80CAB44 sub_80CAB44: @ 80CAB44
push {lr} push {lr}
bl sub_80CACFC bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CAB68 @ =gUnknown_2024284 ldr r1, _080CAB68 @ =gUnknown_2024284
adds r0, r1 adds r0, r1
bl sub_8043A40 bl GetMonEVCount
lsls r0, 16 lsls r0, 16
ldr r1, _080CAB6C @ =0x01fd0000 ldr r1, _080CAB6C @ =0x01fd0000
cmp r0, r1 cmp r0, r1
@@ -834,7 +834,7 @@ sub_80CAC08: @ 80CAC08
push {lr} push {lr}
ldr r0, _080CAC1C @ =gUnknown_2024284 ldr r0, _080CAC1C @ =gUnknown_2024284
movs r1, 0x3F movs r1, 0x3F
bl sub_8043A70 bl CheckPartyPokerus
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080CAC20 beq _080CAC20
@@ -952,8 +952,8 @@ sub_80CACE8: @ 80CACE8
bx r0 bx r0
thumb_func_end sub_80CACE8 thumb_func_end sub_80CACE8
thumb_func_start sub_80CACFC thumb_func_start GetLeadMonIndex
sub_80CACFC: @ 80CACFC GetLeadMonIndex: @ 80CACFC
push {r4-r6,lr} push {r4-r6,lr}
bl CalculatePlayerPartyCount bl CalculatePlayerPartyCount
lsls r0, 24 lsls r0, 24
@@ -997,7 +997,7 @@ _080CAD4C:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80CACFC thumb_func_end GetLeadMonIndex
thumb_func_start sub_80CAD54 thumb_func_start sub_80CAD54
sub_80CAD54: @ 80CAD54 sub_80CAD54: @ 80CAD54
@@ -2065,7 +2065,7 @@ sub_80CB580: @ 80CB580
beq _080CB614 beq _080CB614
ldr r4, _080CB624 @ =gUnknown_2039A0C ldr r4, _080CB624 @ =gUnknown_2039A0C
ldr r0, _080CB628 @ =gUnknown_83F5B3C ldr r0, _080CB628 @ =gUnknown_83F5B3C
bl sub_8003CE4 bl AddWindow
strb r0, [r4] strb r0, [r4]
ldrb r0, [r4] ldrb r0, [r4]
ldr r5, _080CB62C @ =0x0000021d ldr r5, _080CB62C @ =0x0000021d
@@ -2251,7 +2251,7 @@ _080CB6F6:
orrs r2, r0 orrs r2, r0
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_8058FA4 bl MapGridSetMetatileIdAt
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -2297,7 +2297,7 @@ _080CB752:
orrs r2, r0 orrs r2, r0
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_8058FA4 bl MapGridSetMetatileIdAt
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -2626,7 +2626,7 @@ _080CB9D2:
str r0, [sp, 0x18] str r0, [sp, 0x18]
str r1, [sp, 0x1C] str r1, [sp, 0x1C]
mov r0, r9 mov r0, r9
bl sub_8003CE4 bl AddWindow
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
@@ -3080,7 +3080,7 @@ sub_80CBD80: @ 80CBD80
movs r0, 0x16 movs r0, 0x16
bl sub_812B1F0 bl sub_812B1F0
movs r0, 0x8 movs r0, 0x8
bl sub_805BDEC bl SetPlayerAvatarTransitionFlags
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80CBD80 thumb_func_end sub_80CBD80
@@ -3249,7 +3249,7 @@ _080CBEB2:
thumb_func_start sub_80CBEBC thumb_func_start sub_80CBEBC
sub_80CBEBC: @ 80CBEBC sub_80CBEBC: @ 80CBEBC
push {lr} push {lr}
bl sub_80CACFC bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80CBE50 bl sub_80CBE50
@@ -3259,8 +3259,8 @@ sub_80CBEBC: @ 80CBEBC
bx r1 bx r1
thumb_func_end sub_80CBEBC thumb_func_end sub_80CBEBC
thumb_func_start sub_80CBED4 thumb_func_start TV_PrintIntToStringVar
sub_80CBED4: @ 80CBED4 TV_PrintIntToStringVar: @ 80CBED4
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -3283,7 +3283,7 @@ sub_80CBED4: @ 80CBED4
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CBF00: .4byte gUnknown_83F5AF8 _080CBF00: .4byte gUnknown_83F5AF8
thumb_func_end sub_80CBED4 thumb_func_end TV_PrintIntToStringVar
thumb_func_start sub_80CBF04 thumb_func_start sub_80CBF04
sub_80CBF04: @ 80CBF04 sub_80CBF04: @ 80CBF04
@@ -3401,8 +3401,8 @@ _080CBFDA:
bx r1 bx r1
thumb_func_end sub_80CBFA0 thumb_func_end sub_80CBFA0
thumb_func_start sub_80CBFE0 thumb_func_start ChangeBoxPokemonNickname
sub_80CBFE0: @ 80CBFE0 ChangeBoxPokemonNickname: @ 80CBFE0
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
@@ -3439,13 +3439,13 @@ sub_80CBFE0: @ 80CBFE0
movs r2, 0 movs r2, 0
bl GetBoxMonData bl GetBoxMonData
str r0, [sp] str r0, [sp]
ldr r0, _080CC060 @ =sub_80CC064 ldr r0, _080CC060 @ =ChangeBoxPokemonNickname_CB
str r0, [sp, 0x4] str r0, [sp, 0x4]
movs r0, 0x3 movs r0, 0x3
mov r1, r8 mov r1, r8
adds r2, r5, 0 adds r2, r5, 0
adds r3, r4, 0 adds r3, r4, 0
bl sub_809D954 bl DoNamingScreen
add sp, 0x8 add sp, 0x8
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
@@ -3457,11 +3457,11 @@ _080CC050: .4byte gUnknown_20370D6
_080CC054: .4byte gUnknown_20370D8 _080CC054: .4byte gUnknown_20370D8
_080CC058: .4byte gUnknown_2021D04 _080CC058: .4byte gUnknown_2021D04
_080CC05C: .4byte gUnknown_2021CF0 _080CC05C: .4byte gUnknown_2021CF0
_080CC060: .4byte sub_80CC064 _080CC060: .4byte ChangeBoxPokemonNickname_CB
thumb_func_end sub_80CBFE0 thumb_func_end ChangeBoxPokemonNickname
thumb_func_start sub_80CC064 thumb_func_start ChangeBoxPokemonNickname_CB
sub_80CC064: @ 80CC064 ChangeBoxPokemonNickname_CB: @ 80CC064
push {lr} push {lr}
ldr r0, _080CC07C @ =gUnknown_20370D6 ldr r0, _080CC07C @ =gUnknown_20370D6
ldrb r0, [r0] ldrb r0, [r0]
@@ -3476,10 +3476,10 @@ sub_80CC064: @ 80CC064
_080CC07C: .4byte gUnknown_20370D6 _080CC07C: .4byte gUnknown_20370D6
_080CC080: .4byte gUnknown_20370D8 _080CC080: .4byte gUnknown_20370D8
_080CC084: .4byte gUnknown_2021CF0 _080CC084: .4byte gUnknown_2021CF0
thumb_func_end sub_80CC064 thumb_func_end ChangeBoxPokemonNickname_CB
thumb_func_start sub_80CC088 thumb_func_start ChangePokemonNickname
sub_80CC088: @ 80CC088 ChangePokemonNickname: @ 80CC088
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r10 mov r6, r10
mov r5, r9 mov r5, r9
@@ -3542,13 +3542,13 @@ sub_80CC088: @ 80CC088
movs r2, 0 movs r2, 0
bl GetMonData bl GetMonData
str r0, [sp] str r0, [sp]
ldr r0, _080CC140 @ =sub_80CC144 ldr r0, _080CC140 @ =ChangePokemonNickname_CB
str r0, [sp, 0x4] str r0, [sp, 0x4]
movs r0, 0x3 movs r0, 0x3
mov r1, r10 mov r1, r10
adds r2, r5, 0 adds r2, r5, 0
adds r3, r4, 0 adds r3, r4, 0
bl sub_809D954 bl DoNamingScreen
add sp, 0x8 add sp, 0x8
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
@@ -3562,11 +3562,11 @@ _080CC130: .4byte gUnknown_20370C0
_080CC134: .4byte gUnknown_2024284 _080CC134: .4byte gUnknown_2024284
_080CC138: .4byte gUnknown_2021D04 _080CC138: .4byte gUnknown_2021D04
_080CC13C: .4byte gUnknown_2021CF0 _080CC13C: .4byte gUnknown_2021CF0
_080CC140: .4byte sub_80CC144 _080CC140: .4byte ChangePokemonNickname_CB
thumb_func_end sub_80CC088 thumb_func_end ChangePokemonNickname
thumb_func_start sub_80CC144 thumb_func_start ChangePokemonNickname_CB
sub_80CC144: @ 80CC144 ChangePokemonNickname_CB: @ 80CC144
push {lr} push {lr}
ldr r0, _080CC164 @ =gUnknown_20370C0 ldr r0, _080CC164 @ =gUnknown_20370C0
ldrh r1, [r0] ldrh r1, [r0]
@@ -3584,10 +3584,10 @@ sub_80CC144: @ 80CC144
_080CC164: .4byte gUnknown_20370C0 _080CC164: .4byte gUnknown_20370C0
_080CC168: .4byte gUnknown_2024284 _080CC168: .4byte gUnknown_2024284
_080CC16C: .4byte gUnknown_2021CF0 _080CC16C: .4byte gUnknown_2021CF0
thumb_func_end sub_80CC144 thumb_func_end ChangePokemonNickname_CB
thumb_func_start sub_80CC170 thumb_func_start TV_CopyNicknameToStringVar1AndEnsureTerminated
sub_80CC170: @ 80CC170 TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170
push {r4,lr} push {r4,lr}
ldr r0, _080CC194 @ =gUnknown_20370C0 ldr r0, _080CC194 @ =gUnknown_20370C0
ldrh r1, [r0] ldrh r1, [r0]
@@ -3608,10 +3608,10 @@ sub_80CC170: @ 80CC170
_080CC194: .4byte gUnknown_20370C0 _080CC194: .4byte gUnknown_20370C0
_080CC198: .4byte gUnknown_2024284 _080CC198: .4byte gUnknown_2024284
_080CC19C: .4byte gUnknown_2021CD0 _080CC19C: .4byte gUnknown_2021CD0
thumb_func_end sub_80CC170 thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated
thumb_func_start sub_80CC1A0 thumb_func_start TV_CheckMonOTIDEqualsPlayerID
sub_80CC1A0: @ 80CC1A0 TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0
push {r4,lr} push {r4,lr}
bl sub_80CC1E4 bl sub_80CC1E4
adds r4, r0, 0 adds r4, r0, 0
@@ -3643,7 +3643,7 @@ _080CC1D8:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CC1E0: .4byte gUnknown_20370D0 _080CC1E0: .4byte gUnknown_20370D0
thumb_func_end sub_80CC1A0 thumb_func_end TV_CheckMonOTIDEqualsPlayerID
thumb_func_start sub_80CC1E4 thumb_func_start sub_80CC1E4
sub_80CC1E4: @ 80CC1E4 sub_80CC1E4: @ 80CC1E4
@@ -3883,14 +3883,14 @@ sub_80CC3CC: @ 80CC3CC
movs r5, 0 movs r5, 0
ldr r4, _080CC3F8 @ =gUnknown_20370C0 ldr r4, _080CC3F8 @ =gUnknown_20370C0
movs r0, 0xA movs r0, 0xA
bl sub_8054EC4 bl GetGameStat
strh r0, [r4] strh r0, [r4]
movs r0, 0xD movs r0, 0xD
bl sub_8054EC4 bl GetGameStat
adds r6, r0, 0 adds r6, r0, 0
ldr r4, _080CC3FC @ =gUnknown_20370C4 ldr r4, _080CC3FC @ =gUnknown_20370C4
movs r0, 0x17 movs r0, 0x17
bl sub_8054EC4 bl GetGameStat
strh r0, [r4] strh r0, [r4]
ldr r1, _080CC400 @ =0x0000ffff ldr r1, _080CC400 @ =0x0000ffff
cmp r6, r1 cmp r6, r1
@@ -4385,23 +4385,23 @@ _080CC794: .4byte 0x00000f21
_080CC798: .4byte gUnknown_83F5F24 _080CC798: .4byte gUnknown_83F5F24
thumb_func_end sub_80CC730 thumb_func_end sub_80CC730
thumb_func_start sub_80CC79C thumb_func_start set_unknown_box_id
sub_80CC79C: @ 80CC79C set_unknown_box_id: @ 80CC79C
ldr r1, _080CC7A4 @ =gUnknown_2039A1A ldr r1, _080CC7A4 @ =gUnknown_2039A1A
strb r0, [r1] strb r0, [r1]
bx lr bx lr
.align 2, 0 .align 2, 0
_080CC7A4: .4byte gUnknown_2039A1A _080CC7A4: .4byte gUnknown_2039A1A
thumb_func_end sub_80CC79C thumb_func_end set_unknown_box_id
thumb_func_start sub_80CC7A8 thumb_func_start get_unknown_box_id
sub_80CC7A8: @ 80CC7A8 get_unknown_box_id: @ 80CC7A8
ldr r0, _080CC7B0 @ =gUnknown_2039A1A ldr r0, _080CC7B0 @ =gUnknown_2039A1A
ldrb r0, [r0] ldrb r0, [r0]
bx lr bx lr
.align 2, 0 .align 2, 0
_080CC7B0: .4byte gUnknown_2039A1A _080CC7B0: .4byte gUnknown_2039A1A
thumb_func_end sub_80CC7A8 thumb_func_end get_unknown_box_id
thumb_func_start sub_80CC7B4 thumb_func_start sub_80CC7B4
sub_80CC7B4: @ 80CC7B4 sub_80CC7B4: @ 80CC7B4
@@ -4444,7 +4444,7 @@ sub_80CC7F8: @ 80CC7F8
bl VarGet bl VarGet
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80CC79C bl set_unknown_box_id
bl StorageGetCurrentBox bl StorageGetCurrentBox
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -4462,7 +4462,7 @@ _080CC816:
bl GetBoxMonData bl GetBoxMonData
cmp r0, 0 cmp r0, 0
bne _080CC858 bne _080CC858
bl sub_80CC7A8 bl get_unknown_box_id
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
cmp r0, r4 cmp r0, r4
@@ -4900,7 +4900,7 @@ sub_80CCB94: @ 80CCB94
push {r6,r7} push {r6,r7}
movs r7, 0 movs r7, 0
movs r6, 0 movs r6, 0
bl sub_80CACFC bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
@@ -5178,7 +5178,7 @@ sub_80CCDD0: @ 80CCDD0
lsls r2, 2 lsls r2, 2
movs r0, 0x1F movs r0, 0x1F
movs r1, 0x1F movs r1, 0x1F
bl sub_8058FA4 bl MapGridSetMetatileIdAt
bl DrawWholeMapView bl DrawWholeMapView
movs r0, 0x14 movs r0, 0x14
bl sub_80722CC bl sub_80722CC
@@ -5194,17 +5194,17 @@ _080CCDF8: .4byte 0x000002e3
thumb_func_start sub_80CCDFC thumb_func_start sub_80CCDFC
sub_80CCDFC: @ 80CCDFC sub_80CCDFC: @ 80CCDFC
push {lr} push {lr}
ldr r0, _080CCE0C @ =sub_80CCE10 ldr r0, _080CCE0C @ =task_deoxys_sound
movs r1, 0x8 movs r1, 0x8
bl CreateTask bl CreateTask
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CCE0C: .4byte sub_80CCE10 _080CCE0C: .4byte task_deoxys_sound
thumb_func_end sub_80CCDFC thumb_func_end sub_80CCDFC
thumb_func_start sub_80CCE10 thumb_func_start task_deoxys_sound
sub_80CCE10: @ 80CCE10 task_deoxys_sound: @ 80CCE10
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -5299,7 +5299,7 @@ _080CCED6:
.align 2, 0 .align 2, 0
_080CCEE0: .4byte 0x0000403e _080CCEE0: .4byte 0x0000403e
_080CCEE4: .4byte gUnknown_20370D0 _080CCEE4: .4byte gUnknown_20370D0
thumb_func_end sub_80CCE10 thumb_func_end task_deoxys_sound
thumb_func_start sub_80CCEE8 thumb_func_start sub_80CCEE8
sub_80CCEE8: @ 80CCEE8 sub_80CCEE8: @ 80CCEE8
@@ -5618,7 +5618,7 @@ _080CD14C:
sub_80CD154: @ 80CD154 sub_80CD154: @ 80CD154
push {r4,lr} push {r4,lr}
movs r0, 0xA movs r0, 0xA
bl sub_8054EC4 bl GetGameStat
adds r4, r0, 0 adds r4, r0, 0
cmp r4, 0x18 cmp r4, 0x18
bls _080CD1AE bls _080CD1AE
asm/field_tasks.s
+19 -19
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_806E810 thumb_func_start task_per_step_callback_manager
sub_806E810: @ 806E810 task_per_step_callback_manager: @ 806E810
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -27,7 +27,7 @@ sub_806E810: @ 806E810
.align 2, 0 .align 2, 0
_0806E834: .4byte gUnknown_3005090 _0806E834: .4byte gUnknown_3005090
_0806E838: .4byte gUnknown_83A7310 _0806E838: .4byte gUnknown_83A7310
thumb_func_end sub_806E810 thumb_func_end task_per_step_callback_manager
thumb_func_start sub_806E83C thumb_func_start sub_806E83C
sub_806E83C: @ 806E83C sub_806E83C: @ 806E83C
@@ -65,7 +65,7 @@ _0806E878: .4byte gUnknown_203ADFA
thumb_func_start sub_806E87C thumb_func_start sub_806E87C
sub_806E87C: @ 806E87C sub_806E87C: @ 806E87C
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, _0806E8C4 @ =sub_806E810 ldr r5, _0806E8C4 @ =task_per_step_callback_manager
adds r0, r5, 0 adds r0, r5, 0
bl FuncIsActiveTask bl FuncIsActiveTask
lsls r0, 24 lsls r0, 24
@@ -98,17 +98,17 @@ _0806E8BC:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0806E8C4: .4byte sub_806E810 _0806E8C4: .4byte task_per_step_callback_manager
_0806E8C8: .4byte gUnknown_3005090 _0806E8C8: .4byte gUnknown_3005090
_0806E8CC: .4byte sub_806E83C _0806E8CC: .4byte sub_806E83C
thumb_func_end sub_806E87C thumb_func_end sub_806E87C
thumb_func_start sub_806E8D0 thumb_func_start ActivatePerStepCallback
sub_806E8D0: @ 806E8D0 ActivatePerStepCallback: @ 806E8D0
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, _0806E908 @ =sub_806E810 ldr r0, _0806E908 @ =task_per_step_callback_manager
bl FindTaskIdByFunc bl FindTaskIdByFunc
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
@@ -133,7 +133,7 @@ _0806E8F4:
strh r0, [r1] strh r0, [r1]
b _0806E912 b _0806E912
.align 2, 0 .align 2, 0
_0806E908: .4byte sub_806E810 _0806E908: .4byte task_per_step_callback_manager
_0806E90C: .4byte gUnknown_3005098 _0806E90C: .4byte gUnknown_3005098
_0806E910: _0806E910:
strh r4, [r1] strh r4, [r1]
@@ -141,12 +141,12 @@ _0806E912:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_806E8D0 thumb_func_end ActivatePerStepCallback
thumb_func_start sub_806E918 thumb_func_start wild_encounter_reset_coro_args
sub_806E918: @ 806E918 wild_encounter_reset_coro_args: @ 806E918
push {lr} push {lr}
ldr r0, _0806E948 @ =sub_806E810 ldr r0, _0806E948 @ =task_per_step_callback_manager
bl FindTaskIdByFunc bl FindTaskIdByFunc
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
@@ -168,10 +168,10 @@ _0806E942:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0806E948: .4byte sub_806E810 _0806E948: .4byte task_per_step_callback_manager
_0806E94C: .4byte sub_806E83C _0806E94C: .4byte sub_806E83C
_0806E950: .4byte gUnknown_3005098 _0806E950: .4byte gUnknown_3005098
thumb_func_end sub_806E918 thumb_func_end wild_encounter_reset_coro_args
thumb_func_start nullsub_40 thumb_func_start nullsub_40
nullsub_40: @ 806E954 nullsub_40: @ 806E954
@@ -239,7 +239,7 @@ _0806E9A4:
ldrb r1, [r1] ldrb r1, [r1]
adds r1, 0x7 adds r1, 0x7
ldr r2, _0806E9DC @ =0x0000035a ldr r2, _0806E9DC @ =0x0000035a
bl sub_8058FA4 bl MapGridSetMetatileIdAt
_0806E9C8: _0806E9C8:
lsls r0, r5, 24 lsls r0, r5, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -380,7 +380,7 @@ _0806EAB0:
movs r2, 0 movs r2, 0
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
ldr r2, _0806EAF0 @ =0x0000035a ldr r2, _0806EAF0 @ =0x0000035a
bl sub_8058FA4 bl MapGridSetMetatileIdAt
mov r0, sp mov r0, sp
movs r3, 0 movs r3, 0
ldrsh r0, [r0, r3] ldrsh r0, [r0, r3]
@@ -416,7 +416,7 @@ _0806EB04:
movs r2, 0 movs r2, 0
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
ldr r2, _0806EB4C @ =0x0000035b ldr r2, _0806EB4C @ =0x0000035b
bl sub_8058FA4 bl MapGridSetMetatileIdAt
mov r0, sp mov r0, sp
movs r3, 0 movs r3, 0
ldrsh r0, [r0, r3] ldrsh r0, [r0, r3]
@@ -543,7 +543,7 @@ sub_806EC04: @ 806EC04
_0806EC20: _0806EC20:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_8058FA4 bl MapGridSetMetatileIdAt
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl CurrentMapDrawMetatileAt bl CurrentMapDrawMetatileAt
asm/field_weather.s
+4 -4
View File
@@ -2981,8 +2981,8 @@ _0807B296:
bx r1 bx r1
thumb_func_end sub_807B1CC thumb_func_end sub_807B1CC
thumb_func_start sub_807B29C thumb_func_start UpdateWeatherPerDay
sub_807B29C: @ 807B29C UpdateWeatherPerDay: @ 807B29C
lsls r0, 16 lsls r0, 16
ldr r1, _0807B2B8 @ =gUnknown_3005008 ldr r1, _0807B2B8 @ =gUnknown_3005008
ldr r2, [r1] ldr r2, [r1]
@@ -2999,7 +2999,7 @@ sub_807B29C: @ 807B29C
bx lr bx lr
.align 2, 0 .align 2, 0
_0807B2B8: .4byte gUnknown_3005008 _0807B2B8: .4byte gUnknown_3005008
thumb_func_end sub_807B29C thumb_func_end UpdateWeatherPerDay
thumb_func_start sub_807B2BC thumb_func_start sub_807B2BC
sub_807B2BC: @ 807B2BC sub_807B2BC: @ 807B2BC
@@ -3015,7 +3015,7 @@ sub_807B2BC: @ 807B2BC
bne _0807B2D6 bne _0807B2D6
_0807B2D0: _0807B2D0:
movs r0, 0x28 movs r0, 0x28
bl sub_8054E90 bl IncrementGameStat
_0807B2D6: _0807B2D6:
pop {r0} pop {r0}
bx r0 bx r0
asm/fieldmap.s
+27 -27
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_80589C4 thumb_func_start mapconnection_get_mapheader
sub_80589C4: @ 80589C4 mapconnection_get_mapheader: @ 80589C4
push {lr} push {lr}
ldrb r2, [r0, 0x8] ldrb r2, [r0, 0x8]
ldrb r1, [r0, 0x9] ldrb r1, [r0, 0x9]
@@ -14,10 +14,10 @@ sub_80589C4: @ 80589C4
bl get_mapheader_by_bank_and_number bl get_mapheader_by_bank_and_number
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80589C4 thumb_func_end mapconnection_get_mapheader
thumb_func_start sub_80589D4 thumb_func_start not_trainer_hill_battle_pyramid
sub_80589D4: @ 80589D4 not_trainer_hill_battle_pyramid: @ 80589D4
push {lr} push {lr}
ldr r0, _080589E4 @ =gUnknown_2036DFC ldr r0, _080589E4 @ =gUnknown_2036DFC
bl sub_8058A00 bl sub_8058A00
@@ -26,7 +26,7 @@ sub_80589D4: @ 80589D4
bx r0 bx r0
.align 2, 0 .align 2, 0
_080589E4: .4byte gUnknown_2036DFC _080589E4: .4byte gUnknown_2036DFC
thumb_func_end sub_80589D4 thumb_func_end not_trainer_hill_battle_pyramid
thumb_func_start sub_80589E8 thumb_func_start sub_80589E8
sub_80589E8: @ 80589E8 sub_80589E8: @ 80589E8
@@ -160,7 +160,7 @@ mapheader_copy_mapdata_of_adjacent_maps: @ 8058AC8
adds r7, r1, 0 adds r7, r1, 0
_08058AE6: _08058AE6:
adds r0, r5, 0 adds r0, r5, 0
bl sub_80589C4 bl mapconnection_get_mapheader
adds r1, r0, 0 adds r1, r0, 0
ldr r2, [r5, 0x4] ldr r2, [r5, 0x4]
ldrb r0, [r5] ldrb r0, [r5]
@@ -817,8 +817,8 @@ sub_8058F8C: @ 8058F8C
bx r1 bx r1
thumb_func_end sub_8058F8C thumb_func_end sub_8058F8C
thumb_func_start sub_8058FA4 thumb_func_start MapGridSetMetatileIdAt
sub_8058FA4: @ 8058FA4 MapGridSetMetatileIdAt: @ 8058FA4
push {r4,r5,lr} push {r4,r5,lr}
adds r3, r0, 0 adds r3, r0, 0
lsls r2, 16 lsls r2, 16
@@ -854,10 +854,10 @@ _08058FDC:
.align 2, 0 .align 2, 0
_08058FE4: .4byte gUnknown_3005040 _08058FE4: .4byte gUnknown_3005040
_08058FE8: .4byte 0x00000fff _08058FE8: .4byte 0x00000fff
thumb_func_end sub_8058FA4 thumb_func_end MapGridSetMetatileIdAt
thumb_func_start sub_8058FEC thumb_func_start MapGridSetMetatileEntryAt
sub_8058FEC: @ 8058FEC MapGridSetMetatileEntryAt: @ 8058FEC
push {r4,r5,lr} push {r4,r5,lr}
adds r3, r0, 0 adds r3, r0, 0
lsls r2, 16 lsls r2, 16
@@ -886,7 +886,7 @@ _08059018:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08059020: .4byte gUnknown_3005040 _08059020: .4byte gUnknown_3005040
thumb_func_end sub_8058FEC thumb_func_end MapGridSetMetatileEntryAt
thumb_func_start sub_8059024 thumb_func_start sub_8059024
sub_8059024: @ 8059024 sub_8059024: @ 8059024
@@ -1519,7 +1519,7 @@ sub_80594AC: @ 80594AC
adds r4, r1, 0 adds r4, r1, 0
adds r6, r2, 0 adds r6, r2, 0
adds r7, r3, 0 adds r7, r3, 0
bl sub_80589C4 bl mapconnection_get_mapheader
adds r3, r0, 0 adds r3, r0, 0
cmp r4, 0x2 cmp r4, 0x2
beq _08059514 beq _08059514
@@ -1748,7 +1748,7 @@ sub_8059658: @ 8059658
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r6, r4, 0 adds r6, r4, 0
adds r0, r5, 0 adds r0, r5, 0
bl sub_80589C4 bl mapconnection_get_mapheader
adds r2, r0, 0 adds r2, r0, 0
cmp r4, 0x1 cmp r4, 0x1
blt _080596B0 blt _080596B0
@@ -1842,7 +1842,7 @@ sub_80596FC: @ 80596FC
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
adds r6, r2, 0 adds r6, r2, 0
bl sub_80589C4 bl mapconnection_get_mapheader
adds r1, r0, 0 adds r1, r0, 0
ldrb r0, [r4] ldrb r0, [r4]
cmp r0, 0x1 cmp r0, 0x1
@@ -2027,8 +2027,8 @@ GetCameraCoords: @ 8059830
_08059840: .4byte gUnknown_3005008 _08059840: .4byte gUnknown_3005008
thumb_func_end GetCameraCoords thumb_func_end GetCameraCoords
thumb_func_start sub_8059844 thumb_func_start copy_tileset_patterns_to_vram
sub_8059844: @ 8059844 copy_tileset_patterns_to_vram: @ 8059844
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
adds r3, r0, 0 adds r3, r0, 0
@@ -2063,10 +2063,10 @@ _08059880:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8059844 thumb_func_end copy_tileset_patterns_to_vram
thumb_func_start sub_8059888 thumb_func_start copy_tileset_patterns_to_vram2
sub_8059888: @ 8059888 copy_tileset_patterns_to_vram2: @ 8059888
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
adds r3, r0, 0 adds r3, r0, 0
@@ -2101,7 +2101,7 @@ _080598C4:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8059888 thumb_func_end copy_tileset_patterns_to_vram2
thumb_func_start sub_80598CC thumb_func_start sub_80598CC
sub_80598CC: @ 80598CC sub_80598CC: @ 80598CC
@@ -2306,7 +2306,7 @@ sub_8059A54: @ 8059A54
movs r1, 0xA0 movs r1, 0xA0
lsls r1, 2 lsls r1, 2
movs r2, 0 movs r2, 0
bl sub_8059844 bl copy_tileset_patterns_to_vram
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8059A54 thumb_func_end sub_8059A54
@@ -2319,7 +2319,7 @@ sub_8059A68: @ 8059A68
lsls r1, 1 lsls r1, 1
movs r2, 0xA0 movs r2, 0xA0
lsls r2, 2 lsls r2, 2
bl sub_8059844 bl copy_tileset_patterns_to_vram
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8059A68 thumb_func_end sub_8059A68
@@ -2332,7 +2332,7 @@ copy_map_tileset2_to_vram_2: @ 8059A7C
lsls r1, 1 lsls r1, 1
movs r2, 0xA0 movs r2, 0xA0
lsls r2, 2 lsls r2, 2
bl sub_8059888 bl copy_tileset_patterns_to_vram2
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end copy_map_tileset2_to_vram_2 thumb_func_end copy_map_tileset2_to_vram_2
@@ -2370,12 +2370,12 @@ copy_map_tileset1_tileset2_to_vram: @ 8059AB0
lsls r4, 2 lsls r4, 2
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
bl sub_8059888 bl copy_tileset_patterns_to_vram2
ldr r0, [r5, 0x14] ldr r0, [r5, 0x14]
movs r1, 0xC0 movs r1, 0xC0
lsls r1, 1 lsls r1, 1
adds r2, r4, 0 adds r2, r4, 0
bl sub_8059888 bl copy_tileset_patterns_to_vram2
_08059AD2: _08059AD2:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
asm/fldeff_cut.s
+11 -11
View File
@@ -172,7 +172,7 @@ sub_80979A0: @ 80979A0
strh r0, [r1, 0x18] strh r0, [r1, 0x18]
strh r2, [r1, 0x1A] strh r2, [r1, 0x1A]
movs r0, 0x12 movs r0, 0x12
bl sub_8054E90 bl IncrementGameStat
movs r0, 0 movs r0, 0
pop {r1} pop {r1}
bx r1 bx r1
@@ -214,7 +214,7 @@ sub_80979F0: @ 80979F0
strh r0, [r1, 0x18] strh r0, [r1, 0x18]
strh r2, [r1, 0x1A] strh r2, [r1, 0x1A]
movs r0, 0x12 movs r0, 0x12
bl sub_8054E90 bl IncrementGameStat
movs r0, 0 movs r0, 0
pop {r1} pop {r1}
bx r1 bx r1
@@ -410,29 +410,29 @@ _08097B8C:
adds r2, 0x2 adds r2, 0x2
adds r2, r3, r2 adds r2, r3, r2
ldrh r2, [r2] ldrh r2, [r2]
bl sub_8058FA4 bl MapGridSetMetatileIdAt
_08097BA0: _08097BA0:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8097B50 thumb_func_end sub_8097B50
thumb_func_start sub_8097BA8 thumb_func_start objc_8097BA8
sub_8097BA8: @ 8097BA8 objc_8097BA8: @ 8097BA8
movs r2, 0 movs r2, 0
movs r1, 0x8 movs r1, 0x8
strh r1, [r0, 0x2E] strh r1, [r0, 0x2E]
strh r2, [r0, 0x30] strh r2, [r0, 0x30]
strh r2, [r0, 0x34] strh r2, [r0, 0x34]
ldr r1, _08097BB8 @ =sub_8097BBC ldr r1, _08097BB8 @ =objc_8097BBC
str r1, [r0, 0x1C] str r1, [r0, 0x1C]
bx lr bx lr
.align 2, 0 .align 2, 0
_08097BB8: .4byte sub_8097BBC _08097BB8: .4byte objc_8097BBC
thumb_func_end sub_8097BA8 thumb_func_end objc_8097BA8
thumb_func_start sub_8097BBC thumb_func_start objc_8097BBC
sub_8097BBC: @ 8097BBC objc_8097BBC: @ 8097BBC
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x32 movs r1, 0x32
@@ -478,7 +478,7 @@ _08097C0C:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08097C14: .4byte sub_8097C18 _08097C14: .4byte sub_8097C18
thumb_func_end sub_8097BBC thumb_func_end objc_8097BBC
thumb_func_start sub_8097C18 thumb_func_start sub_8097C18
sub_8097C18: @ 8097C18 sub_8097C18: @ 8097C18
asm/fldeff_softboiled.s
+1 -1
View File
@@ -235,7 +235,7 @@ sub_80E583C: @ 80E583C
ldr r4, _080E5890 @ =gUnknown_2021D18 ldr r4, _080E5890 @ =gUnknown_2021D18
ldr r1, _080E5894 @ =gUnknown_8416F27 ldr r1, _080E5894 @ =gUnknown_8416F27
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_81202F8 bl sub_81202F8
asm/fldeff_teleport.s
+1 -1
View File
@@ -70,7 +70,7 @@ FldEff_UseTeleport: @ 80F6750
strh r0, [r1, 0x18] strh r0, [r1, 0x18]
strh r2, [r1, 0x1A] strh r2, [r1, 0x1A]
movs r0, 0x1 movs r0, 0x1
bl sub_805BDEC bl SetPlayerAvatarTransitionFlags
movs r0, 0 movs r0, 0
pop {r1} pop {r1}
bx r1 bx r1
asm/hall_of_fame.s
+58 -58
View File
@@ -155,15 +155,15 @@ _080F1EF2:
bx r1 bx r1
thumb_func_end InitHallOfFameScreen thumb_func_end InitHallOfFameScreen
thumb_func_start sub_80F1EFC thumb_func_start CB2_DoHallOfFameScreen
sub_80F1EFC: @ 80F1EFC CB2_DoHallOfFameScreen: @ 80F1EFC
push {r4,lr} push {r4,lr}
bl InitHallOfFameScreen bl InitHallOfFameScreen
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0 cmp r4, 0
bne _080F1F2C bne _080F1F2C
ldr r0, _080F1F34 @ =sub_80F1F74 ldr r0, _080F1F34 @ =Task_Hof_InitMonData
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
lsls r0, 24 lsls r0, 24
@@ -183,19 +183,19 @@ _080F1F2C:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F1F34: .4byte sub_80F1F74 _080F1F34: .4byte Task_Hof_InitMonData
_080F1F38: .4byte gUnknown_3005090 _080F1F38: .4byte gUnknown_3005090
_080F1F3C: .4byte gUnknown_203AB38 _080F1F3C: .4byte gUnknown_203AB38
thumb_func_end sub_80F1EFC thumb_func_end CB2_DoHallOfFameScreen
thumb_func_start sub_80F1F40 thumb_func_start CB2_DoHallOfFameScreenDontSaveData
sub_80F1F40: @ 80F1F40 CB2_DoHallOfFameScreenDontSaveData: @ 80F1F40
push {lr} push {lr}
bl InitHallOfFameScreen bl InitHallOfFameScreen
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080F1F66 bne _080F1F66
ldr r0, _080F1F6C @ =sub_80F1F74 ldr r0, _080F1F6C @ =Task_Hof_InitMonData
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
lsls r0, 24 lsls r0, 24
@@ -211,12 +211,12 @@ _080F1F66:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F1F6C: .4byte sub_80F1F74 _080F1F6C: .4byte Task_Hof_InitMonData
_080F1F70: .4byte gUnknown_3005090 _080F1F70: .4byte gUnknown_3005090
thumb_func_end sub_80F1F40 thumb_func_end CB2_DoHallOfFameScreenDontSaveData
thumb_func_start sub_80F1F74 thumb_func_start Task_Hof_InitMonData
sub_80F1F74: @ 80F1F74 Task_Hof_InitMonData: @ 80F1F74
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -405,7 +405,7 @@ _080F20F0: .4byte gUnknown_203AB34
_080F20F4: .4byte gUnknown_3005090 _080F20F4: .4byte gUnknown_3005090
_080F20F8: .4byte sub_80F2294 _080F20F8: .4byte sub_80F2294
_080F20FC: _080F20FC:
ldr r0, _080F2110 @ =sub_80F2114 ldr r0, _080F2110 @ =Task_Hof_InitTeamSaveData
_080F20FE: _080F20FE:
str r0, [r1] str r0, [r1]
add sp, 0xC add sp, 0xC
@@ -416,11 +416,11 @@ _080F20FE:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F2110: .4byte sub_80F2114 _080F2110: .4byte Task_Hof_InitTeamSaveData
thumb_func_end sub_80F1F74 thumb_func_end Task_Hof_InitMonData
thumb_func_start sub_80F2114 thumb_func_start Task_Hof_InitTeamSaveData
sub_80F2114: @ 80F2114 Task_Hof_InitTeamSaveData: @ 80F2114
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -546,7 +546,7 @@ _080F2210: .4byte gUnknown_203AB38
_080F2214: .4byte gUnknown_8419F54 _080F2214: .4byte gUnknown_8419F54
_080F2218: .4byte gUnknown_3005090 _080F2218: .4byte gUnknown_3005090
_080F221C: .4byte sub_80F2220 _080F221C: .4byte sub_80F2220
thumb_func_end sub_80F2114 thumb_func_end Task_Hof_InitTeamSaveData
thumb_func_start sub_80F2220 thumb_func_start sub_80F2220
sub_80F2220: @ 80F2220 sub_80F2220: @ 80F2220
@@ -555,7 +555,7 @@ sub_80F2220: @ 80F2220
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r1, _080F2254 @ =gUnknown_30053A4 ldr r1, _080F2254 @ =gUnknown_30053A4
ldr r0, _080F2258 @ =sub_80F1F40 ldr r0, _080F2258 @ =CB2_DoHallOfFameScreenDontSaveData
str r0, [r1] str r0, [r1]
movs r0, 0x3 movs r0, 0x3
bl TrySavingData bl TrySavingData
@@ -575,7 +575,7 @@ sub_80F2220: @ 80F2220
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F2254: .4byte gUnknown_30053A4 _080F2254: .4byte gUnknown_30053A4
_080F2258: .4byte sub_80F1F40 _080F2258: .4byte CB2_DoHallOfFameScreenDontSaveData
_080F225C: .4byte gUnknown_3005090 _080F225C: .4byte gUnknown_3005090
_080F2260: .4byte sub_80F2264 _080F2260: .4byte sub_80F2264
thumb_func_end sub_80F2220 thumb_func_end sub_80F2220
@@ -977,7 +977,7 @@ _080F2564:
bls _080F2542 bls _080F2542
movs r0, 0 movs r0, 0
movs r1, 0xF movs r1, 0xF
bl sub_80F313C bl HallOfFame_PrintWelcomeText
movs r0, 0x62 movs r0, 0x62
bl sub_80722CC bl sub_80722CC
ldr r1, _080F25A8 @ =gUnknown_3005090 ldr r1, _080F25A8 @ =gUnknown_3005090
@@ -1190,7 +1190,7 @@ sub_80F26D4: @ 80F26D4
adds r4, r1 adds r4, r1
strh r0, [r4, 0x10] strh r0, [r4, 0x10]
ldr r0, _080F2754 @ =gUnknown_840C234 ldr r0, _080F2754 @ =gUnknown_840C234
bl sub_8003CE4 bl AddWindow
ldr r1, _080F2758 @ =0x0000021d ldr r1, _080F2758 @ =0x0000021d
movs r0, 0x1 movs r0, 0x1
movs r2, 0xD0 movs r2, 0xD0
@@ -1676,7 +1676,7 @@ _080F2B3C:
_080F2B46: _080F2B46:
strh r0, [r1, 0x8] strh r0, [r1, 0x8]
movs r0, 0xA movs r0, 0xA
bl sub_8054EC4 bl GetGameStat
ldr r2, _080F2B64 @ =gUnknown_3005090 ldr r2, _080F2B64 @ =gUnknown_3005090
adds r1, r5, r6 adds r1, r5, r6
lsls r1, 3 lsls r1, 3
@@ -1883,7 +1883,7 @@ _080F2CB4:
ldr r5, _080F2D18 @ =gUnknown_2021D18 ldr r5, _080F2D18 @ =gUnknown_2021D18
ldr r1, _080F2D1C @ =gUnknown_84160B4 ldr r1, _080F2D1C @ =gUnknown_84160B4
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r1, 0x8 movs r1, 0x8
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
cmp r0, 0 cmp r0, 0
@@ -1918,7 +1918,7 @@ _080F2D34:
add r1, r9 add r1, r9
lsls r1, 3 lsls r1, 3
adds r1, r0 adds r1, r0
ldr r0, _080F2D5C @ =sub_80F2D60 ldr r0, _080F2D5C @ =Task_HofPC_PrintMonInfo
str r0, [r1] str r0, [r1]
add sp, 0x18 add sp, 0x18
pop {r3-r5} pop {r3-r5}
@@ -1931,11 +1931,11 @@ _080F2D34:
.align 2, 0 .align 2, 0
_080F2D54: .4byte gUnknown_8415D60 _080F2D54: .4byte gUnknown_8415D60
_080F2D58: .4byte gUnknown_3005090 _080F2D58: .4byte gUnknown_3005090
_080F2D5C: .4byte sub_80F2D60 _080F2D5C: .4byte Task_HofPC_PrintMonInfo
thumb_func_end sub_80F2B6C thumb_func_end sub_80F2B6C
thumb_func_start sub_80F2D60 thumb_func_start Task_HofPC_PrintMonInfo
sub_80F2D60: @ 80F2D60 Task_HofPC_PrintMonInfo: @ 80F2D60
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -2059,7 +2059,7 @@ _080F2E4A:
movs r1, 0 movs r1, 0
movs r2, 0xE movs r2, 0xE
bl sub_80F3194 bl sub_80F3194
ldr r0, _080F2E88 @ =sub_80F2E8C ldr r0, _080F2E88 @ =Task_HofPC_HandleInput
str r0, [r6] str r0, [r6]
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
@@ -2077,11 +2077,11 @@ _080F2E78: .4byte 0xffff0000
_080F2E7C: .4byte gUnknown_203AB34 _080F2E7C: .4byte gUnknown_203AB34
_080F2E80: .4byte 0x00007716 _080F2E80: .4byte 0x00007716
_080F2E84: .4byte 0x000001ff _080F2E84: .4byte 0x000001ff
_080F2E88: .4byte sub_80F2E8C _080F2E88: .4byte Task_HofPC_HandleInput
thumb_func_end sub_80F2D60 thumb_func_end Task_HofPC_PrintMonInfo
thumb_func_start sub_80F2E8C thumb_func_start Task_HofPC_HandleInput
sub_80F2E8C: @ 80F2E8C Task_HofPC_HandleInput: @ 80F2E8C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -2210,12 +2210,12 @@ _080F2F7C:
beq _080F2FAC beq _080F2FAC
subs r0, r2, 0x1 subs r0, r2, 0x1
strh r0, [r1, 0xC] strh r0, [r1, 0xC]
ldr r0, _080F2FA8 @ =sub_80F2D60 ldr r0, _080F2FA8 @ =Task_HofPC_PrintMonInfo
str r0, [r1] str r0, [r1]
b _080F2FD8 b _080F2FD8
.align 2, 0 .align 2, 0
_080F2FA4: .4byte gUnknown_3005090 _080F2FA4: .4byte gUnknown_3005090
_080F2FA8: .4byte sub_80F2D60 _080F2FA8: .4byte Task_HofPC_PrintMonInfo
_080F2FAC: _080F2FAC:
ldrh r1, [r3, 0x2E] ldrh r1, [r3, 0x2E]
movs r0, 0x80 movs r0, 0x80
@@ -2237,7 +2237,7 @@ _080F2FAC:
ldrh r0, [r2, 0xC] ldrh r0, [r2, 0xC]
adds r0, 0x1 adds r0, 0x1
strh r0, [r2, 0xC] strh r0, [r2, 0xC]
ldr r0, _080F2FE8 @ =sub_80F2D60 ldr r0, _080F2FE8 @ =Task_HofPC_PrintMonInfo
str r0, [r2] str r0, [r2]
_080F2FD8: _080F2FD8:
pop {r3} pop {r3}
@@ -2247,8 +2247,8 @@ _080F2FD8:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F2FE4: .4byte gUnknown_3005090 _080F2FE4: .4byte gUnknown_3005090
_080F2FE8: .4byte sub_80F2D60 _080F2FE8: .4byte Task_HofPC_PrintMonInfo
thumb_func_end sub_80F2E8C thumb_func_end Task_HofPC_HandleInput
thumb_func_start sub_80F2FEC thumb_func_start sub_80F2FEC
sub_80F2FEC: @ 80F2FEC sub_80F2FEC: @ 80F2FEC
@@ -2367,7 +2367,7 @@ sub_80F30A4: @ 80F30A4
adds r0, r4 adds r0, r4
lsls r0, 3 lsls r0, 3
adds r0, r1 adds r0, r1
ldr r1, _080F3108 @ =sub_80F310C ldr r1, _080F3108 @ =Task_HofPC_ExitOnButtonPress
str r1, [r0] str r1, [r0]
add sp, 0x10 add sp, 0x10
pop {r4} pop {r4}
@@ -2377,11 +2377,11 @@ sub_80F30A4: @ 80F30A4
_080F30FC: .4byte gUnknown_8415D8C _080F30FC: .4byte gUnknown_8415D8C
_080F3100: .4byte gUnknown_8416090 _080F3100: .4byte gUnknown_8416090
_080F3104: .4byte gUnknown_3005090 _080F3104: .4byte gUnknown_3005090
_080F3108: .4byte sub_80F310C _080F3108: .4byte Task_HofPC_ExitOnButtonPress
thumb_func_end sub_80F30A4 thumb_func_end sub_80F30A4
thumb_func_start sub_80F310C thumb_func_start Task_HofPC_ExitOnButtonPress
sub_80F310C: @ 80F310C Task_HofPC_ExitOnButtonPress: @ 80F310C
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
@@ -2405,10 +2405,10 @@ _080F312C:
_080F3130: .4byte gUnknown_30030F0 _080F3130: .4byte gUnknown_30030F0
_080F3134: .4byte gUnknown_3005090 _080F3134: .4byte gUnknown_3005090
_080F3138: .4byte sub_80F2FEC _080F3138: .4byte sub_80F2FEC
thumb_func_end sub_80F310C thumb_func_end Task_HofPC_ExitOnButtonPress
thumb_func_start sub_80F313C thumb_func_start HallOfFame_PrintWelcomeText
sub_80F313C: @ 80F313C HallOfFame_PrintWelcomeText: @ 80F313C
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0xC sub sp, 0xC
ldr r5, _080F318C @ =gUnknown_8416008 ldr r5, _080F318C @ =gUnknown_8416008
@@ -2436,7 +2436,7 @@ sub_80F313C: @ 80F313C
movs r1, 0x2 movs r1, 0x2
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
@@ -2447,7 +2447,7 @@ sub_80F313C: @ 80F313C
.align 2, 0 .align 2, 0
_080F318C: .4byte gUnknown_8416008 _080F318C: .4byte gUnknown_8416008
_080F3190: .4byte gUnknown_840C23C _080F3190: .4byte gUnknown_840C23C
thumb_func_end sub_80F313C thumb_func_end HallOfFame_PrintWelcomeText
thumb_func_start sub_80F3194 thumb_func_start sub_80F3194
sub_80F3194: @ 80F3194 sub_80F3194: @ 80F3194
@@ -2535,7 +2535,7 @@ _080F322E:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x10 movs r2, 0x10
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
_080F3252: _080F3252:
movs r2, 0 movs r2, 0
ldrb r0, [r7, 0xA] ldrb r0, [r7, 0xA]
@@ -2606,7 +2606,7 @@ _080F32C4:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
ldrh r2, [r7, 0x8] ldrh r2, [r7, 0x8]
ldr r4, _080F3320 @ =0x000001ff ldr r4, _080F3320 @ =0x000001ff
adds r0, r4, 0 adds r0, r4, 0
@@ -2676,7 +2676,7 @@ _080F3348:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x80 movs r2, 0x80
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
ldr r1, _080F33D4 @ =gUnknown_84160F4 ldr r1, _080F33D4 @ =gUnknown_84160F4
add r0, sp, 0xC add r0, sp, 0xC
bl StringCopy bl StringCopy
@@ -2694,7 +2694,7 @@ _080F3348:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x20 movs r2, 0x20
movs r3, 0x11 movs r3, 0x11
bl sub_812E51C bl box_print
ldr r1, _080F33D8 @ =gUnknown_8416104 ldr r1, _080F33D8 @ =gUnknown_8416104
add r0, sp, 0xC add r0, sp, 0xC
bl StringCopy bl StringCopy
@@ -2711,7 +2711,7 @@ _080F3348:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x60 movs r2, 0x60
movs r3, 0x11 movs r3, 0x11
bl sub_812E51C bl box_print
_080F33BA: _080F33BA:
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
@@ -2764,7 +2764,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2 movs r1, 0x2
movs r2, 0x4 movs r2, 0x4
movs r3, 0x3 movs r3, 0x3
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldr r0, _080F35FC @ =gUnknown_300500C ldr r0, _080F35FC @ =gUnknown_300500C
mov r10, r0 mov r10, r0
ldr r1, [r0] ldr r1, [r0]
@@ -2785,7 +2785,7 @@ sub_80F33DC: @ 80F33DC
movs r0, 0x1 movs r0, 0x1
movs r1, 0x2 movs r1, 0x2
movs r3, 0x3 movs r3, 0x3
bl sub_812E51C bl box_print
mov r1, r10 mov r1, r10
ldr r0, [r1] ldr r0, [r1]
ldrb r4, [r0, 0xA] ldrb r4, [r0, 0xA]
@@ -2801,7 +2801,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2 movs r1, 0x2
movs r2, 0x4 movs r2, 0x4
movs r3, 0x12 movs r3, 0x12
bl sub_812E51C bl box_print
add r1, sp, 0x14 add r1, sp, 0x14
mov r8, r1 mov r8, r1
ldr r1, _080F3604 @ =0x000186a0 ldr r1, _080F3604 @ =0x000186a0
@@ -2869,7 +2869,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2 movs r1, 0x2
adds r2, r6, 0 adds r2, r6, 0
movs r3, 0x12 movs r3, 0x12
bl sub_812E51C bl box_print
mov r1, r9 mov r1, r9
str r1, [sp] str r1, [sp]
str r7, [sp, 0x4] str r7, [sp, 0x4]
@@ -2879,7 +2879,7 @@ sub_80F33DC: @ 80F33DC
movs r1, 0x2 movs r1, 0x2
movs r2, 0x4 movs r2, 0x4
movs r3, 0x20 movs r3, 0x20
bl sub_812E51C bl box_print
add r5, sp, 0x14 add r5, sp, 0x14
mov r0, r10 mov r0, r10
ldr r4, [r0] ldr r4, [r0]
@@ -2957,7 +2957,7 @@ _080F3582:
movs r0, 0x1 movs r0, 0x1
movs r1, 0x2 movs r1, 0x2
movs r3, 0x20 movs r3, 0x20
bl sub_812E51C bl box_print
movs r0, 0x1 movs r0, 0x1
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
asm/help_system.s
+2 -2
View File
@@ -384,7 +384,7 @@ sub_813BBC8: @ 813BBC8
ldr r0, _0813BBD8 @ =gUnknown_203F18A ldr r0, _0813BBD8 @ =gUnknown_203F18A
adds r1, r0, 0x1 adds r1, r0, 0x1
adds r2, r0, 0x2 adds r2, r0, 0x2
bl sub_8002F5C bl SaveTextColors
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -453,7 +453,7 @@ sub_813BC48: @ 813BC48
ldr r0, _0813BC58 @ =gUnknown_203F18A ldr r0, _0813BC58 @ =gUnknown_203F18A
adds r1, r0, 0x1 adds r1, r0, 0x1
adds r2, r0, 0x2 adds r2, r0, 0x2
bl sub_8002F7C bl RestoreTextColors
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
asm/hof_pc.s
+1 -1
View File
@@ -76,7 +76,7 @@ sub_80CA5C0: @ 80CA5C0
sub sp, 0x4 sub sp, 0x4
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_8055DC4 bl sub_8055DC4
bl sub_809D040 bl sp109_CreatePCMenu
bl sub_809D254 bl sub_809D254
movs r0, 0x1 movs r0, 0x1
negs r0, r0 negs r0, r0
asm/intro.s
+11 -11
View File
@@ -31,8 +31,8 @@ _080EC5CA:
_080EC5D0: .4byte sub_80EC870 _080EC5D0: .4byte sub_80EC870
thumb_func_end sub_80EC5B8 thumb_func_end sub_80EC5B8
thumb_func_start sub_80EC5D4 thumb_func_start load_copyright_graphics
sub_80EC5D4: @ 80EC5D4 load_copyright_graphics: @ 80EC5D4
push {r4-r6,lr} push {r4-r6,lr}
adds r3, r0, 0 adds r3, r0, 0
adds r4, r1, 0 adds r4, r1, 0
@@ -64,10 +64,10 @@ sub_80EC5D4: @ 80EC5D4
_080EC610: .4byte gUnknown_8402280 _080EC610: .4byte gUnknown_8402280
_080EC614: .4byte gUnknown_84024E4 _080EC614: .4byte gUnknown_84024E4
_080EC618: .4byte gUnknown_8402260 _080EC618: .4byte gUnknown_8402260
thumb_func_end sub_80EC5D4 thumb_func_end load_copyright_graphics
thumb_func_start sub_80EC61C thumb_func_start SerialCb_CopyrightScreen
sub_80EC61C: @ 80EC61C SerialCb_CopyrightScreen: @ 80EC61C
push {lr} push {lr}
ldr r0, _080EC628 @ =gUnknown_203AAD4 ldr r0, _080EC628 @ =gUnknown_203AAD4
bl GameCubeMultiBoot_HandleSerialInterrupt bl GameCubeMultiBoot_HandleSerialInterrupt
@@ -75,7 +75,7 @@ sub_80EC61C: @ 80EC61C
bx r0 bx r0
.align 2, 0 .align 2, 0
_080EC628: .4byte gUnknown_203AAD4 _080EC628: .4byte gUnknown_203AAD4
thumb_func_end sub_80EC61C thumb_func_end SerialCb_CopyrightScreen
thumb_func_start sub_80EC62C thumb_func_start sub_80EC62C
sub_80EC62C: @ 80EC62C sub_80EC62C: @ 80EC62C
@@ -165,7 +165,7 @@ _080EC65E:
lsls r1, 6 lsls r1, 6
movs r0, 0 movs r0, 0
movs r2, 0 movs r2, 0
bl sub_80EC5D4 bl load_copyright_graphics
bl remove_some_task bl remove_some_task
bl ResetTasks bl ResetTasks
bl ResetSpriteData bl ResetSpriteData
@@ -190,7 +190,7 @@ _080EC65E:
lsls r1, 1 lsls r1, 1
movs r0, 0 movs r0, 0
bl SetGpuReg bl SetGpuReg
ldr r0, _080EC76C @ =sub_80EC61C ldr r0, _080EC76C @ =SerialCb_CopyrightScreen
bl sub_8000718 bl sub_8000718
ldr r0, _080EC770 @ =gUnknown_203AAD4 ldr r0, _080EC770 @ =gUnknown_203AAD4
bl GameCubeMultiBoot_Init bl GameCubeMultiBoot_Init
@@ -215,7 +215,7 @@ _080EC75C: .4byte 0x05000002
_080EC760: .4byte 0x810001ff _080EC760: .4byte 0x810001ff
_080EC764: .4byte 0x0000ffff _080EC764: .4byte 0x0000ffff
_080EC768: .4byte sub_80EC5A4 _080EC768: .4byte sub_80EC5A4
_080EC76C: .4byte sub_80EC61C _080EC76C: .4byte SerialCb_CopyrightScreen
_080EC770: .4byte gUnknown_203AAD4 _080EC770: .4byte gUnknown_203AAD4
_080EC774: .4byte gUnknown_30030F0 _080EC774: .4byte gUnknown_30030F0
_080EC778: _080EC778:
@@ -316,7 +316,7 @@ sub_80EC820: @ 80EC820
cmp r0, 0x2 cmp r0, 0x2
bne _080EC84A bne _080EC84A
_080EC846: _080EC846:
bl sub_8054A18 bl Sav2_ClearSetDefault
_080EC84A: _080EC84A:
ldr r0, _080EC860 @ =gUnknown_300500C ldr r0, _080EC860 @ =gUnknown_300500C
ldr r0, [r0] ldr r0, [r0]
@@ -644,7 +644,7 @@ sub_80ECAF0: @ 80ECAF0
b _080ECB8A b _080ECB8A
_080ECB02: _080ECB02:
ldr r0, _080ECB68 @ =gUnknown_840BBA8 ldr r0, _080ECB68 @ =gUnknown_840BBA8
bl sub_8003B24 bl InitWindows
ldr r0, _080ECB6C @ =gUnknown_840272C ldr r0, _080ECB6C @ =gUnknown_840272C
ldr r1, _080ECB70 @ =0x0000043c ldr r1, _080ECB70 @ =0x0000043c
adds r4, r5, r1 adds r4, r5, r1
asm/item.s
+20 -20
View File
@@ -40,11 +40,11 @@ sub_8099DBC: @ 8099DBC
_08099DD4: .4byte gUnknown_300500C _08099DD4: .4byte gUnknown_300500C
thumb_func_end sub_8099DBC thumb_func_end sub_8099DBC
thumb_func_start sub_8099DD8 thumb_func_start GetBagItemId
sub_8099DD8: @ 8099DD8 GetBagItemId: @ 8099DD8
ldrh r0, [r0] ldrh r0, [r0]
bx lr bx lr
thumb_func_end sub_8099DD8 thumb_func_end GetBagItemId
thumb_func_start sub_8099DDC thumb_func_start sub_8099DDC
sub_8099DDC: @ 8099DDC sub_8099DDC: @ 8099DDC
@@ -52,8 +52,8 @@ sub_8099DDC: @ 8099DDC
bx lr bx lr
thumb_func_end sub_8099DDC thumb_func_end sub_8099DDC
thumb_func_start sub_8099DE0 thumb_func_start ApplyNewEncryptionKeyToBagItems
sub_8099DE0: @ 8099DE0 ApplyNewEncryptionKeyToBagItems: @ 8099DE0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -100,15 +100,15 @@ _08099E20:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08099E34: .4byte gUnknown_203988C _08099E34: .4byte gUnknown_203988C
thumb_func_end sub_8099DE0 thumb_func_end ApplyNewEncryptionKeyToBagItems
thumb_func_start sub_8099E38 thumb_func_start ApplyNewEncryptionKeyToBagItems_
sub_8099E38: @ 8099E38 ApplyNewEncryptionKeyToBagItems_: @ 8099E38
push {lr} push {lr}
bl sub_8099DE0 bl ApplyNewEncryptionKeyToBagItems
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8099E38 thumb_func_end ApplyNewEncryptionKeyToBagItems_
thumb_func_start sub_8099E44 thumb_func_start sub_8099E44
sub_8099E44: @ 8099E44 sub_8099E44: @ 8099E44
@@ -669,8 +669,8 @@ _0809A25A:
bx r1 bx r1
thumb_func_end sub_809A1D8 thumb_func_end sub_809A1D8
thumb_func_start sub_809A260 thumb_func_start GetPocketByItemId
sub_809A260: @ 809A260 GetPocketByItemId: @ 809A260
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -679,10 +679,10 @@ sub_809A260: @ 809A260
lsrs r0, 24 lsrs r0, 24
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809A260 thumb_func_end GetPocketByItemId
thumb_func_start sub_809A274 thumb_func_start ClearItemSlots
sub_809A274: @ 809A274 ClearItemSlots: @ 809A274
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
lsls r1, 24 lsls r1, 24
@@ -708,7 +708,7 @@ _0809A29E:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_809A274 thumb_func_end ClearItemSlots
thumb_func_start sub_809A2A4 thumb_func_start sub_809A2A4
sub_809A2A4: @ 809A2A4 sub_809A2A4: @ 809A2A4
@@ -751,7 +751,7 @@ _0809A2E2:
adds r1, r5 adds r1, r5
ldr r0, [r1] ldr r0, [r1]
ldrb r1, [r1, 0x4] ldrb r1, [r1, 0x4]
bl sub_809A274 bl ClearItemSlots
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -854,7 +854,7 @@ _0809A380:
adds r0, r1, r2 adds r0, r1, r2
ldr r1, _0809A3B0 @ =0x0000029a ldr r1, _0809A3B0 @ =0x0000029a
adds r0, r1 adds r0, r1
bl sub_8099DD8 bl GetBagItemId
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
cmp r0, r5 cmp r0, r5
@@ -900,7 +900,7 @@ _0809A3D6:
adds r4, r1, r0 adds r4, r1, r0
adds r0, r2, r4 adds r0, r2, r4
adds r0, 0x2 adds r0, 0x2
bl sub_8099DD8 bl GetBagItemId
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
adds r1, r0, r5 adds r1, r0, r5
@@ -1001,7 +1001,7 @@ _0809A49E:
ldr r0, [r7] ldr r0, [r7]
adds r0, r4 adds r0, r4
adds r0, 0x2 adds r0, 0x2
bl sub_8099DD8 bl GetBagItemId
mov r1, r8 mov r1, r8
subs r0, r1 subs r0, r1
lsls r0, 16 lsls r0, 16
asm/item_menu.s
+51 -51
View File
@@ -1101,14 +1101,14 @@ sub_8108654: @ 8108654
bne _08108688 bne _08108688
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x2 movs r1, 0x2
bl sub_810878C bl bag_menu_print_cursor
b _08108690 b _08108690
.align 2, 0 .align 2, 0
_08108684: .4byte gUnknown_203AD10 _08108684: .4byte gUnknown_203AD10
_08108688: _08108688:
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0xFF movs r1, 0xFF
bl sub_810878C bl bag_menu_print_cursor
_08108690: _08108690:
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
@@ -1157,7 +1157,7 @@ _08108690:
ldr r4, _08108724 @ =gUnknown_2021D18 ldr r4, _08108724 @ =gUnknown_2021D18
ldr r1, _08108728 @ =gUnknown_84162B9 ldr r1, _08108728 @ =gUnknown_84162B9
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
str r6, [sp] str r6, [sp]
str r5, [sp, 0x4] str r5, [sp, 0x4]
str r5, [sp, 0x8] str r5, [sp, 0x8]
@@ -1209,8 +1209,8 @@ _08108764: .4byte 0x00000296
_08108768: .4byte gUnknown_8452F7C _08108768: .4byte gUnknown_8452F7C
thumb_func_end sub_8108654 thumb_func_end sub_8108654
thumb_func_start sub_810876C thumb_func_start bag_menu_print_cursor_
sub_810876C: @ 810876C bag_menu_print_cursor_: @ 810876C
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 24 lsls r0, 24
@@ -1221,14 +1221,14 @@ sub_810876C: @ 810876C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r1, r4, 0 adds r1, r4, 0
bl sub_810878C bl bag_menu_print_cursor
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_810876C thumb_func_end bag_menu_print_cursor_
thumb_func_start sub_810878C thumb_func_start bag_menu_print_cursor
sub_810878C: @ 810878C bag_menu_print_cursor: @ 810878C
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x14 sub sp, 0x14
lsls r0, 24 lsls r0, 24
@@ -1274,7 +1274,7 @@ _081087DE:
bx r0 bx r0
.align 2, 0 .align 2, 0
_081087E8: .4byte gUnknown_841623B _081087E8: .4byte gUnknown_841623B
thumb_func_end sub_810878C thumb_func_end bag_menu_print_cursor
thumb_func_start sub_81087EC thumb_func_start sub_81087EC
sub_81087EC: @ 81087EC sub_81087EC: @ 81087EC
@@ -2413,7 +2413,7 @@ _08109084:
bl sub_8108978 bl sub_8108978
ldrb r0, [r7] ldrb r0, [r7]
movs r1, 0x2 movs r1, 0x2
bl sub_810876C bl bag_menu_print_cursor_
strh r4, [r7, 0x2] strh r4, [r7, 0x2]
ldrb r0, [r5, 0x6] ldrb r0, [r5, 0x6]
adds r0, 0x1 adds r0, 0x1
@@ -2860,7 +2860,7 @@ sub_81093B8: @ 81093B8
ldr r4, _081094A4 @ =gUnknown_2021D18 ldr r4, _081094A4 @ =gUnknown_2021D18
ldr r1, _081094A8 @ =gUnknown_841633F ldr r1, _081094A8 @ =gUnknown_841633F
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
@@ -2890,7 +2890,7 @@ sub_81093B8: @ 81093B8
mov r2, r8 mov r2, r8
ldrb r0, [r2] ldrb r0, [r2]
movs r1, 0x2 movs r1, 0x2
bl sub_810876C bl bag_menu_print_cursor_
movs r0, 0x8 movs r0, 0x8
negs r0, r0 negs r0, r0
add r9, r0 add r9, r0
@@ -3241,7 +3241,7 @@ sub_810971C: @ 810971C
ldr r0, _081097DC @ =gUnknown_2021D18 ldr r0, _081097DC @ =gUnknown_2021D18
mov r9, r0 mov r9, r0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [sp] str r0, [sp]
movs r1, 0x1 movs r1, 0x1
@@ -3269,7 +3269,7 @@ sub_810971C: @ 810971C
bl sub_8008E78 bl sub_8008E78
ldr r1, _081097E0 @ =gUnknown_84162B9 ldr r1, _081097E0 @ =gUnknown_84162B9
mov r0, r9 mov r0, r9
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
str r0, [sp] str r0, [sp]
mov r0, r8 mov r0, r8
@@ -3326,7 +3326,7 @@ sub_81097E4: @ 81097E4
ldr r4, _0810984C @ =gUnknown_2021D18 ldr r4, _0810984C @ =gUnknown_2021D18
ldr r1, _08109850 @ =gUnknown_84162B9 ldr r1, _08109850 @ =gUnknown_84162B9
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
str r0, [sp] str r0, [sp]
movs r1, 0x1 movs r1, 0x1
@@ -3551,7 +3551,7 @@ _081099EC:
strb r0, [r4] strb r0, [r4]
ldr r0, _08109A10 @ =gUnknown_203AD30 ldr r0, _08109A10 @ =gUnknown_203AD30
ldrh r0, [r0] ldrh r0, [r0]
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -3729,7 +3729,7 @@ _08109AD4:
ldr r6, _08109BB0 @ =gUnknown_2021D18 ldr r6, _08109BB0 @ =gUnknown_2021D18
ldr r1, _08109BB4 @ =gUnknown_84162FF ldr r1, _08109BB4 @ =gUnknown_84162FF
adds r0, r6, 0 adds r0, r6, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [sp] str r0, [sp]
movs r0, 0x1 movs r0, 0x1
@@ -3959,7 +3959,7 @@ sub_8109D38: @ 8109D38
ldr r5, _08109DA4 @ =gUnknown_2021D18 ldr r5, _08109DA4 @ =gUnknown_2021D18
ldr r1, _08109DA8 @ =gUnknown_8416409 ldr r1, _08109DA8 @ =gUnknown_8416409
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x6 movs r0, 0x6
movs r1, 0x1 movs r1, 0x1
bl sub_810B9DC bl sub_810B9DC
@@ -4011,7 +4011,7 @@ sub_8109DB0: @ 8109DB0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_810876C bl bag_menu_print_cursor_
adds r0, r5, 0 adds r0, r5, 0
bl sub_810910C bl sub_810910C
pop {r4,r5} pop {r4,r5}
@@ -4092,7 +4092,7 @@ _08109E64:
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_810876C bl bag_menu_print_cursor_
bl sub_8108978 bl sub_8108978
adds r0, r6, 0 adds r0, r6, 0
bl sub_810910C bl sub_810910C
@@ -4135,7 +4135,7 @@ sub_8109EA8: @ 8109EA8
ldr r6, _08109F38 @ =gUnknown_2021D18 ldr r6, _08109F38 @ =gUnknown_2021D18
ldr r1, _08109F3C @ =gUnknown_84163F4 ldr r1, _08109F3C @ =gUnknown_84163F4
adds r0, r6, 0 adds r0, r6, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x6 movs r0, 0x6
movs r1, 0x3 movs r1, 0x3
bl sub_810B9DC bl sub_810B9DC
@@ -4237,7 +4237,7 @@ _08109F6E:
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r7] ldrb r0, [r7]
movs r1, 0x1 movs r1, 0x1
bl sub_810876C bl bag_menu_print_cursor_
mov r0, r8 mov r0, r8
bl sub_810910C bl sub_810910C
_08109FE0: _08109FE0:
@@ -4451,7 +4451,7 @@ sub_810A18C: @ 810A18C
ldr r5, _0810A1C4 @ =gUnknown_2021D18 ldr r5, _0810A1C4 @ =gUnknown_2021D18
ldr r1, _0810A1C8 @ =gUnknown_841635E ldr r1, _0810A1C8 @ =gUnknown_841635E
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r3, _0810A1CC @ =sub_810A1D0 ldr r3, _0810A1CC @ =sub_810A1D0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x2 movs r1, 0x2
@@ -4541,7 +4541,7 @@ sub_810A1F8: @ 810A1F8
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_810876C bl bag_menu_print_cursor_
mov r0, r8 mov r0, r8
bl sub_810910C bl sub_810910C
pop {r3,r4} pop {r3,r4}
@@ -4585,7 +4585,7 @@ sub_810A288: @ 810A288
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_810876C bl bag_menu_print_cursor_
adds r0, r5, 0 adds r0, r5, 0
bl sub_810910C bl sub_810910C
add sp, 0x4 add sp, 0x4
@@ -4619,7 +4619,7 @@ sub_810A2DC: @ 810A2DC
adds r0, r1 adds r0, r1
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
movs r1, 0x1 movs r1, 0x1
bl sub_810876C bl bag_menu_print_cursor_
adds r0, r4, 0 adds r0, r4, 0
bl sub_810910C bl sub_810910C
pop {r4} pop {r4}
@@ -4817,7 +4817,7 @@ sub_810A468: @ 810A468
lsrs r4, r0, 16 lsrs r4, r0, 16
adds r6, r4, 0 adds r6, r4, 0
adds r0, r4, 0 adds r0, r4, 0
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -4973,7 +4973,7 @@ _0810A5B4:
ldr r4, _0810A5EC @ =gUnknown_2021D18 ldr r4, _0810A5EC @ =gUnknown_2021D18
ldr r1, _0810A5F0 @ =gUnknown_84168F1 ldr r1, _0810A5F0 @ =gUnknown_84168F1
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
@@ -5011,7 +5011,7 @@ _0810A618:
ldr r4, _0810A648 @ =gUnknown_2021D18 ldr r4, _0810A648 @ =gUnknown_2021D18
ldr r1, _0810A64C @ =gUnknown_8416911 ldr r1, _0810A64C @ =gUnknown_8416911
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
@@ -5104,7 +5104,7 @@ sub_810A690: @ 810A690
ldr r4, _0810A700 @ =gUnknown_2021D18 ldr r4, _0810A700 @ =gUnknown_2021D18
ldr r1, _0810A704 @ =gUnknown_8416936 ldr r1, _0810A704 @ =gUnknown_8416936
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
bl sub_80BF8E4 bl sub_80BF8E4
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
@@ -5163,7 +5163,7 @@ sub_810A720: @ 810A720
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_810876C bl bag_menu_print_cursor_
adds r0, r5, 0 adds r0, r5, 0
bl sub_810910C bl sub_810910C
pop {r4,r5} pop {r4,r5}
@@ -5204,7 +5204,7 @@ sub_810A770: @ 810A770
ldr r6, _0810A824 @ =gUnknown_2021D18 ldr r6, _0810A824 @ =gUnknown_2021D18
ldr r1, _0810A828 @ =gUnknown_84162B9 ldr r1, _0810A828 @ =gUnknown_84162B9
adds r0, r6, 0 adds r0, r6, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
str r0, [sp] str r0, [sp]
movs r1, 0x1 movs r1, 0x1
@@ -5370,7 +5370,7 @@ _0810A8F0:
bl sub_8108978 bl sub_8108978
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_810876C bl bag_menu_print_cursor_
adds r0, r6, 0 adds r0, r6, 0
bl sub_810910C bl sub_810910C
_0810A93A: _0810A93A:
@@ -5421,7 +5421,7 @@ sub_810A940: @ 810A940
ldr r4, _0810A9C8 @ =gUnknown_2021D18 ldr r4, _0810A9C8 @ =gUnknown_2021D18
ldr r1, _0810A9CC @ =gUnknown_8416959 ldr r1, _0810A9CC @ =gUnknown_8416959
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r3, _0810A9D0 @ =sub_810A9D4 ldr r3, _0810A9D0 @ =sub_810A9D4
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x2 movs r1, 0x2
@@ -5525,7 +5525,7 @@ sub_810A9D4: @ 810A9D4
mov r1, r8 mov r1, r8
strh r0, [r1] strh r0, [r1]
movs r1, 0x2 movs r1, 0x2
bl sub_810876C bl bag_menu_print_cursor_
movs r0, 0x2 movs r0, 0x2
bl sub_810BAD8 bl sub_810BAD8
lsls r0, 24 lsls r0, 24
@@ -5714,7 +5714,7 @@ _0810AC00:
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_810876C bl bag_menu_print_cursor_
bl sub_8108978 bl sub_8108978
adds r0, r6, 0 adds r0, r6, 0
bl sub_810910C bl sub_810910C
@@ -5766,7 +5766,7 @@ sub_810AC40: @ 810AC40
ldr r4, _0810ACE0 @ =gUnknown_2021D18 ldr r4, _0810ACE0 @ =gUnknown_2021D18
ldr r1, _0810ACE4 @ =gUnknown_84163A7 ldr r1, _0810ACE4 @ =gUnknown_84163A7
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x6 movs r0, 0x6
movs r1, 0x3 movs r1, 0x3
bl sub_810B9DC bl sub_810B9DC
@@ -6001,19 +6001,19 @@ _0810AE54:
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
movs r1, 0x2A movs r1, 0x2A
bl sub_809A274 bl ClearItemSlots
ldr r0, [r4] ldr r0, [r4]
movs r2, 0xEE movs r2, 0xEE
lsls r2, 2 lsls r2, 2
adds r0, r2 adds r0, r2
movs r1, 0x1E movs r1, 0x1E
bl sub_809A274 bl ClearItemSlots
ldr r0, [r4] ldr r0, [r4]
movs r3, 0x86 movs r3, 0x86
lsls r3, 3 lsls r3, 3
adds r0, r3 adds r0, r3
movs r1, 0xD movs r1, 0xD
bl sub_809A274 bl ClearItemSlots
ldr r0, [r4] ldr r0, [r4]
ldr r1, _0810AEC4 @ =0x00000296 ldr r1, _0810AEC4 @ =0x00000296
adds r0, r1 adds r0, r1
@@ -6184,7 +6184,7 @@ _0810AFF6:
bl sub_80722CC bl sub_80722CC
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_810876C bl bag_menu_print_cursor_
movs r0, 0x1 movs r0, 0x1
bl sub_8109140 bl sub_8109140
ldr r1, _0810B018 @ =gUnknown_203AD30 ldr r1, _0810B018 @ =gUnknown_203AD30
@@ -6490,7 +6490,7 @@ _0810B266:
bl sub_80722CC bl sub_80722CC
ldrb r0, [r7] ldrb r0, [r7]
movs r1, 0x2 movs r1, 0x2
bl sub_810876C bl bag_menu_print_cursor_
movs r0, 0x1 movs r0, 0x1
bl sub_8109140 bl sub_8109140
ldr r1, _0810B28C @ =gUnknown_203AD30 ldr r1, _0810B28C @ =gUnknown_203AD30
@@ -6555,7 +6555,7 @@ _0810B29E:
bl sub_8109140 bl sub_8109140
ldrb r0, [r7] ldrb r0, [r7]
movs r1, 0x1 movs r1, 0x1
bl sub_810876C bl bag_menu_print_cursor_
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl CopyWindowToVram bl CopyWindowToVram
@@ -6628,7 +6628,7 @@ _0810B396:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _0810B3B8 bne _0810B3B8
bl sub_8011174 bl FreeRestoreBattleData
bl sub_804C230 bl sub_804C230
b _0810B4B6 b _0810B4B6
.align 2, 0 .align 2, 0
@@ -6710,7 +6710,7 @@ _0810B440:
bl sub_80722CC bl sub_80722CC
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_810876C bl bag_menu_print_cursor_
movs r0, 0x1 movs r0, 0x1
bl sub_8109140 bl sub_8109140
ldr r1, _0810B464 @ =gUnknown_203AD30 ldr r1, _0810B464 @ =gUnknown_203AD30
@@ -6790,7 +6790,7 @@ sub_810B4BC: @ 810B4BC
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _0810B50C bne _0810B50C
bl sub_8011174 bl FreeRestoreBattleData
bl sub_804C230 bl sub_804C230
b _0810B5C6 b _0810B5C6
.align 2, 0 .align 2, 0
@@ -6826,7 +6826,7 @@ _0810B53C:
bl sub_80722CC bl sub_80722CC
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_810876C bl bag_menu_print_cursor_
movs r0, 0x1 movs r0, 0x1
bl sub_8109140 bl sub_8109140
ldr r1, _0810B560 @ =gUnknown_203AD30 ldr r1, _0810B560 @ =gUnknown_203AD30
@@ -6857,7 +6857,7 @@ _0810B564:
bl sub_810713C bl sub_810713C
bl sub_810AECC bl sub_810AECC
ldr r1, _0810B5B0 @ =gUnknown_3005E98 ldr r1, _0810B5B0 @ =gUnknown_3005E98
ldr r0, _0810B5B4 @ =sub_81253B0 ldr r0, _0810B5B4 @ =ItemUseCB_Medicine
str r0, [r1] str r0, [r1]
ldr r0, _0810B5B8 @ =sub_81279A4 ldr r0, _0810B5B8 @ =sub_81279A4
bl sub_8108EE0 bl sub_8108EE0
@@ -6869,7 +6869,7 @@ _0810B564:
b _0810B5C6 b _0810B5C6
.align 2, 0 .align 2, 0
_0810B5B0: .4byte gUnknown_3005E98 _0810B5B0: .4byte gUnknown_3005E98
_0810B5B4: .4byte sub_81253B0 _0810B5B4: .4byte ItemUseCB_Medicine
_0810B5B8: .4byte sub_81279A4 _0810B5B8: .4byte sub_81279A4
_0810B5BC: .4byte sub_810B070 _0810B5BC: .4byte sub_810B070
_0810B5C0: _0810B5C0:
@@ -6959,7 +6959,7 @@ _0810B660:
bl sub_80722CC bl sub_80722CC
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0x2 movs r1, 0x2
bl sub_810876C bl bag_menu_print_cursor_
movs r0, 0x1 movs r0, 0x1
bl sub_8109140 bl sub_8109140
ldr r1, _0810B688 @ =gUnknown_203AD30 ldr r1, _0810B688 @ =gUnknown_203AD30
asm/item_pc.s
+11 -11
View File
@@ -806,7 +806,7 @@ _0810DA58:
ldr r4, _0810DAAC @ =gUnknown_2021D18 ldr r4, _0810DAAC @ =gUnknown_2021D18
ldr r1, _0810DAB0 @ =gUnknown_84162B9 ldr r1, _0810DAB0 @ =gUnknown_84162B9
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
str r5, [sp] str r5, [sp]
movs r0, 0 movs r0, 0
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -1221,7 +1221,7 @@ sub_810DD80: @ 810DD80
adds r0, r1 adds r0, r1
ldr r1, _0810DDA0 @ =0x0000029a ldr r1, _0810DDA0 @ =0x0000029a
adds r0, r1 adds r0, r1
bl sub_8099DD8 bl GetBagItemId
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
pop {r1} pop {r1}
@@ -1558,7 +1558,7 @@ sub_810DFE0: @ 810DFE0
ldr r4, _0810E0A8 @ =gUnknown_2021D18 ldr r4, _0810E0A8 @ =gUnknown_2021D18
ldr r1, _0810E0AC @ =gUnknown_841633F ldr r1, _0810E0AC @ =gUnknown_841633F
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
@@ -1890,7 +1890,7 @@ sub_810E274: @ 810E274
ldr r6, _0810E34C @ =gUnknown_2021D18 ldr r6, _0810E34C @ =gUnknown_2021D18
ldr r1, _0810E350 @ =gUnknown_84162FF ldr r1, _0810E350 @ =gUnknown_84162FF
adds r0, r6, 0 adds r0, r6, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [sp] str r0, [sp]
movs r0, 0x1 movs r0, 0x1
@@ -2058,7 +2058,7 @@ sub_810E418: @ 810E418
ldr r4, _0810E4AC @ =gUnknown_2021D18 ldr r4, _0810E4AC @ =gUnknown_2021D18
ldr r1, _0810E4B0 @ =gUnknown_84177C5 ldr r1, _0810E4B0 @ =gUnknown_84177C5
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
bl sub_810EAB4 bl sub_810EAB4
lsls r0, 24 lsls r0, 24
@@ -2245,7 +2245,7 @@ sub_810E5E0: @ 810E5E0
ldr r5, _0810E664 @ =gUnknown_2021D18 ldr r5, _0810E664 @ =gUnknown_2021D18
ldr r1, _0810E668 @ =gUnknown_84177AC ldr r1, _0810E668 @ =gUnknown_84177AC
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
bl sub_810EAB4 bl sub_810EAB4
lsls r0, 24 lsls r0, 24
@@ -2265,7 +2265,7 @@ sub_810E5E0: @ 810E5E0
bl sub_8008E78 bl sub_8008E78
ldr r1, _0810E66C @ =gUnknown_84162B9 ldr r1, _0810E66C @ =gUnknown_84162B9
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x3 movs r0, 0x3
bl sub_810EA9C bl sub_810EA9C
movs r0, 0xA movs r0, 0xA
@@ -2319,7 +2319,7 @@ sub_810E670: @ 810E670
ldr r4, _0810E6D0 @ =gUnknown_2021D18 ldr r4, _0810E6D0 @ =gUnknown_2021D18
ldr r1, _0810E6D4 @ =gUnknown_84162B9 ldr r1, _0810E6D4 @ =gUnknown_84162B9
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0xA movs r0, 0xA
str r0, [sp] str r0, [sp]
movs r1, 0x1 movs r1, 0x1
@@ -2589,7 +2589,7 @@ _0810E8EC: .4byte gUnknown_3005098
sub_810E8F0: @ 810E8F0 sub_810E8F0: @ 810E8F0
push {r4,lr} push {r4,lr}
ldr r0, _0810E974 @ =gUnknown_8453F98 ldr r0, _0810E974 @ =gUnknown_8453F98
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
movs r1, 0xF0 movs r1, 0xF0
lsls r1, 2 lsls r1, 2
@@ -2782,7 +2782,7 @@ sub_810EA34: @ 810EA34
str r4, [sp, 0xC] str r4, [sp, 0xC]
str r2, [sp, 0x10] str r2, [sp, 0x10]
mov r2, r9 mov r2, r9
bl sub_812E5A4 bl AddTextPrinterParametrized2
add sp, 0x14 add sp, 0x14
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3
@@ -2821,7 +2821,7 @@ sub_810EAB4: @ 810EAB4
lsls r0, r1, 3 lsls r0, r1, 3
ldr r1, _0810EAE8 @ =gUnknown_8453FD0 ldr r1, _0810EAE8 @ =gUnknown_8453FD0
adds r0, r1 adds r0, r1
bl sub_8003CE4 bl AddWindow
strb r0, [r4] strb r0, [r4]
ldrb r0, [r4] ldrb r0, [r4]
ldr r2, _0810EAEC @ =0x000003a3 ldr r2, _0810EAEC @ =0x000003a3
asm/item_use.s
+33 -33
View File
@@ -33,7 +33,7 @@ _080A0FE6:
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, _080A1010 @ =gUnknown_203AD30 ldr r0, _080A1010 @ =gUnknown_203AD30
ldrh r0, [r0] ldrh r0, [r0]
bl sub_809A260 bl GetPocketByItemId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x5 cmp r0, 0x5
@@ -153,7 +153,7 @@ sub_80A10C4: @ 80A10C4
lsrs r6, r2, 24 lsrs r6, r2, 24
ldr r5, _080A10F0 @ =gUnknown_2021D18 ldr r5, _080A10F0 @ =gUnknown_2021D18
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
cmp r4, 0 cmp r4, 0
bne _080A10F8 bne _080A10F8
ldr r3, _080A10F4 @ =sub_810A1F8 ldr r3, _080A10F4 @ =sub_810A1F8
@@ -467,14 +467,14 @@ sub_80A1338: @ 80A1338
cmp r0, 0x1 cmp r0, 0x1
bne _080A1360 bne _080A1360
ldr r1, _080A1358 @ =gUnknown_2039998 ldr r1, _080A1358 @ =gUnknown_2039998
ldr r0, _080A135C @ =sub_80A1410 ldr r0, _080A135C @ =ItemUseOnFieldCB_Rod
str r0, [r1] str r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl sub_80A103C bl sub_80A103C
b _080A1372 b _080A1372
.align 2, 0 .align 2, 0
_080A1358: .4byte gUnknown_2039998 _080A1358: .4byte gUnknown_2039998
_080A135C: .4byte sub_80A1410 _080A135C: .4byte ItemUseOnFieldCB_Rod
_080A1360: _080A1360:
ldr r0, _080A1378 @ =gUnknown_3005090 ldr r0, _080A1378 @ =gUnknown_3005090
lsls r1, r4, 2 lsls r1, r4, 2
@@ -512,7 +512,7 @@ sub_80A137C: @ 80A137C
lsls r0, r6, 24 lsls r0, r6, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
adds r0, r5, 0 adds r0, r5, 0
bl sub_805A104 bl MetatileBehavior_IsWaterfall
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080A1404 bne _080A1404
@@ -565,8 +565,8 @@ _080A1406:
bx r1 bx r1
thumb_func_end sub_80A137C thumb_func_end sub_80A137C
thumb_func_start sub_80A1410 thumb_func_start ItemUseOnFieldCB_Rod
sub_80A1410: @ 80A1410 ItemUseOnFieldCB_Rod: @ 80A1410
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@@ -584,16 +584,16 @@ sub_80A1410: @ 80A1410
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A1434: .4byte gUnknown_203AD30 _080A1434: .4byte gUnknown_203AD30
thumb_func_end sub_80A1410 thumb_func_end ItemUseOnFieldCB_Rod
thumb_func_start sub_80A1438 thumb_func_start ItemUseOutOfBattle_Itemfinder
sub_80A1438: @ 80A1438 ItemUseOutOfBattle_Itemfinder: @ 80A1438
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
movs r0, 0x27 movs r0, 0x27
bl sub_8054E90 bl IncrementGameStat
ldr r1, _080A1458 @ =gUnknown_2039998 ldr r1, _080A1458 @ =gUnknown_2039998
ldr r0, _080A145C @ =sub_813EC8C ldr r0, _080A145C @ =sub_813EC8C
str r0, [r1] str r0, [r1]
@@ -605,7 +605,7 @@ sub_80A1438: @ 80A1438
.align 2, 0 .align 2, 0
_080A1458: .4byte gUnknown_2039998 _080A1458: .4byte gUnknown_2039998
_080A145C: .4byte sub_813EC8C _080A145C: .4byte sub_813EC8C
thumb_func_end sub_80A1438 thumb_func_end ItemUseOutOfBattle_Itemfinder
thumb_func_start sub_80A1460 thumb_func_start sub_80A1460
sub_80A1460: @ 80A1460 sub_80A1460: @ 80A1460
@@ -624,7 +624,7 @@ sub_80A1460: @ 80A1460
ldr r4, _080A14B8 @ =gUnknown_2021D18 ldr r4, _080A14B8 @ =gUnknown_2021D18
ldr r1, _080A14BC @ =gUnknown_8416537 ldr r1, _080A14BC @ =gUnknown_8416537
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, _080A14C0 @ =gUnknown_203AD30 ldr r0, _080A14C0 @ =gUnknown_203AD30
ldrh r2, [r0] ldrh r2, [r0]
ldr r3, _080A14C4 @ =0x0000ffff ldr r3, _080A14C4 @ =0x0000ffff
@@ -683,7 +683,7 @@ sub_80A14E8: @ 80A14E8
ldr r4, _080A153C @ =gUnknown_2021D18 ldr r4, _080A153C @ =gUnknown_2021D18
ldr r1, _080A1540 @ =gUnknown_8416644 ldr r1, _080A1540 @ =gUnknown_8416644
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, _080A1544 @ =gUnknown_203AD30 ldr r0, _080A1544 @ =gUnknown_203AD30
ldrh r2, [r0] ldrh r2, [r0]
ldr r3, _080A1548 @ =0x0000ffff ldr r3, _080A1548 @ =0x0000ffff
@@ -963,14 +963,14 @@ sub_80A1734: @ 80A1734
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _080A1748 @ =gUnknown_3005E98 ldr r2, _080A1748 @ =gUnknown_3005E98
ldr r1, _080A174C @ =sub_81262AC ldr r1, _080A174C @ =dp05_rare_candy
str r1, [r2] str r1, [r2]
bl sub_80A16D0 bl sub_80A16D0
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A1748: .4byte gUnknown_3005E98 _080A1748: .4byte gUnknown_3005E98
_080A174C: .4byte sub_81262AC _080A174C: .4byte dp05_rare_candy
thumb_func_end sub_80A1734 thumb_func_end sub_80A1734
thumb_func_start sub_80A1750 thumb_func_start sub_80A1750
@@ -1377,7 +1377,7 @@ sub_80A1A44: @ 80A1A44
bl sub_8099E90 bl sub_8099E90
ldr r0, _080A1A8C @ =gUnknown_2021D18 ldr r0, _080A1A8C @ =gUnknown_2021D18
ldr r1, _080A1A90 @ =gUnknown_841658C ldr r1, _080A1A90 @ =gUnknown_841658C
bl sub_8008FCC bl StringExpandPlaceholders
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1412,7 +1412,7 @@ sub_80A1A94: @ 80A1A94
bl sub_8099E90 bl sub_8099E90
ldr r0, _080A1AE8 @ =gUnknown_2021D18 ldr r0, _080A1AE8 @ =gUnknown_2021D18
ldr r1, _080A1AEC @ =gUnknown_84165D2 ldr r1, _080A1AEC @ =gUnknown_84165D2
bl sub_8008FCC bl StringExpandPlaceholders
ldr r1, _080A1AF0 @ =gUnknown_3005090 ldr r1, _080A1AF0 @ =gUnknown_3005090
lsls r0, r4, 2 lsls r0, r4, 2
adds r0, r4 adds r0, r4
@@ -1438,7 +1438,7 @@ _080A1AF4:
bl sub_8099E90 bl sub_8099E90
ldr r0, _080A1B38 @ =gUnknown_2021D18 ldr r0, _080A1B38 @ =gUnknown_2021D18
ldr r1, _080A1B3C @ =gUnknown_8416600 ldr r1, _080A1B3C @ =gUnknown_8416600
bl sub_8008FCC bl StringExpandPlaceholders
ldr r1, _080A1B40 @ =gUnknown_3005090 ldr r1, _080A1B40 @ =gUnknown_3005090
lsls r0, r6, 2 lsls r0, r6, 2
adds r0, r6 adds r0, r6
@@ -1517,8 +1517,8 @@ _080A1BA6:
bx r1 bx r1
thumb_func_end sub_80A1B8C thumb_func_end sub_80A1B8C
thumb_func_start sub_80A1BAC thumb_func_start ItemUseOutOfBattle_EscapeRope
sub_80A1BAC: @ 80A1BAC ItemUseOutOfBattle_EscapeRope: @ 80A1BAC
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -1560,7 +1560,7 @@ _080A1BFE:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A1C04: .4byte gUnknown_3005090 _080A1C04: .4byte gUnknown_3005090
thumb_func_end sub_80A1BAC thumb_func_end ItemUseOutOfBattle_EscapeRope
thumb_func_start sub_80A1C08 thumb_func_start sub_80A1C08
sub_80A1C08: @ 80A1C08 sub_80A1C08: @ 80A1C08
@@ -2011,7 +2011,7 @@ sub_80A1F78: @ 80A1F78
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, _080A1F9C @ =gUnknown_203AD30 ldr r0, _080A1F9C @ =gUnknown_203AD30
ldrh r0, [r0] ldrh r0, [r0]
bl sub_809A260 bl GetPocketByItemId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x5 cmp r0, 0x5
@@ -2043,14 +2043,14 @@ sub_80A1FBC: @ 80A1FBC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _080A1FD0 @ =gUnknown_3005E98 ldr r2, _080A1FD0 @ =gUnknown_3005E98
ldr r1, _080A1FD4 @ =sub_81253B0 ldr r1, _080A1FD4 @ =ItemUseCB_Medicine
str r1, [r2] str r1, [r2]
bl sub_80A1F78 bl sub_80A1F78
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A1FD0: .4byte gUnknown_3005E98 _080A1FD0: .4byte gUnknown_3005E98
_080A1FD4: .4byte sub_81253B0 _080A1FD4: .4byte ItemUseCB_Medicine
thumb_func_end sub_80A1FBC thumb_func_end sub_80A1FBC
thumb_func_start sub_80A1FD8 thumb_func_start sub_80A1FD8
@@ -2125,8 +2125,8 @@ _080A2060:
bx r0 bx r0
thumb_func_end sub_80A2010 thumb_func_end sub_80A2010
thumb_func_start sub_80A2068 thumb_func_start ItemUseOutOfBattle_EnigmaBerry
sub_80A2068: @ 80A2068 ItemUseOutOfBattle_EnigmaBerry: @ 80A2068
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -2252,10 +2252,10 @@ _080A2188:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A2190: .4byte gUnknown_3005090 _080A2190: .4byte gUnknown_3005090
thumb_func_end sub_80A2068 thumb_func_end ItemUseOutOfBattle_EnigmaBerry
thumb_func_start sub_80A2194 thumb_func_start ItemUseInBattle_EnigmaBerry
sub_80A2194: @ 80A2194 ItemUseInBattle_EnigmaBerry: @ 80A2194
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -2317,7 +2317,7 @@ _080A2232:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80A2194 thumb_func_end ItemUseInBattle_EnigmaBerry
thumb_func_start sub_80A2238 thumb_func_start sub_80A2238
sub_80A2238: @ 80A2238 sub_80A2238: @ 80A2238
@@ -2326,7 +2326,7 @@ sub_80A2238: @ 80A2238
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r0, _080A2268 @ =gUnknown_203AD30 ldr r0, _080A2268 @ =gUnknown_203AD30
ldrh r0, [r0] ldrh r0, [r0]
bl sub_809A260 bl GetPocketByItemId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x5 cmp r0, 0x5
@@ -2334,7 +2334,7 @@ sub_80A2238: @ 80A2238
ldr r4, _080A226C @ =gUnknown_2021D18 ldr r4, _080A226C @ =gUnknown_2021D18
ldr r1, _080A2270 @ =gUnknown_8416425 ldr r1, _080A2270 @ =gUnknown_8416425
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r3, _080A2274 @ =sub_813E2B8 ldr r3, _080A2274 @ =sub_813E2B8
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x4 movs r1, 0x4
asm/itemfinder.s
+2 -2
View File
@@ -381,7 +381,7 @@ sub_813EF40: @ 813EF40
strh r5, [r0] strh r5, [r0]
ldrh r1, [r1] ldrh r1, [r1]
movs r0, 0 movs r0, 0
bl sub_80CBED4 bl TV_PrintIntToStringVar
strh r5, [r4, 0x4] strh r5, [r4, 0x4]
movs r0, 0 movs r0, 0
strh r0, [r4] strh r0, [r4]
@@ -524,7 +524,7 @@ sub_813F070: @ 813F070
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
adds r6, r2, 0 adds r6, r2, 0
bl sub_80589C4 bl mapconnection_get_mapheader
adds r3, r0, 0 adds r3, r0, 0
ldrb r0, [r4] ldrb r0, [r4]
cmp r0, 0x2 cmp r0, 0x2
asm/learn_move.s
+6 -6
View File
@@ -78,7 +78,7 @@ sub_80E469C: @ 80E469C
bl sub_8001658 bl sub_8001658
bl reset_temp_tile_data_buffers bl reset_temp_tile_data_buffers
ldr r0, _080E4778 @ =gUnknown_83FFA44 ldr r0, _080E4778 @ =gUnknown_83FFA44
bl sub_8003B24 bl InitWindows
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _080E476C beq _080E476C
@@ -255,7 +255,7 @@ _080E486C: .4byte sub_80E4870
sub_80E4870: @ 80E4870 sub_80E4870: @ 80E4870
push {r4,lr} push {r4,lr}
movs r0, 0x7 movs r0, 0x7
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _080E4882 bne _080E4882
@@ -295,7 +295,7 @@ sub_80E48C0: @ 80E48C0
adds r1, r0, 0 adds r1, r0, 0
ldr r4, _080E48F0 @ =gUnknown_2021D18 ldr r4, _080E48F0 @ =gUnknown_2021D18
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
bl sub_80F78A8 bl sub_80F78A8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1036,7 +1036,7 @@ sub_80E4F0C: @ 80E4F0C
ldr r4, _080E4F4C @ =gUnknown_2021D18 ldr r4, _080E4F4C @ =gUnknown_2021D18
ldr r1, _080E4F50 @ =gUnknown_841E3E3 ldr r1, _080E4F50 @ =gUnknown_841E3E3
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
str r5, [sp] str r5, [sp]
movs r0, 0x2 movs r0, 0x2
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -1814,7 +1814,7 @@ _080E5570: .4byte 0x00000a67
thumb_func_start sub_80E5574 thumb_func_start sub_80E5574
sub_80E5574: @ 80E5574 sub_80E5574: @ 80E5574
push {r4,lr} push {r4,lr}
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r4, r0, 24 asrs r4, r0, 24
movs r0, 0x2 movs r0, 0x2
@@ -1936,7 +1936,7 @@ _080E563E:
movs r1, 0x3 movs r1, 0x3
adds r2, r7, 0 adds r2, r7, 0
adds r3, r6, 0 adds r3, r6, 0
bl sub_812E5A4 bl AddTextPrinterParametrized2
add sp, 0x14 add sp, 0x14
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
asm/link.s
+17 -17
View File
@@ -1523,8 +1523,8 @@ _0800A080:
_0800A084: .4byte gUnknown_3003F80 _0800A084: .4byte gUnknown_3003F80
thumb_func_end sub_800A068 thumb_func_end sub_800A068
thumb_func_start sub_800A088 thumb_func_start GetLinkPlayerCount
sub_800A088: @ 800A088 GetLinkPlayerCount: @ 800A088
push {lr} push {lr}
ldr r0, _0800A0A0 @ =gUnknown_3003F3C ldr r0, _0800A0A0 @ =gUnknown_3003F3C
ldrb r0, [r0] ldrb r0, [r0]
@@ -1546,7 +1546,7 @@ _0800A0A8:
_0800A0B0: _0800A0B0:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_800A088 thumb_func_end GetLinkPlayerCount
thumb_func_start sub_800A0B4 thumb_func_start sub_800A0B4
sub_800A0B4: @ 800A0B4 sub_800A0B4: @ 800A0B4
@@ -1590,7 +1590,7 @@ _0800A0F0:
_0800A0F8: .4byte gUnknown_3003F64 _0800A0F8: .4byte gUnknown_3003F64
_0800A0FC: .4byte gUnknown_3000E54 _0800A0FC: .4byte gUnknown_3000E54
_0800A100: _0800A100:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0800A112 bne _0800A112
@@ -1618,12 +1618,12 @@ _0800A134:
adds r5, 0x1C adds r5, 0x1C
adds r6, 0x1 adds r6, 0x1
_0800A138: _0800A138:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r6, r0 cmp r6, r0
blt _0800A124 blt _0800A124
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r7, r0 cmp r7, r0
@@ -1738,12 +1738,12 @@ _0800A21A:
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
_0800A220: _0800A220:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r4, r0 cmp r4, r0
bcc _0800A200 bcc _0800A200
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r6, r0 cmp r6, r0
@@ -2687,7 +2687,7 @@ _0800A8DE:
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r5, 0x1 adds r5, 0x1
_0800A8EA: _0800A8EA:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r5, r0 cmp r5, r0
@@ -3016,7 +3016,7 @@ _0800AB34: .4byte sub_800AB38
thumb_func_start sub_800AB38 thumb_func_start sub_800AB38
sub_800AB38: @ 800AB38 sub_800AB38: @ 800AB38
push {r4,lr} push {r4,lr}
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
movs r3, 0 movs r3, 0
@@ -3120,7 +3120,7 @@ _0800ABFC: .4byte sub_800AC00
thumb_func_start sub_800AC00 thumb_func_start sub_800AC00
sub_800AC00: @ 800AC00 sub_800AC00: @ 800AC00
push {r4,lr} push {r4,lr}
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
movs r1, 0 movs r1, 0
@@ -3283,7 +3283,7 @@ _0800AD30:
movs r0, 0x1 movs r0, 0x1
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
ldr r0, _0800AE04 @ =gUnknown_82345F0 ldr r0, _0800AE04 @ =gUnknown_82345F0
bl sub_8003B24 bl InitWindows
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _0800ADD8 beq _0800ADD8
@@ -3387,7 +3387,7 @@ sub_800AE1C: @ 800AE1C
movs r1, 0x3 movs r1, 0x3
movs r2, 0x2 movs r2, 0x2
movs r3, 0x5 movs r3, 0x5
bl sub_812E51C bl box_print
str r4, [sp] str r4, [sp]
str r5, [sp, 0x4] str r5, [sp, 0x4]
ldr r0, _0800AECC @ =gUnknown_841DF05 ldr r0, _0800AECC @ =gUnknown_841DF05
@@ -3396,7 +3396,7 @@ sub_800AE1C: @ 800AE1C
movs r1, 0x3 movs r1, 0x3
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E51C bl box_print
movs r0, 0 movs r0, 0
bl PutWindowTilemap bl PutWindowTilemap
movs r0, 0x2 movs r0, 0x2
@@ -3444,7 +3444,7 @@ sub_800AED0: @ 800AED0
movs r1, 0x3 movs r1, 0x3
movs r2, 0x2 movs r2, 0x2
movs r3, 0 movs r3, 0
bl sub_812E51C bl box_print
movs r0, 0x1 movs r0, 0x1
bl PutWindowTilemap bl PutWindowTilemap
movs r0, 0x2 movs r0, 0x2
@@ -3522,7 +3522,7 @@ _0800AF7A:
movs r1, 0x3 movs r1, 0x3
movs r2, 0x2 movs r2, 0x2
movs r3, 0x14 movs r3, 0x14
bl sub_812E51C bl box_print
b _0800AFC4 b _0800AFC4
.align 2, 0 .align 2, 0
_0800AF9C: .4byte gUnknown_3003F3C _0800AF9C: .4byte gUnknown_3003F3C
@@ -3541,7 +3541,7 @@ _0800AFA8:
movs r1, 0x3 movs r1, 0x3
movs r2, 0x2 movs r2, 0x2
movs r3, 0x14 movs r3, 0x14
bl sub_812E51C bl box_print
_0800AFC4: _0800AFC4:
ldr r0, _0800B004 @ =gUnknown_30030F0 ldr r0, _0800B004 @ =gUnknown_30030F0
movs r2, 0x87 movs r2, 0x87
asm/link_rfu.s
+7 -7
View File
@@ -4359,7 +4359,7 @@ _080FF4A2:
thumb_func_start sub_80FF4A8 thumb_func_start sub_80FF4A8
sub_80FF4A8: @ 80FF4A8 sub_80FF4A8: @ 80FF4A8
push {lr} push {lr}
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -4400,7 +4400,7 @@ _080FF4EA:
thumb_func_start sub_80FF4F0 thumb_func_start sub_80FF4F0
sub_80FF4F0: @ 80FF4F0 sub_80FF4F0: @ 80FF4F0
push {r4,lr} push {r4,lr}
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -4446,7 +4446,7 @@ _080FF53E:
thumb_func_start sub_80FF544 thumb_func_start sub_80FF544
sub_80FF544: @ 80FF544 sub_80FF544: @ 80FF544
push {lr} push {lr}
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -6055,7 +6055,7 @@ _080FFFD4:
movs r0, 0x1 movs r0, 0x1
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
ldr r0, _08100030 @ =gUnknown_843F8B0 ldr r0, _08100030 @ =gUnknown_843F8B0
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
bl sub_8100CBC bl sub_8100CBC
bl sub_8100C5C bl sub_8100C5C
@@ -7823,7 +7823,7 @@ _08100E0A:
str r0, [sp, 0x8] str r0, [sp, 0x8]
mov r0, r12 mov r0, r12
adds r2, r7, 0 adds r2, r7, 0
bl sub_812E51C bl box_print
add sp, 0x10 add sp, 0x10
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3
@@ -8021,7 +8021,7 @@ sub_8100F44: @ 8100F44
orrs r0, r1 orrs r0, r1
str r0, [sp, 0x4] str r0, [sp, 0x4]
mov r0, sp mov r0, sp
bl sub_8003CE4 bl AddWindow
ldr r1, _08100FD8 @ =gUnknown_203ACEC ldr r1, _08100FD8 @ =gUnknown_203ACEC
ldr r1, [r1] ldr r1, [r1]
strh r0, [r1, 0x2] strh r0, [r1, 0x2]
@@ -10787,7 +10787,7 @@ sub_8102428: @ 8102428
orrs r0, r1 orrs r0, r1
str r0, [sp, 0x10] str r0, [sp, 0x10]
add r0, sp, 0xC add r0, sp, 0xC
bl sub_8003CE4 bl AddWindow
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
asm/link_rfu_2.s
+5 -5
View File
@@ -3720,7 +3720,7 @@ sub_80FA2B0: @ 80FA2B0
bl sub_80F9D04 bl sub_80F9D04
strh r4, [r5] strh r4, [r5]
_080FA2DE: _080FA2DE:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
movs r1, 0 movs r1, 0
@@ -3837,7 +3837,7 @@ _080FA3B8: .4byte 0x0000069e
_080FA3BC: .4byte gUnknown_3003F50 _080FA3BC: .4byte gUnknown_3003F50
_080FA3C0: .4byte sub_80FA2B0 _080FA3C0: .4byte sub_80FA2B0
_080FA3C4: _080FA3C4:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
movs r1, 0x1 movs r1, 0x1
@@ -9651,7 +9651,7 @@ _080FCF88:
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
_080FCFA6: _080FCFA6:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
subs r0, 0x1 subs r0, 0x1
@@ -9992,7 +9992,7 @@ _080FD220:
ble _080FD1F4 ble _080FD1F4
mov r4, r9 mov r4, r9
_080FD22C: _080FD22C:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r4, r0 cmp r4, r0
@@ -10049,7 +10049,7 @@ _080FD29E:
adds r5, 0x1C adds r5, 0x1C
adds r4, 0x1 adds r4, 0x1
_080FD2A4: _080FD2A4:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r4, r0 cmp r4, r0
asm/link_rfu_3.s
+58 -58
View File
@@ -201,7 +201,7 @@ _081159B8:
_08115A10: _08115A10:
ldr r0, _08115A1C @ =gUnknown_2021D18 ldr r0, _08115A1C @ =gUnknown_2021D18
ldr r1, _08115A20 @ =gUnknown_8457234 ldr r1, _08115A20 @ =gUnknown_8457234
bl sub_8008FCC bl StringExpandPlaceholders
_08115A18: _08115A18:
pop {r0} pop {r0}
bx r0 bx r0
@@ -374,13 +374,13 @@ _08115B5C:
bl sub_811A054 bl sub_811A054
strb r0, [r5, 0x17] strb r0, [r5, 0x17]
ldr r0, _08115C48 @ =gUnknown_8456CD0 ldr r0, _08115C48 @ =gUnknown_8456CD0
bl sub_8003CE4 bl AddWindow
strb r0, [r5, 0x10] strb r0, [r5, 0x10]
ldr r0, _08115C4C @ =gUnknown_8456CFC ldr r0, _08115C4C @ =gUnknown_8456CFC
bl sub_8003CE4 bl AddWindow
strb r0, [r5, 0xF] strb r0, [r5, 0xF]
ldr r0, _08115C50 @ =gUnknown_8456D04 ldr r0, _08115C50 @ =gUnknown_8456D04
bl sub_8003CE4 bl AddWindow
strb r0, [r5, 0x11] strb r0, [r5, 0x11]
ldrb r0, [r5, 0x10] ldrb r0, [r5, 0x10]
movs r1, 0x22 movs r1, 0x22
@@ -460,7 +460,7 @@ _08115C60:
beq _08115CB0 beq _08115CB0
ldr r0, _08115CA8 @ =gUnknown_2021D18 ldr r0, _08115CA8 @ =gUnknown_2021D18
ldr r1, _08115CAC @ =gUnknown_8457264 ldr r1, _08115CAC @ =gUnknown_8457264
bl sub_8008FCC bl StringExpandPlaceholders
b _08115CCC b _08115CCC
.align 2, 0 .align 2, 0
_08115C98: .4byte gUnknown_2021CD0 _08115C98: .4byte gUnknown_2021CD0
@@ -472,7 +472,7 @@ _08115CAC: .4byte gUnknown_8457264
_08115CB0: _08115CB0:
ldr r0, _08115CBC @ =gUnknown_2021D18 ldr r0, _08115CBC @ =gUnknown_2021D18
ldr r1, _08115CC0 @ =gUnknown_8457234 ldr r1, _08115CC0 @ =gUnknown_8457234
bl sub_8008FCC bl StringExpandPlaceholders
b _08115CCC b _08115CCC
.align 2, 0 .align 2, 0
_08115CBC: .4byte gUnknown_2021D18 _08115CBC: .4byte gUnknown_2021D18
@@ -828,7 +828,7 @@ _08115F5C:
bl ConvertInternationalString bl ConvertInternationalString
ldr r0, _08115FA8 @ =gUnknown_2021D18 ldr r0, _08115FA8 @ =gUnknown_2021D18
ldr r1, _08115FAC @ =gUnknown_8457554 ldr r1, _08115FAC @ =gUnknown_8457554
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0xD movs r0, 0xD
strb r0, [r5, 0xC] strb r0, [r5, 0xC]
_08115F90: _08115F90:
@@ -1215,14 +1215,14 @@ _081162C0:
ldr r1, _081162CC @ =gUnknown_84574C4 ldr r1, _081162CC @ =gUnknown_84574C4
_081162C2: _081162C2:
adds r0, r2, 0 adds r0, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
b _081162D8 b _081162D8
.align 2, 0 .align 2, 0
_081162CC: .4byte gUnknown_84574C4 _081162CC: .4byte gUnknown_84574C4
_081162D0: _081162D0:
ldr r1, _081162DC @ =gUnknown_84574EC ldr r1, _081162DC @ =gUnknown_84574EC
adds r0, r2, 0 adds r0, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
_081162D8: _081162D8:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1251,13 +1251,13 @@ _081162F6:
b _08116312 b _08116312
_08116300: _08116300:
ldr r1, _08116308 @ =gUnknown_8457E28 ldr r1, _08116308 @ =gUnknown_8457E28
bl sub_8008FCC bl StringExpandPlaceholders
b _08116312 b _08116312
.align 2, 0 .align 2, 0
_08116308: .4byte gUnknown_8457E28 _08116308: .4byte gUnknown_8457E28
_0811630C: _0811630C:
ldr r1, _08116318 @ =gUnknown_8457E44 ldr r1, _08116318 @ =gUnknown_8457E44
bl sub_8008FCC bl StringExpandPlaceholders
_08116312: _08116312:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1308,14 +1308,14 @@ _08116338:
_08116390: _08116390:
ldr r1, _0811639C @ =gUnknown_8459238 ldr r1, _0811639C @ =gUnknown_8459238
adds r0, r2, 0 adds r0, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
b _081163A8 b _081163A8
.align 2, 0 .align 2, 0
_0811639C: .4byte gUnknown_8459238 _0811639C: .4byte gUnknown_8459238
_081163A0: _081163A0:
ldr r1, _081163AC @ =gUnknown_8459250 ldr r1, _081163AC @ =gUnknown_8459250
adds r0, r2, 0 adds r0, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
_081163A8: _081163A8:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1366,14 +1366,14 @@ _081163CC:
_08116424: _08116424:
ldr r1, _08116430 @ =gUnknown_84576AC ldr r1, _08116430 @ =gUnknown_84576AC
adds r0, r2, 0 adds r0, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
b _0811643C b _0811643C
.align 2, 0 .align 2, 0
_08116430: .4byte gUnknown_84576AC _08116430: .4byte gUnknown_84576AC
_08116434: _08116434:
ldr r1, _08116440 @ =gUnknown_84576C4 ldr r1, _08116440 @ =gUnknown_84576C4
adds r0, r2, 0 adds r0, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
_0811643C: _0811643C:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1892,13 +1892,13 @@ _08116838:
movs r4, 0 movs r4, 0
strb r0, [r6, 0x11] strb r0, [r6, 0x11]
ldr r0, _081168EC @ =gUnknown_8456CD0 ldr r0, _081168EC @ =gUnknown_8456CD0
bl sub_8003CE4 bl AddWindow
strb r0, [r6, 0xC] strb r0, [r6, 0xC]
ldr r0, _081168F0 @ =gUnknown_8456D4C ldr r0, _081168F0 @ =gUnknown_8456D4C
bl sub_8003CE4 bl AddWindow
strb r0, [r6, 0xB] strb r0, [r6, 0xB]
ldr r0, _081168F4 @ =gUnknown_8456D54 ldr r0, _081168F4 @ =gUnknown_8456D54
bl sub_8003CE4 bl AddWindow
strb r0, [r6, 0xD] strb r0, [r6, 0xD]
ldrb r0, [r6, 0xC] ldrb r0, [r6, 0xC]
movs r1, 0x22 movs r1, 0x22
@@ -2196,7 +2196,7 @@ _08116AF0:
bl StringCopy bl StringCopy
ldr r1, _08116B40 @ =gUnknown_8457700 ldr r1, _08116B40 @ =gUnknown_8457700
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
b _08116B70 b _08116B70
.align 2, 0 .align 2, 0
_08116B30: .4byte gUnknown_2021D18 _08116B30: .4byte gUnknown_2021D18
@@ -3033,7 +3033,7 @@ _0811719C:
movs r2, 0x64 movs r2, 0x64
bl memcpy bl memcpy
movs r0, 0x32 movs r0, 0x32
bl sub_8054E90 bl IncrementGameStat
bl ResetBlockReceivedFlags bl ResetBlockReceivedFlags
b _081171FA b _081171FA
.align 2, 0 .align 2, 0
@@ -3177,12 +3177,12 @@ _081172E8:
adds r5, 0x60 adds r5, 0x60
adds r4, 0x1 adds r4, 0x1
_08117302: _08117302:
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r4, r0 cmp r4, r0
blt _081172E8 blt _081172E8
bl sub_800A088 bl GetLinkPlayerCount
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x2 cmp r0, 0x2
@@ -3272,7 +3272,7 @@ sub_81173C0: @ 81173C0
adds r6, r0, 0 adds r6, r0, 0
lsls r6, 16 lsls r6, 16
lsrs r6, 16 lsrs r6, 16
bl sub_80A0058 bl sp000_heal_pokemon
bl copy_player_party_to_sav1 bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks bl copy_bags_and_unk_data_from_save_blocks
ldr r5, _0811742C @ =gUnknown_202273C ldr r5, _0811742C @ =gUnknown_202273C
@@ -3310,7 +3310,7 @@ sub_81173C0: @ 81173C0
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r0, _0811743C @ =gUnknown_2022B4C ldr r0, _0811743C @ =gUnknown_2022B4C
str r6, [r0] str r6, [r0]
bl sub_8044074 bl PlayBattleBGM
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
@@ -3400,7 +3400,7 @@ sub_81174B4: @ 81174B4
strh r1, [r0] strh r1, [r0]
ldr r0, _08117528 @ =0x0000406f ldr r0, _08117528 @ =0x0000406f
bl VarSet bl VarSet
bl sub_800A088 bl GetLinkPlayerCount
ldr r1, _0811752C @ =gUnknown_3005030 ldr r1, _0811752C @ =gUnknown_3005030
strb r0, [r1] strb r0, [r1]
bl GetMultiplayerId bl GetMultiplayerId
@@ -3660,7 +3660,7 @@ _081177A0:
ldr r0, _081177C4 @ =gUnknown_2022618 ldr r0, _081177C4 @ =gUnknown_2022618
movs r1, 0x1 movs r1, 0x1
bl sub_8117594 bl sub_8117594
bl sub_80A0058 bl sp000_heal_pokemon
bl copy_player_party_to_sav1 bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks bl copy_bags_and_unk_data_from_save_blocks
movs r0, 0x1 movs r0, 0x1
@@ -3673,7 +3673,7 @@ _081177A0:
_081177C4: .4byte gUnknown_2022618 _081177C4: .4byte gUnknown_2022618
_081177C8: _081177C8:
bl sub_80563F0 bl sub_80563F0
bl sub_80A0058 bl sp000_heal_pokemon
bl copy_player_party_to_sav1 bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks bl copy_bags_and_unk_data_from_save_blocks
ldr r0, _081177EC @ =gUnknown_2022618 ldr r0, _081177EC @ =gUnknown_2022618
@@ -3689,7 +3689,7 @@ _081177C8:
_081177EC: .4byte gUnknown_2022618 _081177EC: .4byte gUnknown_2022618
_081177F0: _081177F0:
bl sub_80563F0 bl sub_80563F0
bl sub_80A0058 bl sp000_heal_pokemon
bl copy_player_party_to_sav1 bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks bl copy_bags_and_unk_data_from_save_blocks
ldr r0, _08117814 @ =gUnknown_2022618 ldr r0, _08117814 @ =gUnknown_2022618
@@ -4064,7 +4064,7 @@ _08117AB8:
orrs r1, r0 orrs r1, r0
str r1, [sp, 0x4] str r1, [sp, 0x4]
mov r0, sp mov r0, sp
bl sub_8003CE4 bl AddWindow
strb r0, [r5, 0xF] strb r0, [r5, 0xF]
ldrb r0, [r5, 0xF] ldrb r0, [r5, 0xF]
bl sub_814240C bl sub_814240C
@@ -4292,7 +4292,7 @@ _08117CB2:
bl ConvertInternationalString bl ConvertInternationalString
ldr r0, _08117D34 @ =gUnknown_2021D18 ldr r0, _08117D34 @ =gUnknown_2021D18
ldr r1, _08117D38 @ =gUnknown_8457554 ldr r1, _08117D38 @ =gUnknown_8457554
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x9 movs r0, 0x9
strb r0, [r5, 0xC] strb r0, [r5, 0xC]
bl sub_80F8F5C bl sub_80F8F5C
@@ -4617,10 +4617,10 @@ _08117FC0:
orrs r1, r0 orrs r1, r0
str r1, [sp, 0x4] str r1, [sp, 0x4]
mov r0, sp mov r0, sp
bl sub_8003CE4 bl AddWindow
strb r0, [r5, 0xB] strb r0, [r5, 0xB]
ldr r0, _08118064 @ =gUnknown_8456D54 ldr r0, _08118064 @ =gUnknown_8456D54
bl sub_8003CE4 bl AddWindow
strb r0, [r5, 0xD] strb r0, [r5, 0xD]
ldrb r0, [r5, 0xB] ldrb r0, [r5, 0xB]
bl sub_814240C bl sub_814240C
@@ -5038,7 +5038,7 @@ _08118380:
orrs r1, r0 orrs r1, r0
str r1, [sp, 0x4] str r1, [sp, 0x4]
mov r0, sp mov r0, sp
bl sub_8003CE4 bl AddWindow
strb r0, [r5, 0xB] strb r0, [r5, 0xB]
ldrb r0, [r5, 0xB] ldrb r0, [r5, 0xB]
bl sub_814240C bl sub_814240C
@@ -5371,7 +5371,7 @@ sub_8118664: @ 8118664
cmp r3, r0 cmp r3, r0
beq _0811867E beq _0811867E
adds r1, r3, 0 adds r1, r3, 0
bl sub_8008FCC bl StringExpandPlaceholders
_0811867E: _0811867E:
pop {r0} pop {r0}
bx r0 bx r0
@@ -5392,7 +5392,7 @@ sub_811868C: @ 811868C
cmp r2, r0 cmp r2, r0
beq _081186A4 beq _081186A4
adds r1, r2, 0 adds r1, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
_081186A4: _081186A4:
pop {r0} pop {r0}
bx r0 bx r0
@@ -6307,7 +6307,7 @@ _08118ED6:
lsls r1, r5, 2 lsls r1, r5, 2
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x21 movs r0, 0x21
bl _081198DA bl _081198DA
.align 2, 0 .align 2, 0
@@ -6557,7 +6557,7 @@ _08119122:
lsls r1, r5, 2 lsls r1, r5, 2
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl sub_8008FCC bl StringExpandPlaceholders
b _081198DC b _081198DC
.align 2, 0 .align 2, 0
_08119150: .4byte sub_8117280 _08119150: .4byte sub_8117280
@@ -6899,7 +6899,7 @@ _08119414:
bl sub_8008E78 bl sub_8008E78
ldr r0, _08119460 @ =gUnknown_2021D18 ldr r0, _08119460 @ =gUnknown_2021D18
ldr r1, _08119464 @ =gUnknown_8458DBC ldr r1, _08119464 @ =gUnknown_8458DBC
bl sub_8008FCC bl StringExpandPlaceholders
_0811944A: _0811944A:
ldr r1, _08119460 @ =gUnknown_2021D18 ldr r1, _08119460 @ =gUnknown_2021D18
movs r0, 0x2C movs r0, 0x2C
@@ -7457,8 +7457,8 @@ _081198DC:
_081198E8: .4byte gUnknown_2021D18 _081198E8: .4byte gUnknown_2021D18
thumb_func_end sub_81186E0 thumb_func_end sub_81186E0
thumb_func_start sub_81198EC thumb_func_start var_800D_set_xB
sub_81198EC: @ 81198EC var_800D_set_xB: @ 81198EC
push {lr} push {lr}
bl InUnionRoom bl InUnionRoom
cmp r0, 0x1 cmp r0, 0x1
@@ -7471,7 +7471,7 @@ _081198FC:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08119900: .4byte gUnknown_20370D0 _08119900: .4byte gUnknown_20370D0
thumb_func_end sub_81198EC thumb_func_end var_800D_set_xB
thumb_func_start sub_8119904 thumb_func_start sub_8119904
sub_8119904: @ 8119904 sub_8119904: @ 8119904
@@ -8488,7 +8488,7 @@ sub_811A0B4: @ 811A0B4
bl sub_80F6EE4 bl sub_80F6EE4
ldr r0, _0811A0DC @ =gUnknown_2021D18 ldr r0, _0811A0DC @ =gUnknown_2021D18
adds r1, r4, 0 adds r1, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6E54 bl sub_80F6E54
@@ -8534,7 +8534,7 @@ _0811A10A:
bl sub_80F6EE4 bl sub_80F6EE4
ldr r0, _0811A12C @ =gUnknown_2021D18 ldr r0, _0811A12C @ =gUnknown_2021D18
adds r1, r5, 0 adds r1, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
bl sub_80F6E08 bl sub_80F6E08
ldrb r0, [r4] ldrb r0, [r4]
@@ -8593,7 +8593,7 @@ _0811A174:
negs r0, r0 negs r0, r0
b _0811A1A4 b _0811A1A4
_0811A186: _0811A186:
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
movs r2, 0x80 movs r2, 0x80
@@ -8618,7 +8618,7 @@ _0811A1A4:
sub_811A1AC: @ 811A1AC sub_811A1AC: @ 811A1AC
push {r4,lr} push {r4,lr}
sub sp, 0x8 sub sp, 0x8
bl sub_8003CE4 bl AddWindow
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -8684,7 +8684,7 @@ sub_811A218: @ 811A218
beq _0811A274 beq _0811A274
b _0811A2DA b _0811A2DA
_0811A234: _0811A234:
bl sub_8003CE4 bl AddWindow
strb r0, [r5] strb r0, [r5]
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
@@ -8790,7 +8790,7 @@ _0811A308:
bl sub_811A1AC bl sub_811A1AC
strb r0, [r7] strb r0, [r7]
ldr r0, [sp, 0x1C] ldr r0, [sp, 0x1C]
bl sub_8003CE4 bl AddWindow
strb r0, [r4] strb r0, [r4]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
@@ -9805,7 +9805,7 @@ sub_811AA5C: @ 811AA5C
adds r1, r2 adds r1, r2
adds r1, r3 adds r1, r3
ldr r1, [r1] ldr r1, [r1]
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
b _0811ABD2 b _0811ABD2
.align 2, 0 .align 2, 0
@@ -9925,7 +9925,7 @@ _0811ABB0:
ldr r1, [r0] ldr r1, [r0]
_0811ABB6: _0811ABB6:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
b _0811ABD0 b _0811ABD0
.align 2, 0 .align 2, 0
_0811ABC0: .4byte gUnknown_2021D18 _0811ABC0: .4byte gUnknown_2021D18
@@ -9933,7 +9933,7 @@ _0811ABC4: .4byte gUnknown_84589AC
_0811ABC8: _0811ABC8:
ldr r0, _0811ABD8 @ =gUnknown_2021D18 ldr r0, _0811ABD8 @ =gUnknown_2021D18
ldr r1, _0811ABDC @ =gUnknown_8457F90 ldr r1, _0811ABDC @ =gUnknown_8457F90
bl sub_8008FCC bl StringExpandPlaceholders
_0811ABD0: _0811ABD0:
movs r0, 0 movs r0, 0
_0811ABD2: _0811ABD2:
@@ -10321,7 +10321,7 @@ _0811AEA4:
ldr r1, _0811AEB0 @ =gUnknown_8458F9C ldr r1, _0811AEB0 @ =gUnknown_8458F9C
_0811AEA6: _0811AEA6:
adds r0, r3, 0 adds r0, r3, 0
bl sub_8008FCC bl StringExpandPlaceholders
b _0811AEC2 b _0811AEC2
.align 2, 0 .align 2, 0
_0811AEB0: .4byte gUnknown_8458F9C _0811AEB0: .4byte gUnknown_8458F9C
@@ -10331,7 +10331,7 @@ _0811AEB4:
adds r1, r0 adds r1, r0
ldr r1, [r1] ldr r1, [r1]
adds r0, r3, 0 adds r0, r3, 0
bl sub_8008FCC bl StringExpandPlaceholders
_0811AEC2: _0811AEC2:
pop {r0} pop {r0}
bx r0 bx r0
@@ -10552,7 +10552,7 @@ _0811B078:
ldr r1, _0811B084 @ =gUnknown_8457C48 ldr r1, _0811B084 @ =gUnknown_8457C48
_0811B07A: _0811B07A:
adds r0, r7, 0 adds r0, r7, 0
bl sub_8008FCC bl StringExpandPlaceholders
_0811B080: _0811B080:
movs r2, 0x1 movs r2, 0x1
b _0811B092 b _0811B092
@@ -10561,7 +10561,7 @@ _0811B084: .4byte gUnknown_8457C48
_0811B088: _0811B088:
ldr r1, _0811B0A0 @ =gUnknown_8457E0C ldr r1, _0811B0A0 @ =gUnknown_8457E0C
adds r0, r7, 0 adds r0, r7, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r2, 0x2 movs r2, 0x2
_0811B092: _0811B092:
adds r0, r2, 0 adds r0, r2, 0
@@ -12702,7 +12702,7 @@ _0811C096:
cmp r4, r6 cmp r4, r6
ble _0811C096 ble _0811C096
movs r0, 0x32 movs r0, 0x32
bl sub_8054E90 bl IncrementGameStat
bl CalculatePlayerPartyCount bl CalculatePlayerPartyCount
ldr r0, _0811C0D8 @ =gUnknown_20386AE ldr r0, _0811C0D8 @ =gUnknown_20386AE
movs r2, 0xC0 movs r2, 0xC0
@@ -12766,7 +12766,7 @@ sub_811C0E0: @ 811C0E0
movs r1, 0x3 movs r1, 0x3
adds r2, r6, 0 adds r2, r6, 0
ldr r3, [sp, 0x14] ldr r3, [sp, 0x14]
bl sub_812E5A4 bl AddTextPrinterParametrized2
add sp, 0x18 add sp, 0x18
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
@@ -12815,7 +12815,7 @@ _0811C168:
b _0811C1AA b _0811C1AA
_0811C196: _0811C196:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
cmp r0, 0 cmp r0, 0
@@ -12937,7 +12937,7 @@ _0811C2C0:
bl sub_8001658 bl sub_8001658
bl reset_temp_tile_data_buffers bl reset_temp_tile_data_buffers
ldr r0, _0811C358 @ =gUnknown_8457198 ldr r0, _0811C358 @ =gUnknown_8457198
bl sub_8003B24 bl InitWindows
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _0811C300 bne _0811C300
asm/link_rfu_4.s
+10 -10
View File
@@ -146,7 +146,7 @@ sub_8142504: @ 8142504
adds r1, r0, 0 adds r1, r0, 0
ldr r4, _08142558 @ =gUnknown_2021D18 ldr r4, _08142558 @ =gUnknown_2021D18
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
movs r1, 0x11 movs r1, 0x11
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
@@ -162,7 +162,7 @@ sub_8142504: @ 8142504
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_812E5A4 bl AddTextPrinterParametrized2
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0xF movs r2, 0xF
@@ -518,7 +518,7 @@ _081427C8:
b _081428E6 b _081428E6
_081427CA: _081427CA:
ldr r0, _081427D8 @ =gUnknown_2021D18 ldr r0, _081427D8 @ =gUnknown_2021D18
bl sub_8008FCC bl StringExpandPlaceholders
cmp r6, 0 cmp r6, 0
bne _081427E0 bne _081427E0
ldr r0, _081427DC @ =gUnknown_8466D90 ldr r0, _081427DC @ =gUnknown_8466D90
@@ -529,7 +529,7 @@ _081427DC: .4byte gUnknown_8466D90
_081427E0: _081427E0:
ldr r0, _08142828 @ =gUnknown_8466D98 ldr r0, _08142828 @ =gUnknown_8466D98
_081427E2: _081427E2:
bl sub_8003CE4 bl AddWindow
strh r0, [r4] strh r0, [r4]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x11 movs r1, 0x11
@@ -546,7 +546,7 @@ _081427E2:
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x2 movs r1, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
movs r2, 0xF movs r2, 0xF
@@ -606,7 +606,7 @@ _0814287E:
.align 2, 0 .align 2, 0
_08142888: .4byte 0xff00ffff _08142888: .4byte 0xff00ffff
_0814288C: _0814288C:
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r6, r0, 24 asrs r6, r0, 24
movs r1, 0x80 movs r1, 0x80
@@ -678,7 +678,7 @@ _08142914:
bne _0814292C bne _0814292C
ldr r0, _08142924 @ =gUnknown_2021D18 ldr r0, _08142924 @ =gUnknown_2021D18
ldr r1, _08142928 @ =gUnknown_841EA86 ldr r1, _08142928 @ =gUnknown_841EA86
bl sub_8008FCC bl StringExpandPlaceholders
b _08142934 b _08142934
.align 2, 0 .align 2, 0
_08142924: .4byte gUnknown_2021D18 _08142924: .4byte gUnknown_2021D18
@@ -686,10 +686,10 @@ _08142928: .4byte gUnknown_841EA86
_0814292C: _0814292C:
ldr r0, _08142984 @ =gUnknown_2021D18 ldr r0, _08142984 @ =gUnknown_2021D18
ldr r1, _08142988 @ =gUnknown_841EAB7 ldr r1, _08142988 @ =gUnknown_841EAB7
bl sub_8008FCC bl StringExpandPlaceholders
_08142934: _08142934:
ldr r0, _0814298C @ =gUnknown_8466DA0 ldr r0, _0814298C @ =gUnknown_8466DA0
bl sub_8003CE4 bl AddWindow
strh r0, [r5] strh r0, [r5]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -707,7 +707,7 @@ _08142934:
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x2 movs r1, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
movs r2, 0xF movs r2, 0xF
asm/list_menu.s
+11 -11
View File
@@ -41,7 +41,7 @@ DoMysteryGiftListMenu: @ 8106ED0
beq _08106FCC beq _08106FCC
_08106F06: _08106F06:
mov r0, r12 mov r0, r12
bl sub_8003CE4 bl AddWindow
strb r0, [r5, 0x5] strb r0, [r5, 0x5]
cmp r6, 0x1 cmp r6, 0x1
beq _08106F24 beq _08106F24
@@ -782,7 +782,7 @@ ListMenuPrint: @ 8107428
str r6, [sp, 0x10] str r6, [sp, 0x10]
adds r2, r7, 0 adds r2, r7, 0
mov r3, r12 mov r3, r12
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldrb r1, [r5, 0x3] ldrb r1, [r5, 0x3]
movs r0, 0x7F movs r0, 0x7F
ands r0, r1 ands r0, r1
@@ -820,7 +820,7 @@ _08107494:
str r6, [sp, 0x10] str r6, [sp, 0x10]
adds r2, r7, 0 adds r2, r7, 0
mov r3, r12 mov r3, r12
bl sub_812E5A4 bl AddTextPrinterParametrized2
_081074D2: _081074D2:
add sp, 0x18 add sp, 0x18
pop {r4-r7} pop {r4-r7}
@@ -989,7 +989,7 @@ _08107608:
ldrb r5, [r6, 0x1E] ldrb r5, [r6, 0x1E]
ldrb r0, [r6, 0x10] ldrb r0, [r6, 0x10]
movs r1, 0x1 movs r1, 0x1
bl sub_8004950 bl GetWindowAttribute
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 19 lsls r4, 19
ldr r0, _0810763C @ =0xffff0000 ldr r0, _0810763C @ =0xffff0000
@@ -997,7 +997,7 @@ _08107608:
lsrs r4, 16 lsrs r4, 16
ldrb r0, [r6, 0x10] ldrb r0, [r6, 0x10]
movs r1, 0x2 movs r1, 0x2
bl sub_8004950 bl GetWindowAttribute
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 3 lsls r2, 3
adds r2, r7 adds r2, r7
@@ -1023,7 +1023,7 @@ _08107650:
ldrb r5, [r6, 0x1E] ldrb r5, [r6, 0x1E]
ldrb r0, [r6, 0x10] ldrb r0, [r6, 0x10]
movs r1, 0x1 movs r1, 0x1
bl sub_8004950 bl GetWindowAttribute
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 3 lsls r4, 3
add r4, r8 add r4, r8
@@ -1031,7 +1031,7 @@ _08107650:
lsrs r4, 16 lsrs r4, 16
ldrb r0, [r6, 0x10] ldrb r0, [r6, 0x10]
movs r1, 0x2 movs r1, 0x2
bl sub_8004950 bl GetWindowAttribute
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 3 lsls r2, 3
adds r2, r7 adds r2, r7
@@ -1062,7 +1062,7 @@ ListMenuAddCursorObject: @ 810768C
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
ldrb r0, [r4, 0x10] ldrb r0, [r4, 0x10]
movs r1, 0x3 movs r1, 0x3
bl sub_8004950 bl GetWindowAttribute
mov r1, sp mov r1, sp
lsls r0, 3 lsls r0, 3
adds r0, 0x2 adds r0, 0x2
@@ -1379,13 +1379,13 @@ _0810789E:
lsrs r4, 16 lsrs r4, 16
ldrb r0, [r6, 0x10] ldrb r0, [r6, 0x10]
movs r1, 0x3 movs r1, 0x3
bl sub_8004950 bl GetWindowAttribute
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 19 lsls r5, 19
lsrs r5, 16 lsrs r5, 16
ldrb r0, [r6, 0x10] ldrb r0, [r6, 0x10]
movs r1, 0x4 movs r1, 0x4
bl sub_8004950 bl GetWindowAttribute
lsls r0, 3 lsls r0, 3
subs r0, r4 subs r0, r4
lsls r0, 16 lsls r0, 16
@@ -1429,7 +1429,7 @@ _08107930:
bl ListMenuPrintEntries bl ListMenuPrintEntries
ldrb r0, [r6, 0x10] ldrb r0, [r6, 0x10]
movs r1, 0x3 movs r1, 0x3
bl sub_8004950 bl GetWindowAttribute
lsls r0, 19 lsls r0, 19
lsrs r0, 16 lsrs r0, 16
ldrb r3, [r6, 0x10] ldrb r3, [r6, 0x10]
asm/load_save.s
+6 -6
View File
@@ -15,7 +15,7 @@ CheckForFlashMemory: @ 804BFE4
ldr r1, _0804BFFC @ =gUnknown_3005004 ldr r1, _0804BFFC @ =gUnknown_3005004
movs r0, 0x1 movs r0, 0x1
str r0, [r1] str r0, [r1]
bl sub_80007C8 bl InitFlashTimer
b _0804C006 b _0804C006
.align 2, 0 .align 2, 0
_0804BFFC: .4byte gUnknown_3005004 _0804BFFC: .4byte gUnknown_3005004
@@ -424,14 +424,14 @@ SaveSerializedGame: @ 804C300
bx r0 bx r0
thumb_func_end SaveSerializedGame thumb_func_end SaveSerializedGame
thumb_func_start sub_804C310 thumb_func_start LoadSerializedGame
sub_804C310: @ 804C310 LoadSerializedGame: @ 804C310
push {lr} push {lr}
bl sub_804C230 bl sub_804C230
bl sub_804C2B8 bl sub_804C2B8
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_804C310 thumb_func_end LoadSerializedGame
thumb_func_start copy_bags_and_unk_data_from_save_blocks thumb_func_start copy_bags_and_unk_data_from_save_blocks
copy_bags_and_unk_data_from_save_blocks: @ 804C320 copy_bags_and_unk_data_from_save_blocks: @ 804C320
@@ -711,7 +711,7 @@ _0804C4FE:
ldr r1, [r2] ldr r1, [r2]
str r1, [r0] str r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8099DE0 bl ApplyNewEncryptionKeyToBagItems
mov r6, r8 mov r6, r8
ldr r0, [r6] ldr r0, [r6]
adds r0, r5 adds r0, r5
@@ -787,7 +787,7 @@ _0804C5AE:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8054F38 bl sub_8054F38
adds r0, r5, 0 adds r0, r5, 0
bl sub_8099E38 bl ApplyNewEncryptionKeyToBagItems_
adds r0, r5, 0 adds r0, r5, 0
bl sub_815EE6C bl sub_815EE6C
ldr r4, _0804C5F8 @ =gUnknown_3005008 ldr r4, _0804C5F8 @ =gUnknown_3005008
asm/mail.s
+4 -4
View File
@@ -296,7 +296,7 @@ _080BEE70: .4byte gUnknown_20399C4
_080BEE74: .4byte 0x000010fc _080BEE74: .4byte 0x000010fc
_080BEE78: _080BEE78:
ldr r0, _080BEE84 @ =gUnknown_83EE9A4 ldr r0, _080BEE84 @ =gUnknown_83EE9A4
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
b _080BF0F4 b _080BF0F4
.align 2, 0 .align 2, 0
@@ -811,7 +811,7 @@ _080BF260:
str r0, [sp, 0x4] str r0, [sp, 0x4]
str r5, [sp, 0x8] str r5, [sp, 0x8]
movs r1, 0x1 movs r1, 0x1
bl sub_812E51C bl box_print
mov r1, r8 mov r1, r8
ldr r0, [r1] ldr r0, [r1]
adds r0, 0xF8 adds r0, 0xF8
@@ -856,7 +856,7 @@ _080BF2CE:
str r4, [sp, 0x8] str r4, [sp, 0x8]
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
bl sub_812E51C bl box_print
ldr r1, [r5] ldr r1, [r5]
adds r0, r1, 0 adds r0, r1, 0
adds r0, 0xE9 adds r0, 0xE9
@@ -875,7 +875,7 @@ _080BF2CE:
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
bl sub_812E51C bl box_print
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
asm/mail_data.s
+5 -5
View File
@@ -89,7 +89,7 @@ MonHasMail: @ 8097D08
bl GetMonData bl GetMonData
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08097D30 beq _08097D30
@@ -346,7 +346,7 @@ sub_8097F00: @ 8097F00
cmp r0, 0xC9 cmp r0, 0xC9
bne _08097F18 bne _08097F18
adds r0, r1, 0 adds r0, r1, 0
bl sub_8096F98 bl mon_icon_personality_to_unown_id
lsls r0, 16 lsls r0, 16
ldr r1, _08097F1C @ =0x75300000 ldr r1, _08097F1C @ =0x75300000
adds r0, r1 adds r0, r1
@@ -605,8 +605,8 @@ _080980E8:
bx r1 bx r1
thumb_func_end sub_809803C thumb_func_end sub_809803C
thumb_func_start sub_80980F8 thumb_func_start itemid_is_mail
sub_80980F8: @ 80980F8 itemid_is_mail: @ 80980F8
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -621,6 +621,6 @@ _0809810A:
_0809810C: _0809810C:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80980F8 thumb_func_end itemid_is_mail
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/mailbox_pc.s
+2 -2
View File
@@ -56,7 +56,7 @@ sub_810EBAC: @ 810EBAC
lsls r0, r1, 3 lsls r0, r1, 3
ldr r1, _0810EBDC @ =gUnknown_8453FE8 ldr r1, _0810EBDC @ =gUnknown_8453FE8
adds r0, r1 adds r0, r1
bl sub_8003CE4 bl AddWindow
strb r0, [r4] strb r0, [r4]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
@@ -154,7 +154,7 @@ _0810EC62:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x8 movs r2, 0x8
adds r3, r5, 0 adds r3, r5, 0
bl sub_812E5A4 bl AddTextPrinterParametrized2
_0810EC82: _0810EC82:
add sp, 0x34 add sp, 0x34
pop {r4,r5} pop {r4,r5}
asm/main.s
+6 -6
View File
@@ -525,8 +525,8 @@ _080007C0: .4byte gUnknown_3003578
_080007C4: .4byte INTR_CHECK _080007C4: .4byte INTR_CHECK
thumb_func_end sub_8000724 thumb_func_end sub_8000724
thumb_func_start sub_80007C8 thumb_func_start InitFlashTimer
sub_80007C8: @ 80007C8 InitFlashTimer: @ 80007C8
push {lr} push {lr}
ldr r0, _080007D8 @ =gUnknown_81E9F60 ldr r0, _080007D8 @ =gUnknown_81E9F60
ldr r1, [r0] ldr r1, [r0]
@@ -536,10 +536,10 @@ sub_80007C8: @ 80007C8
bx r0 bx r0
.align 2, 0 .align 2, 0
_080007D8: .4byte gUnknown_81E9F60 _080007D8: .4byte gUnknown_81E9F60
thumb_func_end sub_80007C8 thumb_func_end InitFlashTimer
thumb_func_start sub_80007DC thumb_func_start HBlankIntr
sub_80007DC: @ 80007DC HBlankIntr: @ 80007DC
push {r4,lr} push {r4,lr}
ldr r4, _08000804 @ =gUnknown_30030F0 ldr r4, _08000804 @ =gUnknown_30030F0
ldr r0, [r4, 0x10] ldr r0, [r4, 0x10]
@@ -562,7 +562,7 @@ _080007EA:
.align 2, 0 .align 2, 0
_08000804: .4byte gUnknown_30030F0 _08000804: .4byte gUnknown_30030F0
_08000808: .4byte INTR_CHECK _08000808: .4byte INTR_CHECK
thumb_func_end sub_80007DC thumb_func_end HBlankIntr
thumb_func_start sub_800080C thumb_func_start sub_800080C
sub_800080C: @ 800080C sub_800080C: @ 800080C
asm/main_menu.s
+19 -19
View File
@@ -149,7 +149,7 @@ sub_800C318: @ 800C318
movs r2, 0 movs r2, 0
bl ChangeBgY bl ChangeBgY
ldr r0, _0800C4B8 @ =gUnknown_8234618 ldr r0, _0800C4B8 @ =gUnknown_8234618
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
ldr r0, _0800C4BC @ =gUnknown_8234648 ldr r0, _0800C4BC @ =gUnknown_8234648
movs r1, 0 movs r1, 0
@@ -438,7 +438,7 @@ sub_800C688: @ 800C688
bne _0800C6F8 bne _0800C6F8
bl sub_8002DE8 bl sub_8002DE8
movs r0, 0x4 movs r0, 0x4
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _0800C6F8 bne _0800C6F8
@@ -639,7 +639,7 @@ _0800C828:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E51C bl box_print
ldr r0, _0800C86C @ =gUnknown_8234618 ldr r0, _0800C86C @ =gUnknown_8234618
bl sub_800D0B4 bl sub_800D0B4
movs r0, 0 movs r0, 0
@@ -670,7 +670,7 @@ _0800C870:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E51C bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, _0800C8E8 @ =gUnknown_8415A6E ldr r0, _0800C8E8 @ =gUnknown_8415A6E
@@ -679,7 +679,7 @@ _0800C870:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E51C bl box_print
bl sub_800CE58 bl sub_800CE58
ldr r4, _0800C8EC @ =gUnknown_8234620 ldr r4, _0800C8EC @ =gUnknown_8234620
adds r0, r4, 0 adds r0, r4, 0
@@ -725,7 +725,7 @@ _0800C8F0:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E51C bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, _0800C9B8 @ =gUnknown_8415A6E ldr r0, _0800C9B8 @ =gUnknown_8415A6E
@@ -734,7 +734,7 @@ _0800C8F0:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E51C bl box_print
movs r0, 0x1 movs r0, 0x1
strh r0, [r6, 0x1C] strh r0, [r6, 0x1C]
str r5, [sp] str r5, [sp]
@@ -745,7 +745,7 @@ _0800C8F0:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E51C bl box_print
bl sub_800CE58 bl sub_800CE58
ldr r4, _0800C9C0 @ =gUnknown_8234620 ldr r4, _0800C9C0 @ =gUnknown_8234620
adds r0, r4, 0 adds r0, r4, 0
@@ -1094,7 +1094,7 @@ _0800CC18: .4byte gUnknown_2037AB8
_0800CC1C: _0800CC1C:
bl sub_8002DE8 bl sub_8002DE8
movs r0, 0x4 movs r0, 0x4
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
_0800CC28: _0800CC28:
cmp r0, 0 cmp r0, 0
@@ -1355,7 +1355,7 @@ sub_800CDF8: @ 800CDF8
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_812E51C bl box_print
movs r0, 0x4 movs r0, 0x4
bl PutWindowTilemap bl PutWindowTilemap
movs r0, 0x4 movs r0, 0x4
@@ -1404,7 +1404,7 @@ sub_800CE70: @ 800CE70
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x12 movs r3, 0x12
bl sub_812E51C bl box_print
add r1, sp, 0xC add r1, sp, 0xC
movs r2, 0 movs r2, 0
ldr r0, _0800CED0 @ =gUnknown_300500C ldr r0, _0800CED0 @ =gUnknown_300500C
@@ -1430,7 +1430,7 @@ _0800CE96:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x3E movs r2, 0x3E
movs r3, 0x12 movs r3, 0x12
bl sub_812E51C bl box_print
add sp, 0x14 add sp, 0x14
pop {r0} pop {r0}
bx r0 bx r0
@@ -1455,7 +1455,7 @@ sub_800CED4: @ 800CED4
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x22 movs r3, 0x22
bl sub_812E51C bl box_print
ldr r4, _0800CF38 @ =gUnknown_300500C ldr r4, _0800CF38 @ =gUnknown_300500C
ldr r0, [r4] ldr r0, [r4]
ldrh r1, [r0, 0xE] ldrh r1, [r0, 0xE]
@@ -1479,7 +1479,7 @@ sub_800CED4: @ 800CED4
movs r1, 0x2 movs r1, 0x2
movs r2, 0x3E movs r2, 0x3E
movs r3, 0x22 movs r3, 0x22
bl sub_812E51C bl box_print
add sp, 0x2C add sp, 0x2C
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -1504,7 +1504,7 @@ sub_800CF3C: @ 800CF3C
cmp r0, 0 cmp r0, 0
beq _0800CF64 beq _0800CF64
movs r0, 0x1 movs r0, 0x1
bl sub_8088E8C bl pokedex_count
b _0800CF6A b _0800CF6A
.align 2, 0 .align 2, 0
_0800CF60: .4byte 0x00000829 _0800CF60: .4byte 0x00000829
@@ -1525,7 +1525,7 @@ _0800CF6A:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x32 movs r3, 0x32
bl sub_812E51C bl box_print
add r0, sp, 0xC add r0, sp, 0xC
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0 movs r2, 0
@@ -1541,7 +1541,7 @@ _0800CF6A:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x3E movs r2, 0x3E
movs r3, 0x32 movs r3, 0x32
bl sub_812E51C bl box_print
_0800CFAE: _0800CFAE:
add sp, 0x2C add sp, 0x2C
pop {r4-r6} pop {r4-r6}
@@ -1586,7 +1586,7 @@ _0800CFE2:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x42 movs r3, 0x42
bl sub_812E51C bl box_print
add r0, sp, 0xC add r0, sp, 0xC
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0x2 movs r2, 0x2
@@ -1602,7 +1602,7 @@ _0800CFE2:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x3E movs r2, 0x3E
movs r3, 0x42 movs r3, 0x42
bl sub_812E51C bl box_print
add sp, 0x2C add sp, 0x2C
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
asm/malloc.s
+9 -9
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_800292C thumb_func_start PutMemBlockHeader
sub_800292C: @ 800292C PutMemBlockHeader: @ 800292C
push {r4,lr} push {r4,lr}
movs r4, 0 movs r4, 0
strh r4, [r0] strh r4, [r0]
@@ -20,19 +20,19 @@ sub_800292C: @ 800292C
bx r0 bx r0
.align 2, 0 .align 2, 0
_08002944: .4byte 0x0000a3a3 _08002944: .4byte 0x0000a3a3
thumb_func_end sub_800292C thumb_func_end PutMemBlockHeader
thumb_func_start sub_8002948 thumb_func_start PutFirstMemBlockHeader
sub_8002948: @ 8002948 PutFirstMemBlockHeader: @ 8002948
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r3, r1, 0 adds r3, r1, 0
subs r3, 0x10 subs r3, 0x10
adds r1, r2, 0 adds r1, r2, 0
bl sub_800292C bl PutMemBlockHeader
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8002948 thumb_func_end PutFirstMemBlockHeader
thumb_func_start sub_800295C thumb_func_start sub_800295C
sub_800295C: @ 800295C sub_800295C: @ 800295C
@@ -84,7 +84,7 @@ _080029A4:
str r5, [r4, 0x4] str r5, [r4, 0x4]
ldr r2, [r4, 0xC] ldr r2, [r4, 0xC]
adds r1, r4, 0 adds r1, r4, 0
bl sub_800292C bl PutMemBlockHeader
ldr r0, [r6] ldr r0, [r6]
ldr r1, [r7] ldr r1, [r7]
str r1, [r0, 0xC] str r1, [r0, 0xC]
@@ -331,7 +331,7 @@ InitHeap: @ 8002B80
str r0, [r2] str r0, [r2]
ldr r2, _08002B98 @ =gUnknown_3000A3C ldr r2, _08002B98 @ =gUnknown_3000A3C
str r1, [r2] str r1, [r2]
bl sub_8002948 bl PutFirstMemBlockHeader
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
asm/map_name_popup.s
+1 -1
View File
@@ -332,7 +332,7 @@ _08098384:
movs r6, 0x2D movs r6, 0x2D
_08098396: _08098396:
mov r0, sp mov r0, sp
bl sub_8003CE4 bl AddWindow
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
cmp r4, 0 cmp r4, 0
asm/map_preview_screen.s
+2 -2
View File
@@ -297,7 +297,7 @@ sub_80F8318: @ 80F8318
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, _080F83A8 @ =gUnknown_843EBA8 ldr r0, _080F83A8 @ =gUnknown_843EBA8
bl sub_8003CE4 bl AddWindow
mov r8, r0 mov r8, r0
mov r0, r8 mov r0, r8
lsls r0, 16 lsls r0, 16
@@ -345,7 +345,7 @@ sub_80F8318: @ 80F8318
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x2 movs r1, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E5A4 bl AddTextPrinterParametrized2
mov r0, r8 mov r0, r8
add sp, 0x14 add sp, 0x14
pop {r3,r4} pop {r3,r4}
asm/menu.s
+11 -11
View File
@@ -53,7 +53,7 @@ sub_810EE0C: @ 810EE0C
ldr r5, _0810EE54 @ =gUnknown_203ADF2 ldr r5, _0810EE54 @ =gUnknown_203ADF2
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x5 movs r1, 0x5
bl sub_8004950 bl GetWindowAttribute
strb r0, [r5] strb r0, [r5]
ldr r1, _0810EE58 @ =sub_810EE5C ldr r1, _0810EE58 @ =sub_810EE5C
adds r0, r6, 0 adds r0, r6, 0
@@ -675,7 +675,7 @@ sub_810F330: @ 810F330
ldr r5, _0810F378 @ =gUnknown_203ADF2 ldr r5, _0810F378 @ =gUnknown_203ADF2
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x5 movs r1, 0x5
bl sub_8004950 bl GetWindowAttribute
strb r0, [r5] strb r0, [r5]
ldr r1, _0810F37C @ =DrawWindowBorder ldr r1, _0810F37C @ =DrawWindowBorder
adds r0, r6, 0 adds r0, r6, 0
@@ -978,7 +978,7 @@ _0810F592:
strh r4, [r1, 0x6] strh r4, [r1, 0x6]
ldr r4, _0810F5BC @ =gUnknown_203ADF4 ldr r4, _0810F5BC @ =gUnknown_203ADF4
mov r0, sp mov r0, sp
bl sub_8003CE4 bl AddWindow
strb r0, [r4] strb r0, [r4]
cmp r5, 0xF cmp r5, 0xF
bls _0810F5C0 bls _0810F5C0
@@ -1041,7 +1041,7 @@ sub_810F5E8: @ 810F5E8
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0 movs r1, 0
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
cmp r6, 0 cmp r6, 0
beq _0810F63E beq _0810F63E
ldrb r0, [r4] ldrb r0, [r4]
@@ -1118,7 +1118,7 @@ _0810F684:
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0 movs r1, 0
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
_0810F6CE: _0810F6CE:
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0 movs r1, 0
@@ -1132,7 +1132,7 @@ _0810F6CE:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x4 movs r2, 0x4
movs r3, 0x1 movs r3, 0x1
bl sub_812E5A4 bl AddTextPrinterParametrized2
cmp r7, 0 cmp r7, 0
beq _0810F6F6 beq _0810F6F6
ldrb r0, [r6] ldrb r0, [r6]
@@ -2263,7 +2263,7 @@ sub_810FF04: @ 810FF04
str r0, [sp, 0x18] str r0, [sp, 0x18]
str r1, [sp, 0x1C] str r1, [sp, 0x1C]
add r0, sp, 0x18 add r0, sp, 0x18
bl sub_8003CE4 bl AddWindow
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
add sp, 0x20 add sp, 0x20
@@ -2306,7 +2306,7 @@ sub_810FF60: @ 810FF60
lsrs r1, 24 lsrs r1, 24
mov r10, r1 mov r10, r1
ldr r7, _0811009C @ =gUnknown_203ADF3 ldr r7, _0811009C @ =gUnknown_203ADF3
bl sub_8003CE4 bl AddWindow
strb r0, [r7] strb r0, [r7]
ldrb r0, [r7] ldrb r0, [r7]
movs r1, 0x1 movs r1, 0x1
@@ -2445,8 +2445,8 @@ sub_81100A4: @ 81100A4
bx r0 bx r0
thumb_func_end sub_81100A4 thumb_func_end sub_81100A4
thumb_func_start sub_81100C8 thumb_func_start ProcessMenuInputNoWrap_
sub_81100C8: @ 81100C8 ProcessMenuInputNoWrap_: @ 81100C8
push {r4,lr} push {r4,lr}
bl ProcessMenuInputNoWrapAround bl ProcessMenuInputNoWrapAround
lsls r0, 24 lsls r0, 24
@@ -2461,7 +2461,7 @@ _081100DE:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_81100C8 thumb_func_end ProcessMenuInputNoWrap_
thumb_func_start sub_81100E8 thumb_func_start sub_81100E8
sub_81100E8: @ 81100E8 sub_81100E8: @ 81100E8
asm/menu2.s
+7 -7
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_812E51C thumb_func_start box_print
sub_812E51C: @ 812E51C box_print: @ 812E51C
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x10 sub sp, 0x10
adds r4, r1, 0 adds r4, r1, 0
@@ -72,10 +72,10 @@ sub_812E51C: @ 812E51C
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_812E51C thumb_func_end box_print
thumb_func_start sub_812E5A4 thumb_func_start AddTextPrinterParametrized2
sub_812E5A4: @ 812E5A4 AddTextPrinterParametrized2: @ 812E5A4
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
@@ -143,7 +143,7 @@ sub_812E5A4: @ 812E5A4
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_812E5A4 thumb_func_end AddTextPrinterParametrized2
thumb_func_start sub_812E62C thumb_func_start sub_812E62C
sub_812E62C: @ 812E62C sub_812E62C: @ 812E62C
@@ -260,7 +260,7 @@ _0812E700:
bne _0812E700 bne _0812E700
_0812E70A: _0812E70A:
adds r0, r7, 0 adds r0, r7, 0
bl sub_8008FCC bl StringExpandPlaceholders
cmp r4, 0x5 cmp r4, 0x5
beq _0812E73C beq _0812E73C
lsls r3, r5, 24 lsls r3, r5, 24
asm/menu_helpers.s
+4 -4
View File
@@ -38,7 +38,7 @@ DisplayMessageAndContinueTask: @ 80BF474
beq _080BF4B8 beq _080BF4B8
adds r0, r4, 0 adds r0, r4, 0
ldr r1, [sp, 0x30] ldr r1, [sp, 0x30]
bl sub_8008FCC bl StringExpandPlaceholders
_080BF4B8: _080BF4B8:
ldr r2, _080BF508 @ =gUnknown_3003E50 ldr r2, _080BF508 @ =gUnknown_3003E50
ldrb r0, [r2] ldrb r0, [r2]
@@ -92,7 +92,7 @@ sub_80BF518: @ 80BF518
lsrs r4, 24 lsrs r4, 24
bl sub_8002DE8 bl sub_8002DE8
adds r0, r4, 0 adds r0, r4, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
pop {r4} pop {r4}
@@ -129,7 +129,7 @@ sub_80BF560: @ 80BF560
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -342,7 +342,7 @@ itemid_80BF6D8_mail_related: @ 80BF6D8
bne _080BF700 bne _080BF700
_080BF6EE: _080BF6EE:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
asm/metatile_behavior.s
+33 -33
View File
@@ -163,8 +163,8 @@ _08059BB0:
bx r1 bx r1
thumb_func_end sub_8059B90 thumb_func_end sub_8059B90
thumb_func_start sub_8059BB4 thumb_func_start MetatileBehavior_IsIce
sub_8059BB4: @ 8059BB4 MetatileBehavior_IsIce: @ 8059BB4
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -177,10 +177,10 @@ _08059BC2:
_08059BC4: _08059BC4:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8059BB4 thumb_func_end MetatileBehavior_IsIce
thumb_func_start sub_8059BC8 thumb_func_start MetatileBehavior_IsWarpDoor
sub_8059BC8: @ 8059BC8 MetatileBehavior_IsWarpDoor: @ 8059BC8
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -193,7 +193,7 @@ _08059BD6:
_08059BD8: _08059BD8:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8059BC8 thumb_func_end MetatileBehavior_IsWarpDoor
thumb_func_start sub_8059BDC thumb_func_start sub_8059BDC
sub_8059BDC: @ 8059BDC sub_8059BDC: @ 8059BDC
@@ -385,8 +385,8 @@ _08059CD8:
bx r1 bx r1
thumb_func_end sub_8059CC8 thumb_func_end sub_8059CC8
thumb_func_start sub_8059CDC thumb_func_start MetatileBehavior_IsEastArrowWarp
sub_8059CDC: @ 8059CDC MetatileBehavior_IsEastArrowWarp: @ 8059CDC
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -399,10 +399,10 @@ _08059CEA:
_08059CEC: _08059CEC:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8059CDC thumb_func_end MetatileBehavior_IsEastArrowWarp
thumb_func_start sub_8059CF0 thumb_func_start MetatileBehavior_IsWestArrowWarp
sub_8059CF0: @ 8059CF0 MetatileBehavior_IsWestArrowWarp: @ 8059CF0
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -415,7 +415,7 @@ _08059CFE:
_08059D00: _08059D00:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8059CF0 thumb_func_end MetatileBehavior_IsWestArrowWarp
thumb_func_start sub_8059D04 thumb_func_start sub_8059D04
sub_8059D04: @ 8059D04 sub_8059D04: @ 8059D04
@@ -456,12 +456,12 @@ sub_8059D2C: @ 8059D2C
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r5, 0 movs r5, 0
adds r0, r4, 0 adds r0, r4, 0
bl sub_8059CDC bl MetatileBehavior_IsEastArrowWarp
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08059D64 bne _08059D64
adds r0, r4, 0 adds r0, r4, 0
bl sub_8059CF0 bl MetatileBehavior_IsWestArrowWarp
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08059D64 bne _08059D64
@@ -914,8 +914,8 @@ _08059F84:
bx r1 bx r1
thumb_func_end sub_8059F74 thumb_func_end sub_8059F74
thumb_func_start sub_8059F88 thumb_func_start MetatileBehavior_IsMB_0B
sub_8059F88: @ 8059F88 MetatileBehavior_IsMB_0B: @ 8059F88
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -928,10 +928,10 @@ _08059F96:
_08059F98: _08059F98:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8059F88 thumb_func_end MetatileBehavior_IsMB_0B
thumb_func_start sub_8059F9C thumb_func_start MetatileBehavior_IsMountain
sub_8059F9C: @ 8059F9C MetatileBehavior_IsMountain: @ 8059F9C
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -944,7 +944,7 @@ _08059FAA:
_08059FAC: _08059FAC:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8059F9C thumb_func_end MetatileBehavior_IsMountain
thumb_func_start sub_8059FB0 thumb_func_start sub_8059FB0
sub_8059FB0: @ 8059FB0 sub_8059FB0: @ 8059FB0
@@ -1079,7 +1079,7 @@ MetatileBehavior_IsSurfableAndNotWaterfall: @ 805A050
cmp r0, 0 cmp r0, 0
beq _0805A072 beq _0805A072
adds r0, r4, 0 adds r0, r4, 0
bl sub_805A104 bl MetatileBehavior_IsWaterfall
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0805A072 bne _0805A072
@@ -1183,8 +1183,8 @@ sub_805A0EC: @ 805A0EC
bx lr bx lr
thumb_func_end sub_805A0EC thumb_func_end sub_805A0EC
thumb_func_start sub_805A0F0 thumb_func_start MetatileBehavior_IsHotSprings
sub_805A0F0: @ 805A0F0 MetatileBehavior_IsHotSprings: @ 805A0F0
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1197,10 +1197,10 @@ _0805A0FE:
_0805A100: _0805A100:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_805A0F0 thumb_func_end MetatileBehavior_IsHotSprings
thumb_func_start sub_805A104 thumb_func_start MetatileBehavior_IsWaterfall
sub_805A104: @ 805A104 MetatileBehavior_IsWaterfall: @ 805A104
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1213,7 +1213,7 @@ _0805A112:
_0805A114: _0805A114:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_805A104 thumb_func_end MetatileBehavior_IsWaterfall
thumb_func_start sub_805A118 thumb_func_start sub_805A118
sub_805A118: @ 805A118 sub_805A118: @ 805A118
@@ -1303,8 +1303,8 @@ sub_805A158: @ 805A158
bx lr bx lr
thumb_func_end sub_805A158 thumb_func_end sub_805A158
thumb_func_start sub_805A15C thumb_func_start MetatileBehavior_IsLavaridge1FWarp
sub_805A15C: @ 805A15C MetatileBehavior_IsLavaridge1FWarp: @ 805A15C
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1317,10 +1317,10 @@ _0805A16A:
_0805A16C: _0805A16C:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_805A15C thumb_func_end MetatileBehavior_IsLavaridge1FWarp
thumb_func_start sub_805A170 thumb_func_start MetatileBehavior_IsAquaHideoutWarp
sub_805A170: @ 805A170 MetatileBehavior_IsAquaHideoutWarp: @ 805A170
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1333,7 +1333,7 @@ _0805A17E:
_0805A180: _0805A180:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_805A170 thumb_func_end MetatileBehavior_IsAquaHideoutWarp
thumb_func_start sub_805A184 thumb_func_start sub_805A184
sub_805A184: @ 805A184 sub_805A184: @ 805A184
asm/mevent_8145654.s
+15 -15
View File
@@ -214,7 +214,7 @@ _08145790:
bl decompress_and_copy_tile_data_to_vram bl decompress_and_copy_tile_data_to_vram
ldr r4, _08145830 @ =gUnknown_8467074 ldr r4, _08145830 @ =gUnknown_8467074
adds r0, r4, 0 adds r0, r4, 0
bl sub_8003CE4 bl AddWindow
ldr r1, [r5] ldr r1, [r5]
movs r2, 0xBB movs r2, 0xBB
lsls r2, 1 lsls r2, 1
@@ -222,7 +222,7 @@ _08145790:
strh r0, [r1] strh r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x8 adds r0, 0x8
bl sub_8003CE4 bl AddWindow
ldr r1, [r5] ldr r1, [r5]
movs r2, 0xBC movs r2, 0xBC
lsls r2, 1 lsls r2, 1
@@ -230,7 +230,7 @@ _08145790:
strh r0, [r1] strh r0, [r1]
adds r4, 0x10 adds r4, 0x10
adds r0, r4, 0 adds r0, r4, 0
bl sub_8003CE4 bl AddWindow
ldr r1, [r5] ldr r1, [r5]
movs r2, 0xBD movs r2, 0xBD
lsls r2, 1 lsls r2, 1
@@ -920,7 +920,7 @@ _08145D70:
movs r1, 0x3 movs r1, 0x3
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
ldr r4, [r7] ldr r4, [r7]
movs r1, 0xDA movs r1, 0xDA
lsls r1, 1 lsls r1, 1
@@ -961,7 +961,7 @@ _08145DCE:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x3 movs r1, 0x3
movs r3, 0x11 movs r3, 0x11
bl sub_812E51C bl box_print
ldr r2, [r7] ldr r2, [r7]
ldr r0, [r2, 0x4] ldr r0, [r2, 0x4]
mov r9, r6 mov r9, r6
@@ -988,7 +988,7 @@ _08145E06:
movs r1, 0x2 movs r1, 0x2
movs r2, 0xA6 movs r2, 0xA6
movs r3, 0x11 movs r3, 0x11
bl sub_812E51C bl box_print
b _08146038 b _08146038
.align 2, 0 .align 2, 0
_08145E34: .4byte gUnknown_8467068 _08145E34: .4byte gUnknown_8467068
@@ -1032,7 +1032,7 @@ _08145E42:
lsrs r0, r2, 24 lsrs r0, r2, 24
movs r1, 0x3 movs r1, 0x3
movs r2, 0 movs r2, 0
bl sub_812E51C bl box_print
adds r4, 0x1 adds r4, 0x1
lsls r4, 24 lsls r4, 24
lsrs r0, r4, 24 lsrs r0, r4, 24
@@ -1074,7 +1074,7 @@ _08145EA4:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x3 movs r1, 0x3
movs r2, 0 movs r2, 0
bl sub_812E51C bl box_print
ldr r2, [r7] ldr r2, [r7]
ldrb r1, [r2, 0x8] ldrb r1, [r2, 0x8]
movs r0, 0x3 movs r0, 0x3
@@ -1107,7 +1107,7 @@ _08145EA4:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x3 movs r1, 0x3
movs r2, 0 movs r2, 0
bl sub_812E51C bl box_print
mov r9, r6 mov r9, r6
b _08146038 b _08146038
.align 2, 0 .align 2, 0
@@ -1175,7 +1175,7 @@ _08145F6E:
ldr r0, [sp, 0x10] ldr r0, [sp, 0x10]
movs r1, 0x3 movs r1, 0x3
ldr r3, [sp, 0x14] ldr r3, [sp, 0x14]
bl sub_812E51C bl box_print
ldr r1, [r7] ldr r1, [r7]
adds r0, r1, r5 adds r0, r1, r5
ldr r2, _0814605C @ =0x00000306 ldr r2, _0814605C @ =0x00000306
@@ -1213,7 +1213,7 @@ _08145F6E:
ldr r0, [sp, 0x10] ldr r0, [sp, 0x10]
movs r1, 0x2 movs r1, 0x2
ldr r3, [sp, 0x14] ldr r3, [sp, 0x14]
bl sub_812E51C bl box_print
ldr r1, [r7] ldr r1, [r7]
adds r1, r4 adds r1, r4
adds r1, 0x2A adds r1, 0x2A
@@ -1754,7 +1754,7 @@ _081463EC:
bl decompress_and_copy_tile_data_to_vram bl decompress_and_copy_tile_data_to_vram
ldr r4, _08146490 @ =gUnknown_8468040 ldr r4, _08146490 @ =gUnknown_8468040
adds r0, r4, 0 adds r0, r4, 0
bl sub_8003CE4 bl AddWindow
ldr r1, [r5] ldr r1, [r5]
movs r2, 0xE4 movs r2, 0xE4
lsls r2, 1 lsls r2, 1
@@ -1762,7 +1762,7 @@ _081463EC:
strh r0, [r1] strh r0, [r1]
adds r4, 0x8 adds r4, 0x8
adds r0, r4, 0 adds r0, r4, 0
bl sub_8003CE4 bl AddWindow
ldr r1, [r5] ldr r1, [r5]
movs r3, 0xE5 movs r3, 0xE5
lsls r3, 1 lsls r3, 1
@@ -2549,7 +2549,7 @@ _08146AA0:
str r4, [sp, 0x8] str r4, [sp, 0x8]
movs r1, 0x3 movs r1, 0x3
movs r3, 0x6 movs r3, 0x6
bl sub_812E51C bl box_print
_08146AD0: _08146AD0:
ldr r6, _08146B4C @ =gUnknown_203F3CC ldr r6, _08146B4C @ =gUnknown_203F3CC
ldr r4, [r6] ldr r4, [r6]
@@ -2584,7 +2584,7 @@ _08146AD0:
str r4, [sp, 0x8] str r4, [sp, 0x8]
movs r1, 0x3 movs r1, 0x3
movs r2, 0 movs r2, 0
bl sub_812E51C bl box_print
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
asm/mevent_server.s
+1 -1
View File
@@ -695,7 +695,7 @@ _08144D3C:
b _08144E5A b _08144E5A
_08144D4E: _08144D4E:
ldrb r0, [r2, 0x4] ldrb r0, [r2, 0x4]
bl sub_8054EC4 bl GetGameStat
adds r2, r0, 0 adds r2, r0, 0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x12 movs r1, 0x12
asm/money.s
+3 -3
View File
@@ -175,7 +175,7 @@ _0809FE72:
_0809FE7E: _0809FE7E:
ldr r1, _0809FEC0 @ =gUnknown_841697A ldr r1, _0809FEC0 @ =gUnknown_841697A
adds r0, r2, 0 adds r0, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r4, _0809FEBC @ =gUnknown_2021D18 ldr r4, _0809FEBC @ =gUnknown_2021D18
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -248,7 +248,7 @@ _0809FF08:
_0809FF14: _0809FF14:
ldr r1, _0809FF44 @ =gUnknown_841697A ldr r1, _0809FF44 @ =gUnknown_841697A
adds r0, r2, 0 adds r0, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r2, _0809FF40 @ =gUnknown_2021D18 ldr r2, _0809FF40 @ =gUnknown_2021D18
str r6, [sp] str r6, [sp]
str r5, [sp, 0x4] str r5, [sp, 0x4]
@@ -361,7 +361,7 @@ sub_809FFB8: @ 809FFB8
str r1, [sp, 0x1C] str r1, [sp, 0x1C]
ldr r4, _080A002C @ =gUnknown_2039990 ldr r4, _080A002C @ =gUnknown_2039990
add r0, sp, 0x18 add r0, sp, 0x18
bl sub_8003CE4 bl AddWindow
strb r0, [r4] strb r0, [r4]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
asm/mystery_event_script.s
+15 -15
View File
@@ -40,7 +40,7 @@ sub_80DA830: @ 80DA830
push {lr} push {lr}
ldr r0, _080DA844 @ =gUnknown_2021D18 ldr r0, _080DA844 @ =gUnknown_2021D18
ldr r1, _080DA848 @ =gUnknown_8488DFD ldr r1, _080DA848 @ =gUnknown_8488DFD
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x3 movs r0, 0x3
bl sub_80DA8E8 bl sub_80DA8E8
pop {r0} pop {r0}
@@ -57,10 +57,10 @@ sub_80DA84C: @ 80DA84C
adds r5, r1, 0 adds r5, r1, 0
ldr r1, _080DA874 @ =gUnknown_81DBCF0 ldr r1, _080DA874 @ =gUnknown_81DBCF0
ldr r2, _080DA878 @ =0x081dbd34 ldr r2, _080DA878 @ =0x081dbd34
bl sub_80697AC bl InitScriptContext
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80697E8 bl SetupBytecodeScript
str r5, [r4, 0x64] str r5, [r4, 0x64]
movs r0, 0 movs r0, 0
str r0, [r4, 0x68] str r0, [r4, 0x68]
@@ -151,7 +151,7 @@ _080DA8F0: .4byte gUnknown_203AA3C
thumb_func_start script_status_stop_and_ret_1 thumb_func_start script_status_stop_and_ret_1
script_status_stop_and_ret_1: @ 80DA8F4 script_status_stop_and_ret_1: @ 80DA8F4
push {lr} push {lr}
bl sub_80697FC bl StopScript
movs r0, 0x1 movs r0, 0x1
pop {r1} pop {r1}
bx r1 bx r1
@@ -234,7 +234,7 @@ sub_80DA964: @ 80DA964
bne _080DA98E bne _080DA98E
_080DA988: _080DA988:
ldr r0, _080DA998 @ =gUnknown_2021D18 ldr r0, _080DA998 @ =gUnknown_2021D18
bl sub_8008FCC bl StringExpandPlaceholders
_080DA98E: _080DA98E:
movs r0, 0 movs r0, 0
pop {r4,r5} pop {r4,r5}
@@ -267,7 +267,7 @@ sub_80DA9B8: @ 80DA9B8
mov r6, r8 mov r6, r8
push {r6,r7} push {r6,r7}
adds r7, r0, 0 adds r7, r0, 0
bl sub_809C854 bl IsEnigmaBerryValid
mov r8, r0 mov r8, r0
adds r0, r7, 0 adds r0, r7, 0
bl ScriptReadWord bl ScriptReadWord
@@ -321,10 +321,10 @@ _080DAA40:
ldr r0, _080DAA60 @ =gUnknown_2021D18 ldr r0, _080DAA60 @ =gUnknown_2021D18
ldr r1, _080DAA64 @ =gUnknown_8488CCE ldr r1, _080DAA64 @ =gUnknown_8488CCE
_080DAA44: _080DAA44:
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r7, 0x6C] str r0, [r7, 0x6C]
bl sub_809C854 bl IsEnigmaBerryValid
cmp r0, 0x1 cmp r0, 0x1
bne _080DAA6C bne _080DAA6C
ldr r0, _080DAA68 @ =0x00004033 ldr r0, _080DAA68 @ =0x00004033
@@ -362,7 +362,7 @@ sub_80DAA80: @ 80DAA80
bl GiveGiftRibbonToParty bl GiveGiftRibbonToParty
ldr r0, _080DAAAC @ =gUnknown_2021D18 ldr r0, _080DAAAC @ =gUnknown_2021D18
ldr r1, _080DAAB0 @ =gUnknown_8488CF6 ldr r1, _080DAAB0 @ =gUnknown_8488CF6
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
movs r0, 0 movs r0, 0
@@ -433,7 +433,7 @@ sub_80DAB1C: @ 80DAB1C
bl sub_806E22C bl sub_806E22C
ldr r0, _080DAB38 @ =gUnknown_2021D18 ldr r0, _080DAB38 @ =gUnknown_2021D18
ldr r1, _080DAB3C @ =gUnknown_8488D2A ldr r1, _080DAB3C @ =gUnknown_8488D2A
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
movs r0, 0 movs r0, 0
@@ -456,7 +456,7 @@ sub_80DAB40: @ 80DAB40
bl sub_80BDB70 bl sub_80BDB70
ldr r0, _080DAB64 @ =gUnknown_2021D18 ldr r0, _080DAB64 @ =gUnknown_2021D18
ldr r1, _080DAB68 @ =gUnknown_8488D60 ldr r1, _080DAB68 @ =gUnknown_8488D60
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
movs r0, 0 movs r0, 0
@@ -530,7 +530,7 @@ _080DABDA:
bne _080DAC04 bne _080DAC04
ldr r0, _080DABFC @ =gUnknown_2021D18 ldr r0, _080DABFC @ =gUnknown_2021D18
ldr r1, _080DAC00 @ =gUnknown_8488D8E ldr r1, _080DAC00 @ =gUnknown_8488D8E
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x3 movs r0, 0x3
b _080DAC6E b _080DAC6E
.align 2, 0 .align 2, 0
@@ -570,7 +570,7 @@ _080DAC3E:
bl GetMonData bl GetMonData
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080DAC5C beq _080DAC5C
@@ -582,7 +582,7 @@ _080DAC5C:
bl CalculatePlayerPartyCount bl CalculatePlayerPartyCount
ldr r0, _080DAC84 @ =gUnknown_2021D18 ldr r0, _080DAC84 @ =gUnknown_2021D18
ldr r1, _080DAC88 @ =gUnknown_8488D7C ldr r1, _080DAC88 @ =gUnknown_8488D7C
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
_080DAC6E: _080DAC6E:
str r0, [r6, 0x6C] str r0, [r6, 0x6C]
@@ -619,7 +619,7 @@ sub_80DAC8C: @ 80DAC8C
bl sub_80E7490 bl sub_80E7490
ldr r0, _080DACCC @ =gUnknown_2021D18 ldr r0, _080DACCC @ =gUnknown_2021D18
ldr r1, _080DACD0 @ =gUnknown_8488DBD ldr r1, _080DACD0 @ =gUnknown_8488DBD
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
str r0, [r4, 0x6C] str r0, [r4, 0x6C]
movs r0, 0 movs r0, 0
asm/mystery_gift_menu.s
+5 -5
View File
@@ -141,7 +141,7 @@ _081420D6:
movs r3, 0 movs r3, 0
bl sub_80F696C bl sub_80F696C
ldr r0, _081421E8 @ =gUnknown_8466D70 ldr r0, _081421E8 @ =gUnknown_8466D70
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
movs r1, 0xC0 movs r1, 0xC0
lsls r1, 7 lsls r1, 7
@@ -342,7 +342,7 @@ _08142362:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E5A4 bl AddTextPrinterParametrized2
movs r0, 0 movs r0, 0
adds r1, r6, 0 adds r1, r6, 0
movs r2, 0 movs r2, 0
@@ -359,7 +359,7 @@ _08142362:
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
movs r3, 0x2 movs r3, 0x2
bl sub_812E5A4 bl AddTextPrinterParametrized2
b _081423E8 b _081423E8
.align 2, 0 .align 2, 0
_081423A4: .4byte gUnknown_841EDCA _081423A4: .4byte gUnknown_841EDCA
@@ -379,7 +379,7 @@ _081423B4:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl sub_812E5A4 bl AddTextPrinterParametrized2
str r4, [sp] str r4, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
str r5, [sp, 0x8] str r5, [sp, 0x8]
@@ -390,7 +390,7 @@ _081423B4:
movs r1, 0 movs r1, 0
movs r2, 0x78 movs r2, 0x78
movs r3, 0x2 movs r3, 0x2
bl sub_812E5A4 bl AddTextPrinterParametrized2
_081423E8: _081423E8:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
asm/naming_screen.s
+24 -24
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_809D954 thumb_func_start DoNamingScreen
sub_809D954: @ 809D954 DoNamingScreen: @ 809D954
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -56,7 +56,7 @@ _0809D984:
bne _0809D9B8 bne _0809D9B8
bl StartTimer1 bl StartTimer1
_0809D9B8: _0809D9B8:
ldr r0, _0809D9DC @ =sub_809D9E0 ldr r0, _0809D9DC @ =c2_choose_name_or_words_screen
bl SetMainCallback2 bl SetMainCallback2
_0809D9BE: _0809D9BE:
pop {r3} pop {r3}
@@ -70,11 +70,11 @@ _0809D9CC: .4byte 0x00001e34
_0809D9D0: .4byte 0x00001e38 _0809D9D0: .4byte 0x00001e38
_0809D9D4: .4byte 0x00001e30 _0809D9D4: .4byte 0x00001e30
_0809D9D8: .4byte 0x00001e3c _0809D9D8: .4byte 0x00001e3c
_0809D9DC: .4byte sub_809D9E0 _0809D9DC: .4byte c2_choose_name_or_words_screen
thumb_func_end sub_809D954 thumb_func_end DoNamingScreen
thumb_func_start sub_809D9E0 thumb_func_start c2_choose_name_or_words_screen
sub_809D9E0: @ 809D9E0 c2_choose_name_or_words_screen: @ 809D9E0
push {lr} push {lr}
ldr r0, _0809D9FC @ =gUnknown_30030F0 ldr r0, _0809D9FC @ =gUnknown_30030F0
movs r1, 0x87 movs r1, 0x87
@@ -106,7 +106,7 @@ _0809DA24:
bl sub_809DA84 bl sub_809DA84
b _0809DA62 b _0809DA62
_0809DA2E: _0809DA2E:
bl sub_809DBB0 bl choose_name_or_words_screen_init_bgs
b _0809DA62 b _0809DA62
_0809DA34: _0809DA34:
bl ResetPaletteFade bl ResetPaletteFade
@@ -145,7 +145,7 @@ _0809DA78:
_0809DA80: _0809DA80:
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_809D9E0 thumb_func_end c2_choose_name_or_words_screen
thumb_func_start sub_809DA84 thumb_func_start sub_809DA84
sub_809DA84: @ 809DA84 sub_809DA84: @ 809DA84
@@ -291,8 +291,8 @@ _0809DB94:
_0809DBAC: .4byte gUnknown_202063C _0809DBAC: .4byte gUnknown_202063C
thumb_func_end sub_809DB70 thumb_func_end sub_809DB70
thumb_func_start sub_809DBB0 thumb_func_start choose_name_or_words_screen_init_bgs
sub_809DBB0: @ 809DBB0 choose_name_or_words_screen_init_bgs: @ 809DBB0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -407,7 +407,7 @@ _0809DCA4:
lsls r0, r4, 3 lsls r0, r4, 3
ldr r1, _0809DD50 @ =gUnknown_83E22A0 ldr r1, _0809DD50 @ =gUnknown_83E22A0
adds r0, r1 adds r0, r1
bl sub_8003CE4 bl AddWindow
ldr r5, _0809DD54 @ =gUnknown_203998C ldr r5, _0809DD54 @ =gUnknown_203998C
ldr r1, [r5] ldr r1, [r5]
ldr r2, _0809DD58 @ =0x00001e11 ldr r2, _0809DD58 @ =0x00001e11
@@ -481,7 +481,7 @@ _0809DD50: .4byte gUnknown_83E22A0
_0809DD54: .4byte gUnknown_203998C _0809DD54: .4byte gUnknown_203998C
_0809DD58: .4byte 0x00001e11 _0809DD58: .4byte 0x00001e11
_0809DD5C: .4byte 0x0000080c _0809DD5C: .4byte 0x0000080c
thumb_func_end sub_809DBB0 thumb_func_end choose_name_or_words_screen_init_bgs
thumb_func_start sub_809DD60 thumb_func_start sub_809DD60
sub_809DD60: @ 809DD60 sub_809DD60: @ 809DD60
@@ -932,7 +932,7 @@ _0809E104:
ldr r1, [r1] ldr r1, [r1]
bl StringCopy bl StringCopy
ldr r4, _0809E1C0 @ =gUnknown_2021D04 ldr r4, _0809E1C0 @ =gUnknown_2021D04
bl sub_80CC7A8 bl get_unknown_box_id
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl GetBoxNamePtr bl GetBoxNamePtr
@@ -956,7 +956,7 @@ _0809E156:
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl sub_80F6EE4
@@ -1006,7 +1006,7 @@ sub_809E1D4: @ 809E1D4
push {lr} push {lr}
bl sub_8002DE8 bl sub_8002DE8
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _0809E1FE bne _0809E1FE
@@ -3657,7 +3657,7 @@ _0809F5EE:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x68 movs r2, 0x68
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
_0809F614: _0809F614:
add sp, 0x10 add sp, 0x10
pop {r4,r5} pop {r4,r5}
@@ -4196,7 +4196,7 @@ _0809FA12:
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
bl sub_812E51C bl box_print
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -4317,7 +4317,7 @@ sub_809FAE4: @ 809FAE4
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0 movs r1, 0
movs r3, 0 movs r3, 0
bl sub_812E51C bl box_print
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
@@ -4494,7 +4494,7 @@ sub_809FC90: @ 809FC90
str r0, [sp, 0x4] str r0, [sp, 0x4]
movs r0, 0 movs r0, 0
movs r3, 0 movs r3, 0
bl sub_809D954 bl DoNamingScreen
add sp, 0x8 add sp, 0x8
pop {r0} pop {r0}
bx r0 bx r0
@@ -4516,7 +4516,7 @@ sub_809FCB8: @ 809FCB8
str r0, [sp, 0x4] str r0, [sp, 0x4]
movs r0, 0x1 movs r0, 0x1
movs r3, 0 movs r3, 0
bl sub_809D954 bl DoNamingScreen
add sp, 0x8 add sp, 0x8
pop {r0} pop {r0}
bx r0 bx r0
@@ -4538,7 +4538,7 @@ sub_809FCE0: @ 809FCE0
str r0, [sp, 0x4] str r0, [sp, 0x4]
movs r0, 0x2 movs r0, 0x2
movs r3, 0 movs r3, 0
bl sub_809D954 bl DoNamingScreen
add sp, 0x8 add sp, 0x8
pop {r0} pop {r0}
bx r0 bx r0
@@ -4560,7 +4560,7 @@ sub_809FD08: @ 809FD08
str r0, [sp, 0x4] str r0, [sp, 0x4]
movs r0, 0x3 movs r0, 0x3
movs r3, 0 movs r3, 0
bl sub_809D954 bl DoNamingScreen
add sp, 0x8 add sp, 0x8
pop {r0} pop {r0}
bx r0 bx r0
@@ -4582,7 +4582,7 @@ sub_809FD30: @ 809FD30
str r0, [sp, 0x4] str r0, [sp, 0x4]
movs r0, 0x4 movs r0, 0x4
movs r3, 0 movs r3, 0
bl sub_809D954 bl DoNamingScreen
add sp, 0x8 add sp, 0x8
pop {r0} pop {r0}
bx r0 bx r0
asm/new_game.s
+3 -3
View File
@@ -165,14 +165,14 @@ sub_80549F8: @ 80549F8
bx r0 bx r0
thumb_func_end sub_80549F8 thumb_func_end sub_80549F8
thumb_func_start sub_8054A18 thumb_func_start Sav2_ClearSetDefault
sub_8054A18: @ 8054A18 Sav2_ClearSetDefault: @ 8054A18
push {lr} push {lr}
bl ClearSav2 bl ClearSav2
bl SetDefaultOptions bl SetDefaultOptions
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8054A18 thumb_func_end Sav2_ClearSetDefault
thumb_func_start sub_8054A28 thumb_func_start sub_8054A28
sub_8054A28: @ 8054A28 sub_8054A28: @ 8054A28
asm/new_menu_helpers.s
+23 -23
View File
@@ -164,7 +164,7 @@ decompress_and_copy_tile_data_to_vram: @ 80F6878
bhi _080F68E0 bhi _080F68E0
adds r0, r4, 0 adds r0, r4, 0
add r1, sp, 0x4 add r1, sp, 0x4
bl sub_80F6AA0 bl malloc_and_decompress
adds r4, r0, 0 adds r4, r0, 0
cmp r5, 0 cmp r5, 0
bne _080F68B0 bne _080F68B0
@@ -229,7 +229,7 @@ sub_80F68F0: @ 80F68F0
bhi _080F695C bhi _080F695C
adds r0, r4, 0 adds r0, r4, 0
add r1, sp, 0x4 add r1, sp, 0x4
bl sub_80F6AA0 bl malloc_and_decompress
adds r4, r0, 0 adds r4, r0, 0
ldr r0, [sp, 0x4] ldr r0, [sp, 0x4]
cmp r0, r6 cmp r0, r6
@@ -291,7 +291,7 @@ sub_80F696C: @ 80F696C
lsrs r7, r2, 24 lsrs r7, r2, 24
adds r0, r1, 0 adds r0, r1, 0
add r1, sp, 0x4 add r1, sp, 0x4
bl sub_80F6AA0 bl malloc_and_decompress
adds r6, r0, 0 adds r6, r0, 0
cmp r5, 0 cmp r5, 0
bne _080F699A bne _080F699A
@@ -299,7 +299,7 @@ sub_80F696C: @ 80F696C
_080F699A: _080F699A:
cmp r6, 0 cmp r6, 0
beq _080F69D2 beq _080F69D2
ldr r0, _080F69E0 @ =sub_80F6A64 ldr r0, _080F69E0 @ =task_free_buf_after_copying_tile_data_to_vram
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
adds r4, r0, 0 adds r4, r0, 0
@@ -331,7 +331,7 @@ _080F69D2:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F69E0: .4byte sub_80F6A64 _080F69E0: .4byte task_free_buf_after_copying_tile_data_to_vram
_080F69E4: .4byte gUnknown_3005090 _080F69E4: .4byte gUnknown_3005090
thumb_func_end sub_80F696C thumb_func_end sub_80F696C
@@ -352,7 +352,7 @@ sub_80F69E8: @ 80F69E8
lsrs r6, r2, 24 lsrs r6, r2, 24
adds r0, r1, 0 adds r0, r1, 0
add r1, sp, 0x4 add r1, sp, 0x4
bl sub_80F6AA0 bl malloc_and_decompress
adds r5, r0, 0 adds r5, r0, 0
ldr r0, [sp, 0x4] ldr r0, [sp, 0x4]
cmp r0, r4 cmp r0, r4
@@ -361,7 +361,7 @@ sub_80F69E8: @ 80F69E8
_080F6A14: _080F6A14:
cmp r5, 0 cmp r5, 0
beq _080F6A4E beq _080F6A4E
ldr r0, _080F6A5C @ =sub_80F6A64 ldr r0, _080F6A5C @ =task_free_buf_after_copying_tile_data_to_vram
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
adds r4, r0, 0 adds r4, r0, 0
@@ -393,12 +393,12 @@ _080F6A4E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F6A5C: .4byte sub_80F6A64 _080F6A5C: .4byte task_free_buf_after_copying_tile_data_to_vram
_080F6A60: .4byte gUnknown_3005090 _080F6A60: .4byte gUnknown_3005090
thumb_func_end sub_80F69E8 thumb_func_end sub_80F69E8
thumb_func_start sub_80F6A64 thumb_func_start task_free_buf_after_copying_tile_data_to_vram
sub_80F6A64: @ 80F6A64 task_free_buf_after_copying_tile_data_to_vram: @ 80F6A64
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -425,10 +425,10 @@ _080F6A94:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F6A9C: .4byte gUnknown_3005090 _080F6A9C: .4byte gUnknown_3005090
thumb_func_end sub_80F6A64 thumb_func_end task_free_buf_after_copying_tile_data_to_vram
thumb_func_start sub_80F6AA0 thumb_func_start malloc_and_decompress
sub_80F6AA0: @ 80F6AA0 malloc_and_decompress: @ 80F6AA0
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
ldrb r0, [r5, 0x1] ldrb r0, [r5, 0x1]
@@ -452,7 +452,7 @@ _080F6AC8:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80F6AA0 thumb_func_end malloc_and_decompress
thumb_func_start sub_80F6AD0 thumb_func_start sub_80F6AD0
sub_80F6AD0: @ 80F6AD0 sub_80F6AD0: @ 80F6AD0
@@ -676,7 +676,7 @@ sub_80F6C14: @ 80F6C14
sub_80F6C6C: @ 80F6C6C sub_80F6C6C: @ 80F6C6C
push {lr} push {lr}
ldr r0, _080F6C84 @ =gUnknown_841F42C ldr r0, _080F6C84 @ =gUnknown_841F42C
bl sub_8003B24 bl InitWindows
ldr r1, _080F6C88 @ =gUnknown_203ABE0 ldr r1, _080F6C88 @ =gUnknown_203ABE0
movs r0, 0xFF movs r0, 0xFF
strb r0, [r1] strb r0, [r1]
@@ -718,7 +718,7 @@ sub_80F6CBC: @ 80F6CBC
push {lr} push {lr}
bl sub_8002DE8 bl sub_8002DE8
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
pop {r1} pop {r1}
@@ -2250,7 +2250,7 @@ sub_80F78E0: @ 80F78E0
str r0, [sp, 0x18] str r0, [sp, 0x18]
str r1, [sp, 0x1C] str r1, [sp, 0x1C]
add r0, sp, 0x18 add r0, sp, 0x18
bl sub_8003CE4 bl AddWindow
strb r0, [r4] strb r0, [r4]
ldrb r0, [r4] ldrb r0, [r4]
bl PutWindowTilemap bl PutWindowTilemap
@@ -2265,17 +2265,17 @@ _080F7934: .4byte gUnknown_203ABE0
_080F7938: .4byte 0x0000013d _080F7938: .4byte 0x0000013d
thumb_func_end sub_80F78E0 thumb_func_end sub_80F78E0
thumb_func_start sub_80F793C thumb_func_start GetStartMenuWindowId
sub_80F793C: @ 80F793C GetStartMenuWindowId: @ 80F793C
ldr r0, _080F7944 @ =gUnknown_203ABE0 ldr r0, _080F7944 @ =gUnknown_203ABE0
ldrb r0, [r0] ldrb r0, [r0]
bx lr bx lr
.align 2, 0 .align 2, 0
_080F7944: .4byte gUnknown_203ABE0 _080F7944: .4byte gUnknown_203ABE0
thumb_func_end sub_80F793C thumb_func_end GetStartMenuWindowId
thumb_func_start sub_80F7948 thumb_func_start remove_start_menu_window_maybe
sub_80F7948: @ 80F7948 remove_start_menu_window_maybe: @ 80F7948
push {r4,lr} push {r4,lr}
ldr r4, _080F7960 @ =gUnknown_203ABE0 ldr r4, _080F7960 @ =gUnknown_203ABE0
ldrb r0, [r4] ldrb r0, [r4]
@@ -2290,7 +2290,7 @@ _080F795A:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F7960: .4byte gUnknown_203ABE0 _080F7960: .4byte gUnknown_203ABE0
thumb_func_end sub_80F7948 thumb_func_end remove_start_menu_window_maybe
thumb_func_start sub_80F7964 thumb_func_start sub_80F7964
sub_80F7964: @ 80F7964 sub_80F7964: @ 80F7964
asm/oak_speech.s
+41 -41
View File
@@ -667,7 +667,7 @@ sub_812EEB0: @ 812EEB0
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl sub_8003CE4 bl AddWindow
ldr r1, [r4] ldr r1, [r4]
movs r6, 0 movs r6, 0
strh r0, [r1, 0x14] strh r0, [r1, 0x14]
@@ -690,7 +690,7 @@ sub_812EEB0: @ 812EEB0
movs r1, 0x2 movs r1, 0x2
movs r2, 0x2 movs r2, 0x2
movs r3, 0 movs r3, 0
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldr r0, [r4] ldr r0, [r4]
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
movs r1, 0x3 movs r1, 0x3
@@ -767,7 +767,7 @@ _0812EF9A:
lsls r1, r6, 3 lsls r1, r6, 3
ldr r0, [r0] ldr r0, [r0]
adds r0, r1 adds r0, r1
bl sub_8003CE4 bl AddWindow
ldr r1, [r5] ldr r1, [r5]
lsls r4, r6, 1 lsls r4, r6, 1
adds r1, 0x14 adds r1, 0x14
@@ -804,7 +804,7 @@ _0812EF9A:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x6 movs r2, 0x6
movs r3, 0 movs r3, 0
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x14 adds r0, 0x14
adds r0, r4 adds r0, r4
@@ -1240,7 +1240,7 @@ _0812F374:
bl sub_810F5E8 bl sub_810F5E8
ldr r0, _0812F488 @ =gUnknown_8460BA8 ldr r0, _0812F488 @ =gUnknown_8460BA8
add r1, sp, 0x14 add r1, sp, 0x14
bl sub_80F6AA0 bl malloc_and_decompress
adds r1, r0, 0 adds r1, r0, 0
ldr r4, _0812F48C @ =gUnknown_203B108 ldr r4, _0812F48C @ =gUnknown_203B108
ldr r0, [r4] ldr r0, [r4]
@@ -1261,7 +1261,7 @@ _0812F374:
ldr r0, [r4] ldr r0, [r4]
str r6, [r0, 0x8] str r6, [r0, 0x8]
ldr r0, _0812F490 @ =gUnknown_8462EC0 ldr r0, _0812F490 @ =gUnknown_8462EC0
bl sub_8003CE4 bl AddWindow
strh r0, [r5, 0x1C] strh r0, [r5, 0x1C]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1295,7 +1295,7 @@ _0812F374:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x3 movs r2, 0x3
movs r3, 0x5 movs r3, 0x5
bl sub_812E5A4 bl AddTextPrinterParametrized2
str r6, [sp] str r6, [sp]
movs r0, 0 movs r0, 0
movs r1, 0xE2 movs r1, 0xE2
@@ -1532,7 +1532,7 @@ _0812F5D6:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x3 movs r2, 0x3
movs r3, 0x5 movs r3, 0x5
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldr r0, [r4] ldr r0, [r4]
ldrh r0, [r0, 0x12] ldrh r0, [r0, 0x12]
cmp r0, 0 cmp r0, 0
@@ -1764,7 +1764,7 @@ _0812F7EC: .4byte gUnknown_3005098
_0812F7F0: _0812F7F0:
ldr r0, _0812F870 @ =gUnknown_8460CA4 ldr r0, _0812F870 @ =gUnknown_8460CA4
add r1, sp, 0x4 add r1, sp, 0x4
bl sub_80F6AA0 bl malloc_and_decompress
adds r1, r0, 0 adds r1, r0, 0
ldr r0, _0812F874 @ =gUnknown_203B108 ldr r0, _0812F874 @ =gUnknown_203B108
ldr r0, [r0] ldr r0, [r0]
@@ -1861,7 +1861,7 @@ _0812F8B8:
beq _0812F8FC beq _0812F8FC
adds r0, r5, 0 adds r0, r5, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, _0812F8F8 @ =gUnknown_203B108 ldr r0, _0812F8F8 @ =gUnknown_203B108
ldr r0, [r0] ldr r0, [r0]
ldrb r3, [r0, 0x1F] ldrb r3, [r0, 0x1F]
@@ -1924,7 +1924,7 @@ sub_812F944: @ 812F944
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
cmp r4, 0 cmp r4, 0
@@ -1938,7 +1938,7 @@ sub_812F944: @ 812F944
beq _0812F9A0 beq _0812F9A0
adds r0, r5, 0 adds r0, r5, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, _0812F99C @ =gUnknown_203B108 ldr r0, _0812F99C @ =gUnknown_203B108
ldr r0, [r0] ldr r0, [r0]
ldrb r3, [r0, 0x1F] ldrb r3, [r0, 0x1F]
@@ -2008,7 +2008,7 @@ sub_812F9EC: @ 812F9EC
ldr r7, _0812FA68 @ =gUnknown_3005098 ldr r7, _0812FA68 @ =gUnknown_3005098
adds r4, r6, r7 adds r4, r6, r7
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
cmp r5, 0 cmp r5, 0
@@ -2115,7 +2115,7 @@ _0812FAA0:
beq _0812FB14 beq _0812FB14
adds r0, r4, 0 adds r0, r4, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, _0812FB10 @ =gUnknown_203B108 ldr r0, _0812FB10 @ =gUnknown_203B108
ldr r0, [r0] ldr r0, [r0]
ldrb r3, [r0, 0x1F] ldrb r3, [r0, 0x1F]
@@ -2175,7 +2175,7 @@ sub_812FB4C: @ 812FB4C
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
cmp r4, 0 cmp r4, 0
@@ -2189,7 +2189,7 @@ sub_812FB4C: @ 812FB4C
beq _0812FBA8 beq _0812FBA8
adds r0, r5, 0 adds r0, r5, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, _0812FBA4 @ =gUnknown_203B108 ldr r0, _0812FBA4 @ =gUnknown_203B108
ldr r0, [r0] ldr r0, [r0]
ldrb r3, [r0, 0x1F] ldrb r3, [r0, 0x1F]
@@ -2252,7 +2252,7 @@ sub_812FBF0: @ 812FBF0
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
cmp r5, 0 cmp r5, 0
@@ -2379,7 +2379,7 @@ _0812FCEC:
beq _0812FD30 beq _0812FD30
adds r0, r5, 0 adds r0, r5, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, _0812FD2C @ =gUnknown_203B108 ldr r0, _0812FD2C @ =gUnknown_203B108
ldr r0, [r0] ldr r0, [r0]
ldrb r3, [r0, 0x1F] ldrb r3, [r0, 0x1F]
@@ -2446,7 +2446,7 @@ sub_812FD78: @ 812FD78
ldr r7, _0812FDB8 @ =gUnknown_3005098 ldr r7, _0812FDB8 @ =gUnknown_3005098
adds r6, r5, r7 adds r6, r5, r7
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _0812FDB2 bne _0812FDB2
@@ -2512,7 +2512,7 @@ _0812FDF0:
beq _0812FE40 beq _0812FE40
adds r0, r5, 0 adds r0, r5, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, _0812FE3C @ =gUnknown_203B108 ldr r0, _0812FE3C @ =gUnknown_203B108
ldr r0, [r0] ldr r0, [r0]
ldrb r3, [r0, 0x1F] ldrb r3, [r0, 0x1F]
@@ -2578,13 +2578,13 @@ sub_812FE88: @ 812FE88
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r7, r0, 16 lsrs r7, r0, 16
cmp r7, 0 cmp r7, 0
bne _0812FF7E bne _0812FF7E
ldr r0, _0812FF8C @ =gUnknown_8462EC8 ldr r0, _0812FF8C @ =gUnknown_8462EC8
bl sub_8003CE4 bl AddWindow
ldr r1, _0812FF90 @ =gUnknown_3005090 ldr r1, _0812FF90 @ =gUnknown_3005090
lsls r5, r4, 2 lsls r5, r4, 2
adds r5, r4 adds r5, r4
@@ -2636,7 +2636,7 @@ sub_812FE88: @ 812FE88
movs r1, 0x2 movs r1, 0x2
movs r2, 0x8 movs r2, 0x8
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
ldr r0, [r4] ldr r0, [r4]
mov r1, r9 mov r1, r9
strb r1, [r0, 0x1C] strb r1, [r0, 0x1C]
@@ -2657,7 +2657,7 @@ sub_812FE88: @ 812FE88
movs r1, 0x2 movs r1, 0x2
movs r2, 0x8 movs r2, 0x8
movs r3, 0x11 movs r3, 0x11
bl sub_812E51C bl box_print
movs r0, 0x2 movs r0, 0x2
movs r1, 0x1 movs r1, 0x1
bl GetFontAttribute bl GetFontAttribute
@@ -2863,7 +2863,7 @@ _081300D0:
beq _08130118 beq _08130118
adds r0, r5, 0 adds r0, r5, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, _08130114 @ =gUnknown_203B108 ldr r0, _08130114 @ =gUnknown_203B108
ldr r0, [r0] ldr r0, [r0]
ldrb r3, [r0, 0x1F] ldrb r3, [r0, 0x1F]
@@ -2926,7 +2926,7 @@ sub_8130160: @ 8130160
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
cmp r4, 0 cmp r4, 0
@@ -2971,7 +2971,7 @@ sub_81301B0: @ 81301B0
ldr r7, _081301F8 @ =gUnknown_3005098 ldr r7, _081301F8 @ =gUnknown_3005098
adds r4, r6, r7 adds r4, r6, r7
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _08130218 bne _08130218
@@ -3042,7 +3042,7 @@ sub_8130228: @ 8130228
beq _08130284 beq _08130284
adds r0, r5, 0 adds r0, r5, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
str r4, [sp] str r4, [sp]
movs r0, 0x2 movs r0, 0x2
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -3087,7 +3087,7 @@ _081302A6:
beq _081302E4 beq _081302E4
adds r0, r4, 0 adds r0, r4, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
movs r0, 0x2 movs r0, 0x2
@@ -3240,7 +3240,7 @@ sub_81303B4: @ 81303B4
str r0, [sp, 0x4] str r0, [sp, 0x4]
movs r0, 0 movs r0, 0
movs r3, 0 movs r3, 0
bl sub_809D954 bl DoNamingScreen
b _08130440 b _08130440
.align 2, 0 .align 2, 0
_081303F8: .4byte gUnknown_2037AB8 _081303F8: .4byte gUnknown_2037AB8
@@ -3272,7 +3272,7 @@ _08130408:
movs r0, 0x4 movs r0, 0x4
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_809D954 bl DoNamingScreen
_08130440: _08130440:
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x1 movs r1, 0x1
@@ -3318,7 +3318,7 @@ sub_8130464: @ 8130464
bne _081304B4 bne _081304B4
ldr r0, _081304AC @ =gUnknown_2021D18 ldr r0, _081304AC @ =gUnknown_2021D18
ldr r1, _081304B0 @ =gUnknown_81C5E13 ldr r1, _081304B0 @ =gUnknown_81C5E13
bl sub_8008FCC bl StringExpandPlaceholders
b _081304BC b _081304BC
.align 2, 0 .align 2, 0
_081304A0: .4byte gUnknown_3005098 _081304A0: .4byte gUnknown_3005098
@@ -3329,7 +3329,7 @@ _081304B0: .4byte gUnknown_81C5E13
_081304B4: _081304B4:
ldr r0, _081304F4 @ =gUnknown_2021D18 ldr r0, _081304F4 @ =gUnknown_2021D18
ldr r1, _081304F8 @ =gUnknown_81C5EB5 ldr r1, _081304F8 @ =gUnknown_81C5EB5
bl sub_8008FCC bl StringExpandPlaceholders
_081304BC: _081304BC:
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
@@ -3362,7 +3362,7 @@ _081304F8: .4byte gUnknown_81C5EB5
_081304FC: .4byte gUnknown_203B108 _081304FC: .4byte gUnknown_203B108
_08130500: _08130500:
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _08130544 bne _08130544
@@ -3409,7 +3409,7 @@ sub_8130554: @ 8130554
sub sp, 0x10 sub sp, 0x10
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r5, r0, 24 asrs r5, r0, 24
cmp r5, 0 cmp r5, 0
@@ -3457,7 +3457,7 @@ _081305BC:
ldr r4, _081305F8 @ =gUnknown_2021D18 ldr r4, _081305F8 @ =gUnknown_2021D18
ldr r1, _081305FC @ =gUnknown_81C5EC5 ldr r1, _081305FC @ =gUnknown_81C5EC5
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl sub_80F6EE4
@@ -3567,7 +3567,7 @@ sub_8130694: @ 8130694
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _081306C4 bne _081306C4
@@ -3652,7 +3652,7 @@ sub_813071C: @ 813071C
beq _08130780 beq _08130780
adds r0, r4, 0 adds r0, r4, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r0, _0813077C @ =gUnknown_203B108 ldr r0, _0813077C @ =gUnknown_203B108
ldr r0, [r0] ldr r0, [r0]
ldrb r3, [r0, 0x1F] ldrb r3, [r0, 0x1F]
@@ -3802,7 +3802,7 @@ sub_8130858: @ 8130858
ldr r4, _081308C0 @ =gUnknown_2021D18 ldr r4, _081308C0 @ =gUnknown_2021D18
ldr r1, _081308C4 @ =gUnknown_81C5EF4 ldr r1, _081308C4 @ =gUnknown_81C5EF4
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl sub_80F6EE4
@@ -3847,7 +3847,7 @@ sub_81308D0: @ 81308D0
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r0, 0 movs r0, 0
bl sub_8002E64 bl IsTextPrinterActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _0813090A bne _0813090A
@@ -5544,7 +5544,7 @@ sub_8131660: @ 8131660
ldr r5, _081316DC @ =gUnknown_3005098 ldr r5, _081316DC @ =gUnknown_3005098
adds r7, r4, r5 adds r7, r4, r5
ldr r0, _081316E0 @ =gUnknown_8462ED8 ldr r0, _081316E0 @ =gUnknown_8462ED8
bl sub_8003CE4 bl AddWindow
strh r0, [r7, 0x1A] strh r0, [r7, 0x1A]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
asm/option_menu.s
+4 -4
View File
@@ -347,7 +347,7 @@ _08088556:
movs r2, 0 movs r2, 0
bl ChangeBgY bl ChangeBgY
ldr r0, _0808867C @ =gUnknown_83CC2B8 ldr r0, _0808867C @ =gUnknown_83CC2B8
bl sub_8003B24 bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
movs r0, 0x50 movs r0, 0x50
movs r1, 0xC1 movs r1, 0xC1
@@ -409,7 +409,7 @@ sub_8088680: @ 8088680
movs r1, 0 movs r1, 0
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0 movs r3, 0
bl sub_812E51C bl box_print
movs r0, 0x2 movs r0, 0x2
bl PutWindowTilemap bl PutWindowTilemap
movs r0, 0x2 movs r0, 0x2
@@ -906,7 +906,7 @@ _08088A72:
movs r1, 0x2 movs r1, 0x2
mov r2, r8 mov r2, r8
adds r3, r7, 0 adds r3, r7, 0
bl sub_812E51C bl box_print
b _08088ADE b _08088ADE
.align 2, 0 .align 2, 0
_08088A94: .4byte gUnknown_83CC354 _08088A94: .4byte gUnknown_83CC354
@@ -940,7 +940,7 @@ _08088A9C:
movs r1, 0x2 movs r1, 0x2
mov r2, r8 mov r2, r8
adds r3, r7, 0 adds r3, r7, 0
bl sub_812E51C bl box_print
_08088ADE: _08088ADE:
movs r0, 0x1 movs r0, 0x1
bl PutWindowTilemap bl PutWindowTilemap
asm/overworld.s
+59 -59
View File
@@ -19,7 +19,7 @@ sub_8054BC8: @ 8054BC8
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl RemoveMoney bl RemoveMoney
bl sub_80A0058 bl sp000_heal_pokemon
bl sub_8054DD8 bl sub_8054DD8
bl sub_80554BC bl sub_80554BC
bl warp_in bl warp_in
@@ -313,15 +313,15 @@ _08054E74:
_08054E8C: .4byte gUnknown_3005008 _08054E8C: .4byte gUnknown_3005008
thumb_func_end sub_8054E68 thumb_func_end sub_8054E68
thumb_func_start sub_8054E90 thumb_func_start IncrementGameStat
sub_8054E90: @ 8054E90 IncrementGameStat: @ 8054E90
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0x33 cmp r4, 0x33
bhi _08054EB8 bhi _08054EB8
adds r0, r4, 0 adds r0, r4, 0
bl sub_8054EC4 bl GetGameStat
adds r1, r0, 0 adds r1, r0, 0
ldr r0, _08054EAC @ =0x00fffffe ldr r0, _08054EAC @ =0x00fffffe
cmp r1, r0 cmp r1, r0
@@ -341,10 +341,10 @@ _08054EB8:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08054EC0: .4byte 0x00ffffff _08054EC0: .4byte 0x00ffffff
thumb_func_end sub_8054E90 thumb_func_end IncrementGameStat
thumb_func_start sub_8054EC4 thumb_func_start GetGameStat
sub_8054EC4: @ 8054EC4 GetGameStat: @ 8054EC4
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
@@ -374,7 +374,7 @@ _08054EF8:
_08054EFA: _08054EFA:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8054EC4 thumb_func_end GetGameStat
thumb_func_start sub_8054F00 thumb_func_start sub_8054F00
sub_8054F00: @ 8054F00 sub_8054F00: @ 8054F00
@@ -1715,10 +1715,10 @@ sub_8055864: @ 8055864
bl sub_807B140 bl sub_807B140
bl sub_805610C bl sub_805610C
bl sub_8055CB8 bl sub_8055CB8
bl sub_8055E84 bl sav1_reset_battle_music_maybe
bl mapheader_run_script_with_tag_x3 bl mapheader_run_script_with_tag_x3
bl sub_815D8F8 bl sub_815D8F8
bl sub_80589D4 bl not_trainer_hill_battle_pyramid
ldr r4, _0805591C @ =gUnknown_2036DFC ldr r4, _0805591C @ =gUnknown_2036DFC
ldr r0, [r4] ldr r0, [r4]
bl copy_map_tileset2_to_vram_2 bl copy_map_tileset2_to_vram_2
@@ -1737,7 +1737,7 @@ _080558D4:
bl RoamerMove bl RoamerMove
bl sub_8110920 bl sub_8110920
bl sub_807B1A4 bl sub_807B1A4
bl sub_806E918 bl wild_encounter_reset_coro_args
bl mapheader_run_script_with_tag_x5 bl mapheader_run_script_with_tag_x5
bl sub_80561B4 bl sub_80561B4
ldr r1, _0805591C @ =gUnknown_2036DFC ldr r1, _0805591C @ =gUnknown_2036DFC
@@ -1792,13 +1792,13 @@ sub_8055920: @ 8055920
bl FlagClear bl FlagClear
_08055974: _08055974:
bl sub_8055CB8 bl sub_8055CB8
bl sub_8055E84 bl sav1_reset_battle_music_maybe
bl mapheader_run_script_with_tag_x3 bl mapheader_run_script_with_tag_x3
bl sub_815D8F8 bl sub_815D8F8
bl UpdateLocationHistoryForRoamer bl UpdateLocationHistoryForRoamer
bl RoamerMoveToOtherLocationSet bl RoamerMoveToOtherLocationSet
bl sub_8110920 bl sub_8110920
bl sub_80589D4 bl not_trainer_hill_battle_pyramid
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1823,7 +1823,7 @@ sub_80559A8: @ 80559A8
bl sub_8110920 bl sub_8110920
bl sub_8111708 bl sub_8111708
bl set_current_map_header_from_sav1 bl set_current_map_header_from_sav1
bl sub_80589D4 bl not_trainer_hill_battle_pyramid
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -2103,13 +2103,13 @@ _08055BD8:
cmp r0, 0x1 cmp r0, 0x1
beq _08055C68 beq _08055C68
adds r0, r5, 0 adds r0, r5, 0
bl sub_8059CF0 bl MetatileBehavior_IsWestArrowWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _08055C3E beq _08055C3E
adds r0, r5, 0 adds r0, r5, 0
bl sub_8059CDC bl MetatileBehavior_IsEastArrowWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -2474,8 +2474,8 @@ sub_8055E78: @ 8055E78
_08055E80: .4byte gUnknown_3005008 _08055E80: .4byte gUnknown_3005008
thumb_func_end sub_8055E78 thumb_func_end sub_8055E78
thumb_func_start sub_8055E84 thumb_func_start sav1_reset_battle_music_maybe
sub_8055E84: @ 8055E84 sav1_reset_battle_music_maybe: @ 8055E84
ldr r0, _08055E90 @ =gUnknown_3005008 ldr r0, _08055E90 @ =gUnknown_3005008
ldr r1, [r0] ldr r1, [r0]
movs r0, 0 movs r0, 0
@@ -2483,7 +2483,7 @@ sub_8055E84: @ 8055E84
bx lr bx lr
.align 2, 0 .align 2, 0
_08055E90: .4byte gUnknown_3005008 _08055E90: .4byte gUnknown_3005008
thumb_func_end sub_8055E84 thumb_func_end sav1_reset_battle_music_maybe
thumb_func_start sub_8055E94 thumb_func_start sub_8055E94
sub_8055E94: @ 8055E94 sub_8055E94: @ 8055E94
@@ -2550,8 +2550,8 @@ _08055F14:
bx r0 bx r0
thumb_func_end sub_8055E94 thumb_func_end sub_8055E94
thumb_func_start sub_8055F1C thumb_func_start Overworld_ChangeMusicToDefault
sub_8055F1C: @ 8055F1C Overworld_ChangeMusicToDefault: @ 8055F1C
push {r4,lr} push {r4,lr}
bl GetCurrentMapMusic bl GetCurrentMapMusic
adds r4, r0, 0 adds r4, r0, 0
@@ -2571,7 +2571,7 @@ _08055F42:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8055F1C thumb_func_end Overworld_ChangeMusicToDefault
thumb_func_start sub_8055F48 thumb_func_start sub_8055F48
sub_8055F48: @ 8055F48 sub_8055F48: @ 8055F48
@@ -2811,7 +2811,7 @@ _08056106:
sub_805610C: @ 805610C sub_805610C: @ 805610C
push {lr} push {lr}
ldr r0, _0805611C @ =gUnknown_2031DDC ldr r0, _0805611C @ =gUnknown_2031DDC
bl sub_8082FE8 bl GetLocalWildMon
ldr r1, _08056120 @ =gUnknown_2031DDA ldr r1, _08056120 @ =gUnknown_2031DDA
strh r0, [r1] strh r0, [r1]
pop {r0} pop {r0}
@@ -3071,7 +3071,7 @@ sub_80562B0: @ 80562B0
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
bl sub_8056E74 bl MoveSaveBlocks_ResetHeap_
bl sub_8056E80 bl sub_8056E80
movs r0, 0 movs r0, 0
bl sub_8001618 bl sub_8001618
@@ -3220,7 +3220,7 @@ _0805641C: .4byte gUnknown_3005018
thumb_func_start sub_8056420 thumb_func_start sub_8056420
sub_8056420: @ 8056420 sub_8056420: @ 8056420
push {lr} push {lr}
bl sub_80A0EB4 bl ResetSafariZoneFlag
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8056420 thumb_func_end sub_8056420
@@ -3421,7 +3421,7 @@ _080565C8:
bl sub_8056578 bl sub_8056578
cmp r4, 0 cmp r4, 0
beq _080565D4 beq _080565D4
bl sub_8056A04 bl SetFieldVBlankCallback
_080565D4: _080565D4:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -3505,8 +3505,8 @@ CB2_NewGame: @ 8056644
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
ldr r0, _08056698 @ =gUnknown_3003528 ldr r0, _08056698 @ =gUnknown_3003528
bl sub_8056E5C bl do_load_map_stuff_loop
bl sub_8056A04 bl SetFieldVBlankCallback
ldr r0, _0805669C @ =sub_8056534 ldr r0, _0805669C @ =sub_8056534
bl sub_80565E0 bl sub_80565E0
ldr r0, _080566A0 @ =sub_80565B4 ldr r0, _080566A0 @ =sub_80565B4
@@ -3552,9 +3552,9 @@ c2_whiteout: @ 80566A4
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
mov r0, sp mov r0, sp
bl sub_8056E5C bl do_load_map_stuff_loop
bl sub_8112364 bl sub_8112364
bl sub_8056A04 bl SetFieldVBlankCallback
ldr r0, _08056714 @ =sub_8056534 ldr r0, _08056714 @ =sub_8056534
bl sub_80565E0 bl sub_80565E0
ldr r0, _08056718 @ =sub_80565B4 ldr r0, _08056718 @ =sub_80565B4
@@ -3596,7 +3596,7 @@ _08056748: .4byte sub_805674C
sub_805674C: @ 805674C sub_805674C: @ 805674C
push {lr} push {lr}
ldr r0, _08056768 @ =gUnknown_3003528 ldr r0, _08056768 @ =gUnknown_3003528
bl sub_8056E5C bl do_load_map_stuff_loop
bl sub_8113748 bl sub_8113748
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -3607,7 +3607,7 @@ sub_805674C: @ 805674C
.align 2, 0 .align 2, 0
_08056768: .4byte gUnknown_3003528 _08056768: .4byte gUnknown_3003528
_0805676C: _0805676C:
bl sub_8056A04 bl SetFieldVBlankCallback
ldr r0, _08056780 @ =sub_8056534 ldr r0, _08056780 @ =sub_8056534
bl sub_80565E0 bl sub_80565E0
ldr r0, _08056784 @ =sub_80565B4 ldr r0, _08056784 @ =sub_80565B4
@@ -3644,7 +3644,7 @@ c2_80567AC: @ 80567AC
bl sub_8056A5C bl sub_8056A5C
cmp r0, 0 cmp r0, 0
beq _080567CC beq _080567CC
bl sub_8056A04 bl SetFieldVBlankCallback
ldr r0, _080567D4 @ =c1_link_related ldr r0, _080567D4 @ =c1_link_related
bl sub_80565E0 bl sub_80565E0
bl sub_80578D8 bl sub_80578D8
@@ -3688,7 +3688,7 @@ c2_exit_to_overworld_2_local: @ 8056808
bl sub_8056CD8 bl sub_8056CD8
cmp r0, 0 cmp r0, 0
beq _0805681E beq _0805681E
bl sub_8056A04 bl SetFieldVBlankCallback
ldr r0, _08056828 @ =sub_80565B4 ldr r0, _08056828 @ =sub_80565B4
bl SetMainCallback2 bl SetMainCallback2
_0805681E: _0805681E:
@@ -3706,7 +3706,7 @@ c2_exit_to_overworld_2_link: @ 805682C
cmp r0, 0 cmp r0, 0
bne _08056846 bne _08056846
ldr r0, _0805684C @ =gUnknown_3003528 ldr r0, _0805684C @ =gUnknown_3003528
bl sub_8056D44 bl map_loading_iteration_2_link
cmp r0, 0 cmp r0, 0
beq _08056846 beq _08056846
ldr r0, _08056850 @ =sub_80565B4 ldr r0, _08056850 @ =sub_80565B4
@@ -3917,19 +3917,19 @@ _080569F4:
bx r0 bx r0
thumb_func_end sub_80569BC thumb_func_end sub_80569BC
thumb_func_start sub_8056A04 thumb_func_start SetFieldVBlankCallback
sub_8056A04: @ 8056A04 SetFieldVBlankCallback: @ 8056A04
push {lr} push {lr}
ldr r0, _08056A10 @ =sub_8056A14 ldr r0, _08056A10 @ =VBlankCB_Field
bl SetVBlankCallback bl SetVBlankCallback
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08056A10: .4byte sub_8056A14 _08056A10: .4byte VBlankCB_Field
thumb_func_end sub_8056A04 thumb_func_end SetFieldVBlankCallback
thumb_func_start sub_8056A14 thumb_func_start VBlankCB_Field
sub_8056A14: @ 8056A14 VBlankCB_Field: @ 8056A14
push {lr} push {lr}
bl LoadOam bl LoadOam
bl ProcessSpriteCopyRequests bl ProcessSpriteCopyRequests
@@ -3939,7 +3939,7 @@ sub_8056A14: @ 8056A14
bl TransferTilesetAnimsBuffer bl TransferTilesetAnimsBuffer
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8056A14 thumb_func_end VBlankCB_Field
thumb_func_start sub_8056A34 thumb_func_start sub_8056A34
sub_8056A34: @ 8056A34 sub_8056A34: @ 8056A34
@@ -4298,8 +4298,8 @@ _08056D3E:
bx r1 bx r1
thumb_func_end sub_8056CD8 thumb_func_end sub_8056CD8
thumb_func_start sub_8056D44 thumb_func_start map_loading_iteration_2_link
sub_8056D44: @ 8056D44 map_loading_iteration_2_link: @ 8056D44
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldrb r0, [r4] ldrb r0, [r4]
@@ -4407,7 +4407,7 @@ _08056E3E:
strb r0, [r4] strb r0, [r4]
b _08056E54 b _08056E54
_08056E46: _08056E46:
bl sub_8056A04 bl SetFieldVBlankCallback
ldrb r0, [r4] ldrb r0, [r4]
adds r0, 0x1 adds r0, 0x1
strb r0, [r4] strb r0, [r4]
@@ -4419,10 +4419,10 @@ _08056E56:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8056D44 thumb_func_end map_loading_iteration_2_link
thumb_func_start sub_8056E5C thumb_func_start do_load_map_stuff_loop
sub_8056E5C: @ 8056E5C do_load_map_stuff_loop: @ 8056E5C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
_08056E60: _08056E60:
@@ -4434,15 +4434,15 @@ _08056E60:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8056E5C thumb_func_end do_load_map_stuff_loop
thumb_func_start sub_8056E74 thumb_func_start MoveSaveBlocks_ResetHeap_
sub_8056E74: @ 8056E74 MoveSaveBlocks_ResetHeap_: @ 8056E74
push {lr} push {lr}
bl sub_804C0A4 bl sub_804C0A4
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8056E74 thumb_func_end MoveSaveBlocks_ResetHeap_
thumb_func_start sub_8056E80 thumb_func_start sub_8056E80
sub_8056E80: @ 8056E80 sub_8056E80: @ 8056E80
@@ -4637,11 +4637,11 @@ sub_8057024: @ 8057024
cmp r4, 0 cmp r4, 0
bne _08057050 bne _08057050
movs r0, 0 movs r0, 0
bl sub_805FECC bl npc_paltag_set_load
b _08057056 b _08057056
_08057050: _08057050:
movs r0, 0x1 movs r0, 0x1
bl sub_805FECC bl npc_paltag_set_load
_08057056: _08057056:
bl FieldEffectActiveListClear bl FieldEffectActiveListClear
bl sub_8079C08 bl sub_8079C08
@@ -4704,7 +4704,7 @@ mli4_mapscripts_and_other: @ 805709C
ldrb r3, [r3, 0x8] ldrb r3, [r3, 0x8]
bl InitPlayerAvatar bl InitPlayerAvatar
ldrb r0, [r5] ldrb r0, [r5]
bl sub_805BDEC bl SetPlayerAvatarTransitionFlags
bl sub_80559E4 bl sub_80559E4
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
@@ -4962,7 +4962,7 @@ sub_80572D8: @ 80572D8
push {lr} push {lr}
ldr r0, _080572F4 @ =gUnknown_3003528 ldr r0, _080572F4 @ =gUnknown_3003528
bl sub_8057300 bl sub_8057300
bl sub_8056A04 bl SetFieldVBlankCallback
ldr r0, _080572F8 @ =sub_8056534 ldr r0, _080572F8 @ =sub_8056534
bl sub_80565E0 bl sub_80565E0
ldr r0, _080572FC @ =sub_80565B4 ldr r0, _080572FC @ =sub_80565B4
@@ -5180,7 +5180,7 @@ _080574B8:
bl do_scheduled_bg_tilemap_copies_to_vram bl do_scheduled_bg_tilemap_copies_to_vram
cmp r4, 0 cmp r4, 0
beq _080574E0 beq _080574E0
bl sub_8056A04 bl SetFieldVBlankCallback
_080574E0: _080574E0:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -5347,7 +5347,7 @@ _0805762C:
ldr r0, _08057640 @ =gUnknown_3005050 ldr r0, _08057640 @ =gUnknown_3005050
ldr r1, _08057644 @ =sub_8057748 ldr r1, _08057644 @ =sub_8057748
str r1, [r0] str r1, [r0]
bl sub_8056A04 bl SetFieldVBlankCallback
movs r0, 0 movs r0, 0
strb r0, [r7] strb r0, [r7]
movs r0, 0x1 movs r0, 0x1
asm/party_menu.s
+134 -134
View File
@@ -649,7 +649,7 @@ _0811EF8C:
ldr r4, _0811EFAC @ =gUnknown_203B0B8 ldr r4, _0811EFAC @ =gUnknown_203B0B8
ldr r0, _0811EFB0 @ =gUnknown_8E82700 ldr r0, _0811EFB0 @ =gUnknown_8E82700
mov r1, sp mov r1, sp
bl sub_80F6AA0 bl malloc_and_decompress
adds r1, r0, 0 adds r1, r0, 0
str r1, [r4] str r1, [r4]
ldr r2, [sp] ldr r2, [sp]
@@ -2531,7 +2531,7 @@ sub_811FE24: @ 811FE24
ldr r5, _0811FE60 @ =gUnknown_2021D18 ldr r5, _0811FE60 @ =gUnknown_2021D18
ldr r1, _0811FE64 @ =gUnknown_84176CF ldr r1, _0811FE64 @ =gUnknown_84176CF
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_81202F8 bl sub_81202F8
@@ -2585,7 +2585,7 @@ sub_811FEA4: @ 811FEA4
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -3387,7 +3387,7 @@ _08120468:
ldr r4, _081204A4 @ =gUnknown_2021D18 ldr r4, _081204A4 @ =gUnknown_2021D18
ldr r1, _081204A8 @ =gUnknown_8416C2A ldr r1, _081204A8 @ =gUnknown_8416C2A
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_81202F8 bl sub_81202F8
@@ -3428,7 +3428,7 @@ sub_81204AC: @ 81204AC
ldr r4, _08120504 @ =gUnknown_2021D18 ldr r4, _08120504 @ =gUnknown_2021D18
ldr r1, _08120508 @ =gUnknown_8416CAC ldr r1, _08120508 @ =gUnknown_8416CAC
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_81202F8 bl sub_81202F8
@@ -3462,7 +3462,7 @@ sub_812050C: @ 812050C
ldr r4, _08120550 @ =gUnknown_2021D18 ldr r4, _08120550 @ =gUnknown_2021D18
ldr r1, _08120554 @ =gUnknown_8416C49 ldr r1, _08120554 @ =gUnknown_8416C49
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_81202F8 bl sub_81202F8
@@ -3509,7 +3509,7 @@ sub_8120558: @ 8120558
ldr r4, _081205C0 @ =gUnknown_2021D18 ldr r4, _081205C0 @ =gUnknown_2021D18
ldr r1, _081205C4 @ =gUnknown_8416CEA ldr r1, _081205C4 @ =gUnknown_8416CEA
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_81202F8 bl sub_81202F8
@@ -3536,7 +3536,7 @@ sub_81205C8: @ 81205C8
lsrs r4, r5, 16 lsrs r4, r5, 16
adds r7, r4, 0 adds r7, r4, 0
adds r0, r4, 0 adds r0, r4, 0
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -3634,7 +3634,7 @@ _08120686:
bl StringCopy bl StringCopy
ldr r0, _081206A0 @ =gUnknown_2021D18 ldr r0, _081206A0 @ =gUnknown_2021D18
ldr r1, _081206A4 @ =gUnknown_8416D78 ldr r1, _081206A4 @ =gUnknown_8416D78
bl sub_8008FCC bl StringExpandPlaceholders
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -3929,7 +3929,7 @@ _081208B6:
bne _081208DE bne _081208DE
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8043A70 bl CheckPartyPokerus
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081208DC bne _081208DC
@@ -4198,7 +4198,7 @@ sub_8120AC4: @ 8120AC4
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -4876,7 +4876,7 @@ _08120FAC: .4byte sub_8120FB0
thumb_func_start sub_8120FB0 thumb_func_start sub_8120FB0
sub_8120FB0: @ 8120FB0 sub_8120FB0: @ 8120FB0
push {lr} push {lr}
bl sub_8011174 bl FreeRestoreBattleData
bl sub_804C230 bl sub_804C230
bl sub_815AC20 bl sub_815AC20
ldr r0, _08120FC8 @ =sub_815ABFC ldr r0, _08120FC8 @ =sub_815ABFC
@@ -4982,25 +4982,25 @@ _08121076:
b _081210A0 b _081210A0
_0812107C: _0812107C:
ldr r0, _08121084 @ =gUnknown_845A010 ldr r0, _08121084 @ =gUnknown_845A010
bl sub_8003B24 bl InitWindows
b _081210A6 b _081210A6
.align 2, 0 .align 2, 0
_08121084: .4byte gUnknown_845A010 _08121084: .4byte gUnknown_845A010
_08121088: _08121088:
ldr r0, _08121090 @ =gUnknown_845A050 ldr r0, _08121090 @ =gUnknown_845A050
bl sub_8003B24 bl InitWindows
b _081210A6 b _081210A6
.align 2, 0 .align 2, 0
_08121090: .4byte gUnknown_845A050 _08121090: .4byte gUnknown_845A050
_08121094: _08121094:
ldr r0, _0812109C @ =gUnknown_845A090 ldr r0, _0812109C @ =gUnknown_845A090
bl sub_8003B24 bl InitWindows
b _081210A6 b _081210A6
.align 2, 0 .align 2, 0
_0812109C: .4byte gUnknown_845A090 _0812109C: .4byte gUnknown_845A090
_081210A0: _081210A0:
ldr r0, _081210F4 @ =gUnknown_845A0D0 ldr r0, _081210F4 @ =gUnknown_845A0D0
bl sub_8003B24 bl InitWindows
_081210A6: _081210A6:
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
movs r4, 0 movs r4, 0
@@ -5055,7 +5055,7 @@ _0812110E:
cmp r2, 0x1 cmp r2, 0x1
bne _08121188 bne _08121188
ldr r0, _08121178 @ =gUnknown_845A118 ldr r0, _08121178 @ =gUnknown_845A118
bl sub_8003CE4 bl AddWindow
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -5084,14 +5084,14 @@ _0812110E:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
movs r3, 0x1 movs r3, 0x1
bl sub_812E5A4 bl AddTextPrinterParametrized2
adds r0, r4, 0 adds r0, r4, 0
bl PutWindowTilemap bl PutWindowTilemap
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x2 movs r1, 0x2
bl CopyWindowToVram bl CopyWindowToVram
ldr r0, _08121184 @ =gUnknown_845A110 ldr r0, _08121184 @ =gUnknown_845A110
bl sub_8003CE4 bl AddWindow
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
movs r5, 0 movs r5, 0
@@ -5104,7 +5104,7 @@ _08121180: .4byte gUnknown_8459FFC
_08121184: .4byte gUnknown_845A110 _08121184: .4byte gUnknown_845A110
_08121188: _08121188:
ldr r0, _081211E0 @ =gUnknown_845A108 ldr r0, _081211E0 @ =gUnknown_845A108
bl sub_8003CE4 bl AddWindow
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
movs r5, 0x3 movs r5, 0x3
@@ -5141,7 +5141,7 @@ _08121194:
movs r1, 0 movs r1, 0
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
b _08121224 b _08121224
.align 2, 0 .align 2, 0
_081211E0: .4byte gUnknown_845A108 _081211E0: .4byte gUnknown_845A108
@@ -5172,7 +5172,7 @@ _081211F0:
movs r1, 0 movs r1, 0
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0x1 movs r3, 0x1
bl sub_812E51C bl box_print
_08121224: _08121224:
adds r0, r6, 0 adds r0, r6, 0
bl PutWindowTilemap bl PutWindowTilemap
@@ -5459,7 +5459,7 @@ sub_812142C: @ 812142C
adds r5, r4, 0 adds r5, r4, 0
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
movs r1, 0x5 movs r1, 0x5
bl sub_8004950 bl GetWindowAttribute
lsls r0, 28 lsls r0, 28
lsrs r6, r0, 24 lsrs r6, r0, 24
adds r7, r6, 0 adds r7, r6, 0
@@ -5778,7 +5778,7 @@ sub_8121704: @ 8121704
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0 movs r1, 0
adds r2, r5, 0 adds r2, r5, 0
bl sub_812E51C bl box_print
add sp, 0xC add sp, 0xC
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -5997,7 +5997,7 @@ sub_81218BC: @ 81218BC
adds r5, r4, 0 adds r5, r4, 0
ldrb r0, [r7, 0x8] ldrb r0, [r7, 0x8]
movs r1, 0x5 movs r1, 0x5
bl sub_8004950 bl GetWindowAttribute
lsls r0, 28 lsls r0, 28
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r4, 0 cmp r4, 0
@@ -6303,7 +6303,7 @@ sub_8121B2C: @ 8121B2C
mov r9, r1 mov r9, r1
ldrb r0, [r6, 0x8] ldrb r0, [r6, 0x8]
movs r1, 0x5 movs r1, 0x5
bl sub_8004950 bl GetWindowAttribute
lsls r0, 28 lsls r0, 28
lsrs r7, r0, 24 lsrs r7, r0, 24
mov r1, r8 mov r1, r8
@@ -6486,7 +6486,7 @@ _08121CAA:
ldr r1, [r1] ldr r1, [r1]
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0x1 movs r1, 0x1
bl sub_812E51C bl box_print
_08121CD0: _08121CD0:
add sp, 0xC add sp, 0xC
pop {r3} pop {r3}
@@ -6574,14 +6574,14 @@ _08121D6C: .4byte gUnknown_845A138
_08121D70: _08121D70:
ldr r0, _08121D7C @ =gUnknown_845A140 ldr r0, _08121D7C @ =gUnknown_845A140
_08121D72: _08121D72:
bl sub_8003CE4 bl AddWindow
strb r0, [r5] strb r0, [r5]
b _08121D88 b _08121D88
.align 2, 0 .align 2, 0
_08121D7C: .4byte gUnknown_845A140 _08121D7C: .4byte gUnknown_845A140
_08121D80: _08121D80:
ldr r0, _08121D9C @ =gUnknown_845A120 ldr r0, _08121D9C @ =gUnknown_845A120
bl sub_8003CE4 bl AddWindow
strb r0, [r4, 0xD] strb r0, [r4, 0xD]
_08121D88: _08121D88:
cmp r6, 0 cmp r6, 0
@@ -6615,7 +6615,7 @@ _08121DB0:
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
str r1, [sp] str r1, [sp]
@@ -6761,7 +6761,7 @@ _08121ED2:
str r0, [sp, 0x1C] str r0, [sp, 0x1C]
str r1, [sp, 0x20] str r1, [sp, 0x20]
add r0, sp, 0x1C add r0, sp, 0x1C
bl sub_8003CE4 bl AddWindow
ldr r6, _08121EFC @ =gUnknown_203B09C ldr r6, _08121EFC @ =gUnknown_203B09C
ldr r1, [r6] ldr r1, [r6]
strb r0, [r1, 0xC] strb r0, [r1, 0xC]
@@ -6831,7 +6831,7 @@ _08121F3C:
str r1, [sp, 0x10] str r1, [sp, 0x10]
movs r1, 0x2 movs r1, 0x2
mov r2, r9 mov r2, r9
bl sub_812E5A4 bl AddTextPrinterParametrized2
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -6938,7 +6938,7 @@ _08122030: .4byte gUnknown_845A160
sub_8122034: @ 8122034 sub_8122034: @ 8122034
push {r4,lr} push {r4,lr}
ldr r0, _0812205C @ =gUnknown_845A168 ldr r0, _0812205C @ =gUnknown_845A168
bl sub_8003CE4 bl AddWindow
ldr r4, _08122060 @ =gUnknown_203B09C ldr r4, _08122060 @ =gUnknown_203B09C
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0xC] strb r0, [r1, 0xC]
@@ -6984,7 +6984,7 @@ sub_8122084: @ 8122084
lsrs r4, 24 lsrs r4, 24
ldr r5, _081220CC @ =gUnknown_2021D18 ldr r5, _081220CC @ =gUnknown_2021D18
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r2, _081220D0 @ =gUnknown_3003E50 ldr r2, _081220D0 @ =gUnknown_3003E50
ldrb r0, [r2] ldrb r0, [r2]
movs r1, 0x1 movs r1, 0x1
@@ -7019,7 +7019,7 @@ _081220D0: .4byte gUnknown_3003E50
sub_81220D4: @ 81220D4 sub_81220D4: @ 81220D4
push {r4,lr} push {r4,lr}
ldr r0, _08122108 @ =gUnknown_845A170 ldr r0, _08122108 @ =gUnknown_845A170
bl sub_8003CE4 bl AddWindow
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -7093,7 +7093,7 @@ _0812216C:
cmp r0, 0xFF cmp r0, 0xFF
bne _0812217A bne _0812217A
ldr r0, _081221C8 @ =gUnknown_845A178 ldr r0, _081221C8 @ =gUnknown_845A178
bl sub_8003CE4 bl AddWindow
strb r0, [r4, 0xE] strb r0, [r4, 0xE]
_0812217A: _0812217A:
ldrb r0, [r4, 0xE] ldrb r0, [r4, 0xE]
@@ -7121,7 +7121,7 @@ _0812217A:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x3 movs r2, 0x3
movs r3, 0x6 movs r3, 0x6
bl sub_812E5A4 bl AddTextPrinterParametrized2
ldrb r0, [r4, 0xE] ldrb r0, [r4, 0xE]
bl PutWindowTilemap bl PutWindowTilemap
movs r0, 0x2 movs r0, 0x2
@@ -7553,7 +7553,7 @@ sub_81224D0: @ 81224D0
.align 2, 0 .align 2, 0
_081224F4: .4byte gUnknown_202063C _081224F4: .4byte gUnknown_202063C
_081224F8: _081224F8:
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0812251C beq _0812251C
@@ -7643,7 +7643,7 @@ _08122588:
adds r0, r7, r5 adds r0, r7, r5
ldrb r4, [r0] ldrb r4, [r0]
adds r0, r1, 0 adds r0, r1, 0
bl sub_80980F8 bl itemid_is_mail
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@@ -7676,7 +7676,7 @@ _081225CC:
adds r0, r5, r7 adds r0, r5, r7
ldrb r4, [r0, 0x6] ldrb r4, [r0, 0x6]
adds r0, r1, 0 adds r0, r1, 0
bl sub_80980F8 bl itemid_is_mail
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@@ -8327,7 +8327,7 @@ _08122AB6:
bl GetMonData bl GetMonData
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08122AEC beq _08122AEC
@@ -8727,8 +8727,8 @@ _08122DF8: .4byte gUnknown_203B0A0
_08122DFC: .4byte sub_8122C30 _08122DFC: .4byte sub_8122C30
thumb_func_end sub_8122DBC thumb_func_end sub_8122DBC
thumb_func_start sub_8122E00 thumb_func_start brm_switch
sub_8122E00: @ 8122E00 brm_switch: @ 8122E00
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
lsls r6, 24 lsls r6, 24
@@ -8767,7 +8767,7 @@ _08122E4C: .4byte gUnknown_203B0A0
_08122E50: .4byte gUnknown_203B09C _08122E50: .4byte gUnknown_203B09C
_08122E54: .4byte gUnknown_3005090 _08122E54: .4byte gUnknown_3005090
_08122E58: .4byte sub_811FB28 _08122E58: .4byte sub_811FB28
thumb_func_end sub_8122E00 thumb_func_end brm_switch
thumb_func_start sub_8122E5C thumb_func_start sub_8122E5C
sub_8122E5C: @ 8122E5C sub_8122E5C: @ 8122E5C
@@ -8808,22 +8808,22 @@ _08122E8C:
adds r0, r2, 0 adds r0, r2, 0
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x1 movs r1, 0x1
bl sub_8004950 bl GetWindowAttribute
strh r0, [r6] strh r0, [r6]
add r0, sp, 0x8 add r0, sp, 0x8
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x2 movs r1, 0x2
bl sub_8004950 bl GetWindowAttribute
strh r0, [r6, 0x2] strh r0, [r6, 0x2]
add r0, sp, 0x8 add r0, sp, 0x8
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x3 movs r1, 0x3
bl sub_8004950 bl GetWindowAttribute
strh r0, [r6, 0x4] strh r0, [r6, 0x4]
add r0, sp, 0x8 add r0, sp, 0x8
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x4 movs r1, 0x4
bl sub_8004950 bl GetWindowAttribute
strh r0, [r6, 0x6] strh r0, [r6, 0x6]
strh r4, [r6, 0x10] strh r4, [r6, 0x10]
movs r1, 0x4 movs r1, 0x4
@@ -8855,22 +8855,22 @@ _08122EEE:
adds r0, r2, 0 adds r0, r2, 0
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
movs r1, 0x1 movs r1, 0x1
bl sub_8004950 bl GetWindowAttribute
strh r0, [r6, 0x8] strh r0, [r6, 0x8]
add r0, sp, 0x8 add r0, sp, 0x8
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
movs r1, 0x2 movs r1, 0x2
bl sub_8004950 bl GetWindowAttribute
strh r0, [r6, 0xA] strh r0, [r6, 0xA]
add r0, sp, 0x8 add r0, sp, 0x8
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
movs r1, 0x3 movs r1, 0x3
bl sub_8004950 bl GetWindowAttribute
strh r0, [r6, 0xC] strh r0, [r6, 0xC]
add r0, sp, 0x8 add r0, sp, 0x8
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
movs r1, 0x4 movs r1, 0x4
bl sub_8004950 bl GetWindowAttribute
strh r0, [r6, 0xE] strh r0, [r6, 0xE]
strh r4, [r6, 0x12] strh r4, [r6, 0x12]
movs r1, 0xC movs r1, 0xC
@@ -9339,7 +9339,7 @@ sub_8123270: @ 8123270
ldrsh r0, [r6, r2] ldrsh r0, [r6, r2]
negs r0, r0 negs r0, r0
strh r0, [r6, 0x16] strh r0, [r6, 0x16]
bl sub_81234EC bl swap_pokemon_and_oams
ldr r4, _08123374 @ =gUnknown_203B0A0 ldr r4, _08123374 @ =gUnknown_203B0A0
ldrb r0, [r4, 0x9] ldrb r0, [r4, 0x9]
bl sub_811F234 bl sub_811F234
@@ -9488,8 +9488,8 @@ _08123418:
bx r0 bx r0
thumb_func_end sub_8123388 thumb_func_end sub_8123388
thumb_func_start sub_8123420 thumb_func_start oamt_swap_pos
sub_8123420: @ 8123420 oamt_swap_pos: @ 8123420
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r10 mov r6, r10
mov r5, r9 mov r5, r9
@@ -9591,10 +9591,10 @@ sub_8123420: @ 8123420
bx r0 bx r0
.align 2, 0 .align 2, 0
_081234E8: .4byte gUnknown_202063C _081234E8: .4byte gUnknown_202063C
thumb_func_end sub_8123420 thumb_func_end oamt_swap_pos
thumb_func_start sub_81234EC thumb_func_start swap_pokemon_and_oams
sub_81234EC: @ 81234EC swap_pokemon_and_oams: @ 81234EC
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x8 sub sp, 0x8
ldr r1, _08123580 @ =gUnknown_203B0B4 ldr r1, _08123580 @ =gUnknown_203B0B4
@@ -9639,22 +9639,22 @@ sub_81234EC: @ 81234EC
adds r0, 0xB adds r0, 0xB
ldr r1, [sp, 0x4] ldr r1, [sp, 0x4]
adds r1, 0xB adds r1, 0xB
bl sub_8123420 bl oamt_swap_pos
ldr r0, [sp] ldr r0, [sp]
adds r0, 0xA adds r0, 0xA
ldr r1, [sp, 0x4] ldr r1, [sp, 0x4]
adds r1, 0xA adds r1, 0xA
bl sub_8123420 bl oamt_swap_pos
ldr r0, [sp] ldr r0, [sp]
adds r0, 0x9 adds r0, 0x9
ldr r1, [sp, 0x4] ldr r1, [sp, 0x4]
adds r1, 0x9 adds r1, 0x9
bl sub_8123420 bl oamt_swap_pos
ldr r0, [sp] ldr r0, [sp]
adds r0, 0xC adds r0, 0xC
ldr r1, [sp, 0x4] ldr r1, [sp, 0x4]
adds r1, 0xC adds r1, 0xC
bl sub_8123420 bl oamt_swap_pos
add sp, 0x8 add sp, 0x8
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -9663,7 +9663,7 @@ sub_81234EC: @ 81234EC
_08123580: .4byte gUnknown_203B0B4 _08123580: .4byte gUnknown_203B0B4
_08123584: .4byte gUnknown_203B0A0 _08123584: .4byte gUnknown_203B0A0
_08123588: .4byte gUnknown_2024284 _08123588: .4byte gUnknown_2024284
thumb_func_end sub_81234EC thumb_func_end swap_pokemon_and_oams
thumb_func_start sub_812358C thumb_func_start sub_812358C
sub_812358C: @ 812358C sub_812358C: @ 812358C
@@ -9748,8 +9748,8 @@ _08123638: .4byte gUnknown_3005090
_0812363C: .4byte sub_811FB28 _0812363C: .4byte sub_811FB28
thumb_func_end sub_81235E8 thumb_func_end sub_81235E8
thumb_func_start sub_8123640 thumb_func_start brm_cancel_1
sub_8123640: @ 8123640 brm_cancel_1: @ 8123640
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -9791,7 +9791,7 @@ _08123682:
.align 2, 0 .align 2, 0
_08123698: .4byte gUnknown_3005090 _08123698: .4byte gUnknown_3005090
_0812369C: .4byte sub_811FB28 _0812369C: .4byte sub_811FB28
thumb_func_end sub_8123640 thumb_func_end brm_cancel_1
thumb_func_start sub_81236A0 thumb_func_start sub_81236A0
sub_81236A0: @ 81236A0 sub_81236A0: @ 81236A0
@@ -9937,7 +9937,7 @@ _081237C4: .4byte gUnknown_2024284
_081237C8: .4byte sub_81238A4 _081237C8: .4byte sub_81238A4
_081237CC: _081237CC:
ldrh r0, [r6] ldrh r0, [r6]
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081237F8 beq _081237F8
@@ -10113,7 +10113,7 @@ sub_8123930: @ 8123930
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -10165,7 +10165,7 @@ _081239A4: .4byte gUnknown_3005090
_081239A8: .4byte sub_81203B8 _081239A8: .4byte sub_81203B8
_081239AC: _081239AC:
ldrh r0, [r5] ldrh r0, [r5]
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081239EC beq _081239EC
@@ -10521,7 +10521,7 @@ _08123C9C:
ldr r4, _08123CB8 @ =gUnknown_2021D18 ldr r4, _08123CB8 @ =gUnknown_2021D18
ldr r1, _08123CBC @ =gUnknown_8416C8F ldr r1, _08123CBC @ =gUnknown_8416C8F
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
b _08123CC8 b _08123CC8
.align 2, 0 .align 2, 0
@@ -10752,7 +10752,7 @@ sub_8123E8C: @ 8123E8C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -10871,7 +10871,7 @@ sub_8123F80: @ 8123F80
push {r7} push {r7}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -11423,7 +11423,7 @@ _08124414: .4byte gUnknown_2024284
_08124418: _08124418:
ldr r0, _08124424 @ =gUnknown_2021D18 ldr r0, _08124424 @ =gUnknown_2021D18
ldr r1, _08124428 @ =gUnknown_84170BC ldr r1, _08124428 @ =gUnknown_84170BC
bl sub_8008FCC bl StringExpandPlaceholders
b _08124434 b _08124434
.align 2, 0 .align 2, 0
_08124424: .4byte gUnknown_2021D18 _08124424: .4byte gUnknown_2021D18
@@ -11431,7 +11431,7 @@ _08124428: .4byte gUnknown_84170BC
_0812442C: _0812442C:
ldr r0, _08124478 @ =gUnknown_2021D18 ldr r0, _08124478 @ =gUnknown_2021D18
ldr r1, _0812447C @ =gUnknown_84170E0 ldr r1, _0812447C @ =gUnknown_84170E0
bl sub_8008FCC bl StringExpandPlaceholders
_08124434: _08124434:
movs r0, 0x1A movs r0, 0x1A
bl sub_80722CC bl sub_80722CC
@@ -11472,8 +11472,8 @@ _08124488: .4byte gUnknown_3005090
_0812448C: .4byte sub_81203B8 _0812448C: .4byte sub_81203B8
thumb_func_end sub_8124384 thumb_func_end sub_8124384
thumb_func_start sub_8124490 thumb_func_start brm_trade_1
sub_8124490: @ 8124490 brm_trade_1: @ 8124490
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -11539,7 +11539,7 @@ sub_8124490: @ 8124490
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008FCC bl StringExpandPlaceholders
movs r0, 0x1A movs r0, 0x1A
bl sub_80722CC bl sub_80722CC
ldr r4, _08124574 @ =gUnknown_203B09C ldr r4, _08124574 @ =gUnknown_203B09C
@@ -11588,7 +11588,7 @@ _08124590:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8124490 thumb_func_end brm_trade_1
thumb_func_start nullsub_93 thumb_func_start nullsub_93
nullsub_93: @ 81245A0 nullsub_93: @ 81245A0
@@ -11764,7 +11764,7 @@ _081246F0:
ldr r0, _08124740 @ =gUnknown_2021D18 ldr r0, _08124740 @ =gUnknown_2021D18
ldr r1, _08124744 @ =gUnknown_8417615 ldr r1, _08124744 @ =gUnknown_8417615
_08124720: _08124720:
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r6, 0 adds r0, r6, 0
bl sub_81247C4 bl sub_81247C4
ldr r0, _08124748 @ =gUnknown_203B09C ldr r0, _08124748 @ =gUnknown_203B09C
@@ -11897,7 +11897,7 @@ sub_8124828: @ 8124828
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -12040,7 +12040,7 @@ task_brm_cancel_1_on_keypad_a_or_b: @ 812492C
beq _0812494C beq _0812494C
_08124946: _08124946:
adds r0, r2, 0 adds r0, r2, 0
bl sub_8123640 bl brm_cancel_1
_0812494C: _0812494C:
pop {r0} pop {r0}
bx r0 bx r0
@@ -12279,7 +12279,7 @@ hm_prepare_waterfall: @ 8124AF8
bl sub_8058F78 bl sub_8058F78
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_805A104 bl MetatileBehavior_IsWaterfall
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -12531,7 +12531,7 @@ _08124D0C:
_08124D16: _08124D16:
ldr r0, _08124D30 @ =gUnknown_203AD30 ldr r0, _08124D30 @ =gUnknown_203AD30
ldrh r0, [r0] ldrh r0, [r0]
bl sub_809A260 bl GetPocketByItemId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x5 cmp r0, 0x5
@@ -12549,7 +12549,7 @@ _08124D3C: .4byte sub_8124DB0
_08124D40: .4byte sub_8124FC8 _08124D40: .4byte sub_8124FC8
_08124D44: _08124D44:
ldrh r0, [r4] ldrh r0, [r4]
bl sub_809A260 bl GetPocketByItemId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x4 cmp r0, 0x4
@@ -12986,7 +12986,7 @@ _0812507C:
_081250C8: _081250C8:
ldr r0, _081250D4 @ =gUnknown_2021D18 ldr r0, _081250D4 @ =gUnknown_2021D18
ldr r1, _081250D8 @ =gUnknown_8416F4E ldr r1, _081250D8 @ =gUnknown_8416F4E
bl sub_8008FCC bl StringExpandPlaceholders
b _0812520C b _0812520C
.align 2, 0 .align 2, 0
_081250D4: .4byte gUnknown_2021D18 _081250D4: .4byte gUnknown_2021D18
@@ -12994,7 +12994,7 @@ _081250D8: .4byte gUnknown_8416F4E
_081250DC: _081250DC:
ldr r0, _081250E8 @ =gUnknown_2021D18 ldr r0, _081250E8 @ =gUnknown_2021D18
ldr r1, _081250EC @ =gUnknown_8416F8C ldr r1, _081250EC @ =gUnknown_8416F8C
bl sub_8008FCC bl StringExpandPlaceholders
b _0812520C b _0812520C
.align 2, 0 .align 2, 0
_081250E8: .4byte gUnknown_2021D18 _081250E8: .4byte gUnknown_2021D18
@@ -13002,7 +13002,7 @@ _081250EC: .4byte gUnknown_8416F8C
_081250F0: _081250F0:
ldr r0, _081250FC @ =gUnknown_2021D18 ldr r0, _081250FC @ =gUnknown_2021D18
ldr r1, _08125100 @ =gUnknown_8416F9A ldr r1, _08125100 @ =gUnknown_8416F9A
bl sub_8008FCC bl StringExpandPlaceholders
b _0812520C b _0812520C
.align 2, 0 .align 2, 0
_081250FC: .4byte gUnknown_2021D18 _081250FC: .4byte gUnknown_2021D18
@@ -13010,7 +13010,7 @@ _08125100: .4byte gUnknown_8416F9A
_08125104: _08125104:
ldr r0, _08125110 @ =gUnknown_2021D18 ldr r0, _08125110 @ =gUnknown_2021D18
ldr r1, _08125114 @ =gUnknown_8416FB2 ldr r1, _08125114 @ =gUnknown_8416FB2
bl sub_8008FCC bl StringExpandPlaceholders
b _0812520C b _0812520C
.align 2, 0 .align 2, 0
_08125110: .4byte gUnknown_2021D18 _08125110: .4byte gUnknown_2021D18
@@ -13018,7 +13018,7 @@ _08125114: .4byte gUnknown_8416FB2
_08125118: _08125118:
ldr r0, _08125124 @ =gUnknown_2021D18 ldr r0, _08125124 @ =gUnknown_2021D18
ldr r1, _08125128 @ =gUnknown_8416F6F ldr r1, _08125128 @ =gUnknown_8416F6F
bl sub_8008FCC bl StringExpandPlaceholders
b _0812520C b _0812520C
.align 2, 0 .align 2, 0
_08125124: .4byte gUnknown_2021D18 _08125124: .4byte gUnknown_2021D18
@@ -13026,7 +13026,7 @@ _08125128: .4byte gUnknown_8416F6F
_0812512C: _0812512C:
ldr r0, _08125138 @ =gUnknown_2021D18 ldr r0, _08125138 @ =gUnknown_2021D18
ldr r1, _0812513C @ =gUnknown_8417052 ldr r1, _0812513C @ =gUnknown_8417052
bl sub_8008FCC bl StringExpandPlaceholders
b _0812520C b _0812520C
.align 2, 0 .align 2, 0
_08125138: .4byte gUnknown_2021D18 _08125138: .4byte gUnknown_2021D18
@@ -13034,7 +13034,7 @@ _0812513C: .4byte gUnknown_8417052
_08125140: _08125140:
ldr r0, _0812514C @ =gUnknown_2021D18 ldr r0, _0812514C @ =gUnknown_2021D18
ldr r1, _08125150 @ =gUnknown_8417075 ldr r1, _08125150 @ =gUnknown_8417075
bl sub_8008FCC bl StringExpandPlaceholders
b _0812520C b _0812520C
.align 2, 0 .align 2, 0
_0812514C: .4byte gUnknown_2021D18 _0812514C: .4byte gUnknown_2021D18
@@ -13042,7 +13042,7 @@ _08125150: .4byte gUnknown_8417075
_08125154: _08125154:
ldr r0, _08125160 @ =gUnknown_2021D18 ldr r0, _08125160 @ =gUnknown_2021D18
ldr r1, _08125164 @ =gUnknown_8416FED ldr r1, _08125164 @ =gUnknown_8416FED
bl sub_8008FCC bl StringExpandPlaceholders
b _0812520C b _0812520C
.align 2, 0 .align 2, 0
_08125160: .4byte gUnknown_2021D18 _08125160: .4byte gUnknown_2021D18
@@ -13089,7 +13089,7 @@ _081251BC:
bl StringCopy bl StringCopy
ldr r0, _081251D4 @ =gUnknown_2021D18 ldr r0, _081251D4 @ =gUnknown_2021D18
ldr r1, _081251D8 @ =gUnknown_8417032 ldr r1, _081251D8 @ =gUnknown_8417032
bl sub_8008FCC bl StringExpandPlaceholders
b _0812520C b _0812520C
.align 2, 0 .align 2, 0
_081251CC: .4byte gUnknown_2021CF0 _081251CC: .4byte gUnknown_2021CF0
@@ -13099,7 +13099,7 @@ _081251D8: .4byte gUnknown_8417032
_081251DC: _081251DC:
ldr r0, _081251E8 @ =gUnknown_2021D18 ldr r0, _081251E8 @ =gUnknown_2021D18
ldr r1, _081251EC @ =gUnknown_8417002 ldr r1, _081251EC @ =gUnknown_8417002
bl sub_8008FCC bl StringExpandPlaceholders
b _0812520C b _0812520C
.align 2, 0 .align 2, 0
_081251E8: .4byte gUnknown_2021D18 _081251E8: .4byte gUnknown_2021D18
@@ -13107,7 +13107,7 @@ _081251EC: .4byte gUnknown_8417002
_081251F0: _081251F0:
ldr r0, _081251FC @ =gUnknown_2021D18 ldr r0, _081251FC @ =gUnknown_2021D18
ldr r1, _08125200 @ =gUnknown_8416FC7 ldr r1, _08125200 @ =gUnknown_8416FC7
bl sub_8008FCC bl StringExpandPlaceholders
b _0812520C b _0812520C
.align 2, 0 .align 2, 0
_081251FC: .4byte gUnknown_2021D18 _081251FC: .4byte gUnknown_2021D18
@@ -13115,7 +13115,7 @@ _08125200: .4byte gUnknown_8416FC7
_08125204: _08125204:
ldr r0, _08125210 @ =gUnknown_2021D18 ldr r0, _08125210 @ =gUnknown_2021D18
ldr r1, _08125214 @ =gUnknown_84169DC ldr r1, _08125214 @ =gUnknown_84169DC
bl sub_8008FCC bl StringExpandPlaceholders
_0812520C: _0812520C:
pop {r0} pop {r0}
bx r0 bx r0
@@ -13316,7 +13316,7 @@ _08125380:
adds r0, r7, 0 adds r0, r7, 0
bl sub_8124DC0 bl sub_8124DC0
ldr r1, _081253A8 @ =gUnknown_3005E98 ldr r1, _081253A8 @ =gUnknown_3005E98
ldr r0, _081253AC @ =sub_81253B0 ldr r0, _081253AC @ =ItemUseCB_Medicine
str r0, [r1] str r0, [r1]
_08125398: _08125398:
pop {r3} pop {r3}
@@ -13327,11 +13327,11 @@ _08125398:
.align 2, 0 .align 2, 0
_081253A4: .4byte 0x0000ffff _081253A4: .4byte 0x0000ffff
_081253A8: .4byte gUnknown_3005E98 _081253A8: .4byte gUnknown_3005E98
_081253AC: .4byte sub_81253B0 _081253AC: .4byte ItemUseCB_Medicine
thumb_func_end sub_81252D0 thumb_func_end sub_81252D0
thumb_func_start sub_81253B0 thumb_func_start ItemUseCB_Medicine
sub_81253B0: @ 81253B0 ItemUseCB_Medicine: @ 81253B0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -13523,7 +13523,7 @@ _08125538:
_08125548: .4byte gUnknown_2021CD0 _08125548: .4byte gUnknown_2021CD0
_0812554C: .4byte gUnknown_2021D18 _0812554C: .4byte gUnknown_2021D18
_08125550: .4byte gUnknown_3005090 _08125550: .4byte gUnknown_3005090
thumb_func_end sub_81253B0 thumb_func_end ItemUseCB_Medicine
thumb_func_start sub_8125554 thumb_func_start sub_8125554
sub_8125554: @ 8125554 sub_8125554: @ 8125554
@@ -13543,7 +13543,7 @@ sub_8125554: @ 8125554
ldr r4, _081255AC @ =gUnknown_2021D18 ldr r4, _081255AC @ =gUnknown_2021D18
ldr r1, _081255B0 @ =gUnknown_8416F27 ldr r1, _081255B0 @ =gUnknown_8416F27
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_81202F8 bl sub_81202F8
@@ -14220,7 +14220,7 @@ sub_8125AF0: @ 8125AF0
adds r1, r0, 0 adds r1, r0, 0
ldr r4, _08125B10 @ =gUnknown_2021D18 ldr r4, _08125B10 @ =gUnknown_2021D18
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_81202F8 bl sub_81202F8
@@ -14422,7 +14422,7 @@ _08125C84:
ldr r4, _08125CE4 @ =gUnknown_2021D18 ldr r4, _08125CE4 @ =gUnknown_2021D18
ldr r1, _08125CE8 @ =gUnknown_8416DB3 ldr r1, _08125CE8 @ =gUnknown_8416DB3
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_81202F8 bl sub_81202F8
@@ -14561,7 +14561,7 @@ sub_8125DBC: @ 8125DBC
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -14951,7 +14951,7 @@ sub_81260D8: @ 81260D8
ldr r4, _0812612C @ =gUnknown_2021D18 ldr r4, _0812612C @ =gUnknown_2021D18
ldr r1, _08126130 @ =gUnknown_8416E6B ldr r1, _08126130 @ =gUnknown_8416E6B
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_81202F8 bl sub_81202F8
@@ -15016,7 +15016,7 @@ sub_8126170: @ 8126170
muls r1, r0 muls r1, r0
ldr r0, _081261A4 @ =gUnknown_2024284 ldr r0, _081261A4 @ =gUnknown_2024284
adds r4, r1, r0 adds r4, r1, r0
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r5, r0, 24 asrs r5, r0, 24
cmp r5, 0 cmp r5, 0
@@ -15050,7 +15050,7 @@ _081261AE:
ldr r4, _08126200 @ =gUnknown_2021D18 ldr r4, _08126200 @ =gUnknown_2021D18
ldr r1, _08126204 @ =gUnknown_8416E84 ldr r1, _08126204 @ =gUnknown_8416E84
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_81202F8 bl sub_81202F8
@@ -15149,8 +15149,8 @@ _081262A4:
bx r0 bx r0
thumb_func_end sub_812628C thumb_func_end sub_812628C
thumb_func_start sub_81262AC thumb_func_start dp05_rare_candy
sub_81262AC: @ 81262AC dp05_rare_candy: @ 81262AC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -15225,7 +15225,7 @@ _0812633C:
.align 2, 0 .align 2, 0
_08126348: .4byte gUnknown_3005E98 _08126348: .4byte gUnknown_3005E98
_0812634C: .4byte sub_8126350 _0812634C: .4byte sub_8126350
thumb_func_end sub_81262AC thumb_func_end dp05_rare_candy
thumb_func_start sub_8126350 thumb_func_start sub_8126350
sub_8126350: @ 8126350 sub_8126350: @ 8126350
@@ -15293,7 +15293,7 @@ sub_8126350: @ 8126350
ldr r4, _08126430 @ =gUnknown_2021D18 ldr r4, _08126430 @ =gUnknown_2021D18
ldr r1, _08126434 @ =gUnknown_8417017 ldr r1, _08126434 @ =gUnknown_8417017
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_81202F8 bl sub_81202F8
@@ -15760,7 +15760,7 @@ sub_8126770: @ 8126770
ldr r4, _081267F4 @ =gUnknown_2021D18 ldr r4, _081267F4 @ =gUnknown_2021D18
ldr r1, _081267F8 @ =gUnknown_8416DF7 ldr r1, _081267F8 @ =gUnknown_8416DF7
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_81202F8 bl sub_81202F8
@@ -15824,7 +15824,7 @@ sub_8126804: @ 8126804
ldr r4, _08126884 @ =gUnknown_2021D18 ldr r4, _08126884 @ =gUnknown_2021D18
ldr r1, _08126888 @ =gUnknown_8416DB3 ldr r1, _08126888 @ =gUnknown_8416DB3
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_81202F8 bl sub_81202F8
@@ -16165,7 +16165,7 @@ sub_8126AFC: @ 8126AFC
ldr r4, _08126B50 @ =gUnknown_2021D18 ldr r4, _08126B50 @ =gUnknown_2021D18
ldr r1, _08126B54 @ =gUnknown_8416F27 ldr r1, _08126B54 @ =gUnknown_8416F27
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_81202F8 bl sub_81202F8
@@ -16655,7 +16655,7 @@ sub_8126EDC: @ 8126EDC
sub sp, 0xC sub sp, 0xC
ldr r0, _08126EF8 @ =gUnknown_203AD30 ldr r0, _08126EF8 @ =gUnknown_203AD30
ldrh r0, [r0] ldrh r0, [r0]
bl sub_809A260 bl GetPocketByItemId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x4 cmp r0, 0x4
@@ -16736,7 +16736,7 @@ _08126F84: .4byte gUnknown_203B0A0
_08126F88: .4byte gUnknown_2024284 _08126F88: .4byte gUnknown_2024284
_08126F8C: _08126F8C:
ldrh r0, [r5] ldrh r0, [r5]
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08126FA0 beq _08126FA0
@@ -16780,7 +16780,7 @@ sub_8126FD8: @ 8126FD8
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r5, _08127004 @ =gUnknown_203B0A0 ldr r5, _08127004 @ =gUnknown_203B0A0
ldrh r0, [r5, 0xC] ldrh r0, [r5, 0xC]
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08127010 beq _08127010
@@ -17093,7 +17093,7 @@ sub_8127268: @ 8127268
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -17135,7 +17135,7 @@ _081272C4: .4byte gUnknown_203B0D8
_081272C8: .4byte gUnknown_2021D18 _081272C8: .4byte gUnknown_2021D18
_081272CC: _081272CC:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80980F8 bl itemid_is_mail
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081272F0 beq _081272F0
@@ -18090,7 +18090,7 @@ _08127A2C: .4byte sub_8107ECC
_08127A30: _08127A30:
ldr r0, _08127A74 @ =gUnknown_203AD30 ldr r0, _08127A74 @ =gUnknown_203AD30
ldrh r0, [r0] ldrh r0, [r0]
bl sub_809A260 bl GetPocketByItemId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r4, _08127A78 @ =sub_8107ECC ldr r4, _08127A78 @ =sub_8107ECC
@@ -18361,7 +18361,7 @@ _08127C64:
ldr r0, _08127CA4 @ =gUnknown_2021D18 ldr r0, _08127CA4 @ =gUnknown_2021D18
ldr r1, _08127CA8 @ =gUnknown_8416A1E ldr r1, _08127CA8 @ =gUnknown_8416A1E
_08127C86: _08127C86:
bl sub_8008FCC bl StringExpandPlaceholders
_08127C8A: _08127C8A:
movs r0, 0 movs r0, 0
_08127C8C: _08127C8C:
@@ -19302,7 +19302,7 @@ sub_8128370: @ 8128370
push {lr} push {lr}
sub sp, 0xC sub sp, 0xC
ldr r1, _08128398 @ =gUnknown_3005024 ldr r1, _08128398 @ =gUnknown_3005024
ldr r0, _0812839C @ =sub_81283E4 ldr r0, _0812839C @ =hm_add_c3_without_phase_2
str r0, [r1] str r0, [r1]
movs r0, 0xF movs r0, 0xF
str r0, [sp] str r0, [sp]
@@ -19320,7 +19320,7 @@ sub_8128370: @ 8128370
bx r0 bx r0
.align 2, 0 .align 2, 0
_08128398: .4byte gUnknown_3005024 _08128398: .4byte gUnknown_3005024
_0812839C: .4byte sub_81283E4 _0812839C: .4byte hm_add_c3_without_phase_2
_081283A0: .4byte sub_811FB28 _081283A0: .4byte sub_811FB28
_081283A4: .4byte c2_exit_to_overworld_2_switch _081283A4: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8128370 thumb_func_end sub_8128370
@@ -19332,7 +19332,7 @@ sub_81283A8: @ 81283A8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _081283D4 @ =gUnknown_3005024 ldr r2, _081283D4 @ =gUnknown_3005024
ldr r1, _081283D8 @ =sub_81283E4 ldr r1, _081283D8 @ =hm_add_c3_without_phase_2
str r1, [r2] str r1, [r2]
movs r1, 0 movs r1, 0
str r1, [sp] str r1, [sp]
@@ -19349,27 +19349,27 @@ sub_81283A8: @ 81283A8
bx r0 bx r0
.align 2, 0 .align 2, 0
_081283D4: .4byte gUnknown_3005024 _081283D4: .4byte gUnknown_3005024
_081283D8: .4byte sub_81283E4 _081283D8: .4byte hm_add_c3_without_phase_2
_081283DC: .4byte sub_811FB28 _081283DC: .4byte sub_811FB28
_081283E0: .4byte c2_exit_to_overworld_2_switch _081283E0: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_81283A8 thumb_func_end sub_81283A8
thumb_func_start sub_81283E4 thumb_func_start hm_add_c3_without_phase_2
sub_81283E4: @ 81283E4 hm_add_c3_without_phase_2: @ 81283E4
push {lr} push {lr}
bl sub_807DC00 bl sub_807DC00
ldr r0, _081283F8 @ =sub_81283FC ldr r0, _081283F8 @ =task_hm_without_phase_2
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
movs r0, 0x1 movs r0, 0x1
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_081283F8: .4byte sub_81283FC _081283F8: .4byte task_hm_without_phase_2
thumb_func_end sub_81283E4 thumb_func_end hm_add_c3_without_phase_2
thumb_func_start sub_81283FC thumb_func_start task_hm_without_phase_2
sub_81283FC: @ 81283FC task_hm_without_phase_2: @ 81283FC
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -19385,6 +19385,6 @@ _0812841A:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_81283FC thumb_func_end task_hm_without_phase_2
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/player_pc.s
+4 -4
View File
@@ -145,7 +145,7 @@ _080EB778: .4byte gUnknown_8402248
_080EB77C: _080EB77C:
ldr r0, _080EB804 @ =gUnknown_8402250 ldr r0, _080EB804 @ =gUnknown_8402250
_080EB77E: _080EB77E:
bl sub_8003CE4 bl AddWindow
strh r0, [r7, 0x14] strh r0, [r7, 0x14]
ldrb r0, [r7, 0x14] ldrb r0, [r7, 0x14]
movs r1, 0 movs r1, 0
@@ -459,7 +459,7 @@ _080EBA18:
bl sub_812B1F0 bl sub_812B1F0
_080EBA1E: _080EBA1E:
ldr r0, _080EBA80 @ =gUnknown_8402258 ldr r0, _080EBA80 @ =gUnknown_8402258
bl sub_8003CE4 bl AddWindow
strh r0, [r6, 0x14] strh r0, [r6, 0x14]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1255,7 +1255,7 @@ _080EC06C:
ldr r4, _080EC088 @ =gUnknown_2021D18 ldr r4, _080EC088 @ =gUnknown_2021D18
ldr r1, _080EC08C @ =gUnknown_8417806 ldr r1, _080EC08C @ =gUnknown_8417806
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008FCC bl StringExpandPlaceholders
ldr r3, _080EC090 @ =sub_80EC0D8 ldr r3, _080EC090 @ =sub_80EC0D8
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x2 movs r1, 0x2
@@ -1599,7 +1599,7 @@ sub_80EC324: @ 80EC324
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_81100C8 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
movs r1, 0x1 movs r1, 0x1

Some files were not shown because too many files have changed in this diff Show More