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

Merge branch 'master' into vs_seeker

Browse Source
This commit is contained in:
PikalaxALT
2018-10-17 11:05:44 -07:00
parent 46e957bacd d05339979e
commit aa6e1a91fc
134 changed files with 12517 additions and 22323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+10 -10
View File
@@ -537,7 +537,7 @@ _0800F5E8:
beq _0800F666
cmp r2, 0x1
bne _0800F632
ldr r2, _0800F620 @ =gUnknown_202273C
ldr r2, _0800F620 @ =gLinkPlayers
ldr r0, _0800F624 @ =gBattleStruct
ldr r0, [r0]
adds r0, 0xB5
@@ -556,7 +556,7 @@ _0800F5E8:
b _0800F6F0
.align 2, 0
_0800F61C: .4byte gBattleTypeFlags
_0800F620: .4byte gUnknown_202273C
_0800F620: .4byte gLinkPlayers
_0800F624: .4byte gBattleStruct
_0800F628:
cmp r0, 0x2
@@ -565,7 +565,7 @@ _0800F628:
bne _0800F6F0
b _0800F682
_0800F632:
ldr r2, _0800F654 @ =gUnknown_202273C
ldr r2, _0800F654 @ =gLinkPlayers
ldr r0, _0800F658 @ =gBattleStruct
ldr r0, [r0]
adds r0, 0xB5
@@ -583,7 +583,7 @@ _0800F632:
beq _0800F682
b _0800F6F0
.align 2, 0
_0800F654: .4byte gUnknown_202273C
_0800F654: .4byte gLinkPlayers
_0800F658: .4byte gBattleStruct
_0800F65C:
cmp r0, 0x2
@@ -594,7 +594,7 @@ _0800F65C:
_0800F666:
cmp r2, 0x1
bne _0800F6A4
ldr r2, _0800F694 @ =gUnknown_202273C
ldr r2, _0800F694 @ =gLinkPlayers
ldr r0, _0800F698 @ =gBattleStruct
ldr r0, [r0]
adds r0, 0xB5
@@ -615,12 +615,12 @@ _0800F682:
bl sub_80D87BC
b _0800F6F0
.align 2, 0
_0800F694: .4byte gUnknown_202273C
_0800F694: .4byte gLinkPlayers
_0800F698: .4byte gBattleStruct
_0800F69C: .4byte gUnknown_83FE874
_0800F6A0: .4byte gUnknown_83FE87B
_0800F6A4:
ldr r2, _0800F6D0 @ =gUnknown_202273C
ldr r2, _0800F6D0 @ =gLinkPlayers
ldr r0, _0800F6D4 @ =gBattleStruct
ldr r0, [r0]
adds r0, 0xB5
@@ -641,7 +641,7 @@ _0800F6BC:
bl sub_80D87BC
b _0800F6F0
.align 2, 0
_0800F6D0: .4byte gUnknown_202273C
_0800F6D0: .4byte gLinkPlayers
_0800F6D4: .4byte gBattleStruct
_0800F6D8: .4byte gUnknown_83FE874
_0800F6DC: .4byte gUnknown_83FE87B
@@ -781,7 +781,7 @@ _0800F7CC:
adds r6, r5, 0
eors r6, r0
adds r1, r6, 0
ldr r4, _0800F848 @ =gUnknown_202273C
ldr r4, _0800F848 @ =gLinkPlayers
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
@@ -832,7 +832,7 @@ _0800F830:
b _0800FAC4
.align 2, 0
_0800F844: .4byte gBattleStruct
_0800F848: .4byte gUnknown_202273C
_0800F848: .4byte gLinkPlayers
_0800F84C: .4byte gTasks
_0800F850:
ldr r0, _0800F8CC @ =0x00002710
asm/battle_2.s
+284 -284
View File
File diff suppressed because it is too large Load Diff
asm/battle_ai_switch_items.s
+41 -41
View File
@@ -28,7 +28,7 @@ ShouldSwitchIfPerishSong: @ 8039188
cmp r0, 0
bne _080391E4
adds r0, r2, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
ldr r1, _080391E0 @ =gBattleStruct
@@ -73,7 +73,7 @@ _08039204: .4byte gBattleTypeFlags
_08039208:
ldr r0, _0803922C @ =gActiveBattler
ldrb r0, [r0]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
ldr r1, _08039230 @ =gBattleStruct
@@ -93,7 +93,7 @@ _08039230: .4byte gBattleStruct
_08039234:
ldr r4, _0803936C @ =gBattleMons
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0x58
@@ -106,7 +106,7 @@ _08039234:
b _0803935C
_08039250:
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r2, r0, 24
movs r6, 0
@@ -185,7 +185,7 @@ _080392A4:
movs r1, 0x2E
bl GetMonData
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r2, r0, 24
movs r4, 0
@@ -305,12 +305,12 @@ _080393D6:
beq _08039442
mov r8, r3
mov r0, r8
bl GetBankIdentity
bl GetBattlerPosition
movs r4, 0x2
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _08039424 @ =gAbsentBattlerFlags
ldrb r1, [r1]
ldr r2, _08039428 @ =gBitTable
@@ -333,11 +333,11 @@ _08039424: .4byte gAbsentBattlerFlags
_08039428: .4byte gBitTable
_0803942C:
ldrb r0, [r5]
bl GetBankIdentity
bl GetBattlerPosition
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r7, r0, 24
b _08039446
@@ -396,7 +396,7 @@ _0803949C: .4byte gBattleMons
_080394A0:
ldr r0, _080394C4 @ =gActiveBattler
ldrb r0, [r0]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
ldr r1, _080394C8 @ =gBattleStruct
@@ -616,7 +616,7 @@ _08039664:
ldr r0, _08039690 @ =gActiveBattler
ldrb r0, [r0]
_08039668:
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
ldr r1, _08039694 @ =gBattleStruct
@@ -650,7 +650,7 @@ ai_has_super_effective_move_on_field: @ 8039698
lsrs r0, 24
mov r8, r0
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r3, r0, 24
ldr r0, _08039730 @ =gAbsentBattlerFlags
@@ -727,7 +727,7 @@ _08039744:
b _080397C4
_08039748:
movs r0, 0x2
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r3, r0, 24
ldr r0, _080397D0 @ =gAbsentBattlerFlags
@@ -898,12 +898,12 @@ _0803987A:
beq _08039918
mov r9, r3
mov r0, r9
bl GetBankIdentity
bl GetBattlerPosition
movs r4, 0x2
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080398CC @ =gAbsentBattlerFlags
ldrb r1, [r1]
ldr r2, _080398D0 @ =gBitTable
@@ -928,11 +928,11 @@ _080398CC: .4byte gAbsentBattlerFlags
_080398D0: .4byte gBitTable
_080398D4:
ldrb r0, [r5]
bl GetBankIdentity
bl GetBattlerPosition
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -940,7 +940,7 @@ _080398D4:
_080398EC:
ldr r0, _08039910 @ =gActiveBattler
ldrb r0, [r0]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
ldr r1, _08039914 @ =gBattleStruct
@@ -1170,7 +1170,7 @@ _08039ABA:
adds r1, r2, 0
movs r2, 0x17
movs r3, 0
bl sub_8019F18
bl AbilityBattleEffects
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -1182,7 +1182,7 @@ _08039AD2:
movs r0, 0xC
movs r2, 0x47
movs r3, 0
bl sub_8019F18
bl AbilityBattleEffects
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -1194,7 +1194,7 @@ _08039AEA:
movs r1, 0
movs r2, 0x2A
movs r3, 0
bl sub_8019F18
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
beq _08039B1C
@@ -1226,12 +1226,12 @@ _08039B1C:
ldr r4, _08039B60 @ =gActiveBattler
ldrb r7, [r4]
adds r0, r7, 0
bl GetBankIdentity
bl GetBattlerPosition
movs r5, 0x2
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _08039B70 @ =gAbsentBattlerFlags
ldrb r1, [r1]
ldr r2, _08039B74 @ =gBitTable
@@ -1254,11 +1254,11 @@ _08039B70: .4byte gAbsentBattlerFlags
_08039B74: .4byte gBitTable
_08039B78:
ldrb r0, [r4]
bl GetBankIdentity
bl GetBattlerPosition
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r6, r0, 24
b _08039B94
@@ -1396,7 +1396,7 @@ _08039C94:
beq _08039D8C
ldr r0, _08039CE0 @ =gActiveBattler
ldrb r0, [r0]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
ldr r1, _08039CE4 @ =gBattleStruct
@@ -1417,7 +1417,7 @@ _08039C94:
cmp r0, 0
bne _08039CE8
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
@@ -1428,11 +1428,11 @@ _08039CE0: .4byte gActiveBattler
_08039CE4: .4byte gBattleStruct
_08039CE8:
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0x3
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r5, r0, 24
_08039CFC:
@@ -1476,7 +1476,7 @@ _08039D3E:
_08039D44:
ldr r0, _08039D88 @ =gActiveBattler
ldrb r0, [r0]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
ldr r1, _08039D84 @ =gBattleStruct
@@ -1487,7 +1487,7 @@ _08039D44:
_08039D5A:
ldr r4, _08039D88 @ =gActiveBattler
ldrb r0, [r4]
bl GetBankIdentity
bl GetBattlerPosition
ldrb r2, [r4]
ldr r1, _08039D84 @ =gBattleStruct
ldr r1, [r1]
@@ -1628,12 +1628,12 @@ _08039E5E:
beq _08039EF8
str r2, [sp, 0xC]
adds r0, r2, 0
bl GetBankIdentity
bl GetBattlerPosition
movs r5, 0x2
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _08039EA4 @ =gAbsentBattlerFlags
ldrb r1, [r1]
ldr r2, _08039EA8 @ =gBitTable
@@ -1655,11 +1655,11 @@ _08039EA4: .4byte gAbsentBattlerFlags
_08039EA8: .4byte gBitTable
_08039EAC:
ldrb r0, [r4]
bl GetBankIdentity
bl GetBattlerPosition
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x10]
@@ -1690,7 +1690,7 @@ _08039EF0: .4byte gAbsentBattlerFlags
_08039EF4: .4byte gBitTable
_08039EF8:
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -2151,7 +2151,7 @@ _0803A26E:
bne _0803A286
b _0803A644
_0803A286:
ldr r1, _0803A2B0 @ =gUnknown_82528BC
ldr r1, _0803A2B0 @ =gItemEffectTable
subs r0, 0xD
lsls r0, 2
adds r0, r1
@@ -2171,7 +2171,7 @@ _0803A296:
.align 2, 0
_0803A2A8: .4byte gEnemyParty
_0803A2AC: .4byte gBattleResources
_0803A2B0: .4byte gUnknown_82528BC
_0803A2B0: .4byte gItemEffectTable
_0803A2B4: .4byte gSaveBlock1Ptr
_0803A2B8: .4byte 0x00003108
_0803A2BC:
@@ -2576,7 +2576,7 @@ _0803A5C4: .4byte gDisableStructs
_0803A5C8:
ldr r4, _0803A630 @ =gActiveBattler
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r3, r0, 24
ldr r2, _0803A634 @ =gDisableStructs
@@ -2588,7 +2588,7 @@ _0803A5C8:
ldrb r0, [r0, 0x16]
cmp r0, 0
beq _0803A5F8
ldr r0, _0803A638 @ =gUnknown_2023DE4
ldr r0, _0803A638 @ =gSideTimers
lsls r1, r3, 1
adds r1, r3
lsls r1, 2
@@ -2628,7 +2628,7 @@ _0803A5FC:
.align 2, 0
_0803A630: .4byte gActiveBattler
_0803A634: .4byte gDisableStructs
_0803A638: .4byte gUnknown_2023DE4
_0803A638: .4byte gSideTimers
_0803A63C: .4byte gBattleStruct
_0803A640: .4byte gBattleResources
_0803A644:
asm/battle_anim.s
+24 -24
View File
@@ -156,7 +156,7 @@ sub_80725D4: @ 80725D4
_08072600:
lsls r0, r4, 24
lsrs r0, 24
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08072624
@@ -994,7 +994,7 @@ _08072C62:
cmp r0, 0
beq _08072D12
adds r0, r5, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -1078,7 +1078,7 @@ _08072D12:
cmp r0, 0
beq _08072DCE
adds r0, r5, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -1325,7 +1325,7 @@ _08072E5E:
adds r0, r4, 0
bl CpuSet
adds r0, r7, 0
bl GetBankIdentity
bl GetBattlerPosition
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -1451,7 +1451,7 @@ _08072F84:
adds r0, r4, 0
bl CpuSet
adds r0, r7, 0
bl GetBankIdentity
bl GetBattlerPosition
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -1817,7 +1817,7 @@ sub_807331C: @ 807331C
cmp r0, 0x1
beq _0807338E
ldrb r0, [r4, 0xC]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -1902,7 +1902,7 @@ _080733CE:
cmp r0, 0
beq _08073416
adds r0, r4, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -1940,7 +1940,7 @@ _08073416:
cmp r0, 0
beq _08073464
adds r0, r4, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -2115,7 +2115,7 @@ sub_8073558: @ 8073558
ldrb r4, [r5, 0xC]
adds r6, r4, 0
adds r0, r4, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -2471,7 +2471,7 @@ sub_80737E4: @ 80737E4
lsrs r4, r0, 24
ldr r0, _08073828 @ =gUnknown_2037F1B
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08073830
@@ -2787,7 +2787,7 @@ sub_8073A44: @ 8073A44
cmp r0, 0
beq _08073A80
adds r0, r2, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
movs r4, 0xC0
cmp r0, 0
@@ -2799,13 +2799,13 @@ _08073A78: .4byte gUnknown_2024018
_08073A7C: .4byte gUnknown_2037F1A
_08073A80:
adds r0, r2, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08073ABA
ldr r0, _08073AA8 @ =gUnknown_2037F1B
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08073AE6
@@ -2828,7 +2828,7 @@ _08073AAC:
_08073ABA:
ldr r0, _08073ADC @ =gUnknown_2037F1B
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2889,7 +2889,7 @@ sub_8073B08: @ 8073B08
cmp r0, 0
beq _08073B44
adds r0, r2, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
movs r4, 0xC0
cmp r0, 0
@@ -2901,7 +2901,7 @@ _08073B3C: .4byte gUnknown_2024018
_08073B40: .4byte gUnknown_2037F1A
_08073B44:
adds r0, r2, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08073B56
@@ -3771,7 +3771,7 @@ _080741E4:
ldr r0, _08074210 @ =gUnknown_2037F1A
_080741E6:
ldrb r0, [r0]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -3825,11 +3825,11 @@ sub_807423C: @ 807423C
str r0, [r1]
ldr r7, _08074270 @ =gUnknown_2037F1A
ldrb r0, [r7]
bl GetBankSide
bl GetBattlerSide
adds r4, r0, 0
ldr r5, _08074274 @ =gUnknown_2037F1B
ldrb r0, [r5]
bl GetBankSide
bl GetBattlerSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -3845,7 +3845,7 @@ _08074274: .4byte gUnknown_2037F1B
_08074278:
ldrb r0, [r7]
_0807427A:
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -3948,11 +3948,11 @@ sub_8074320: @ 8074320
beq _080743C2
ldr r6, _08074368 @ =gUnknown_2037F1A
ldrb r0, [r6]
bl GetBankSide
bl GetBattlerSide
adds r4, r0, 0
ldr r5, _0807436C @ =gUnknown_2037F1B
ldrb r0, [r5]
bl GetBankSide
bl GetBattlerSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -4030,11 +4030,11 @@ sub_80743C8: @ 80743C8
beq _0807444C
ldr r6, _08074410 @ =gUnknown_2037F1A
ldrb r0, [r6]
bl GetBankSide
bl GetBattlerSide
adds r4, r0, 0
ldr r5, _08074414 @ =gUnknown_2037F1B
ldrb r0, [r5]
bl GetBankSide
bl GetBattlerSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
asm/battle_anim_8074480.s
+69 -69
View File
@@ -31,7 +31,7 @@ _0807449C:
_080744B0:
ldr r4, _080744D0 @ =gUnknown_83AE01C
adds r0, r5, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 22
ldr r1, _080744D4 @ =gBattleTypeFlags
@@ -49,7 +49,7 @@ _080744D4: .4byte gBattleTypeFlags
_080744D8:
ldr r4, _080744F8 @ =gUnknown_83AE01C
adds r0, r5, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 22
ldr r1, _080744FC @ =gBattleTypeFlags
@@ -66,7 +66,7 @@ _080744F8: .4byte gUnknown_83AE01C
_080744FC: .4byte gBattleTypeFlags
_08074500:
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08074538
@@ -148,7 +148,7 @@ sub_8074590: @ 8074590
lsrs r4, r1, 16
adds r7, r4, 0
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08074674
@@ -227,7 +227,7 @@ _08074638:
cmp r4, r0
bne _08074658
ldr r0, _08074650 @ =gUnknown_83AE050
ldr r1, _08074654 @ =gUnknown_2024024
ldr r1, _08074654 @ =gBattleMonForms
adds r1, r5, r1
ldrb r1, [r1]
adds r1, r0
@@ -236,7 +236,7 @@ _08074638:
.align 2, 0
_0807464C: .4byte 0x00000181
_08074650: .4byte gUnknown_83AE050
_08074654: .4byte gUnknown_2024024
_08074654: .4byte gBattleMonForms
_08074658:
movs r0, 0xCE
lsls r0, 1
@@ -328,7 +328,7 @@ _08074704:
cmp r4, r0
bne _08074728
ldr r0, _08074720 @ =gUnknown_83AE03C
ldr r1, _08074724 @ =gUnknown_2024024
ldr r1, _08074724 @ =gBattleMonForms
adds r1, r6, r1
ldrb r1, [r1]
lsls r1, 2
@@ -338,7 +338,7 @@ _08074704:
.align 2, 0
_0807471C: .4byte 0x00000181
_08074720: .4byte gUnknown_83AE03C
_08074724: .4byte gUnknown_2024024
_08074724: .4byte gBattleMonForms
_08074728:
movs r0, 0xCE
lsls r0, 1
@@ -373,7 +373,7 @@ sub_807474C: @ 807474C
adds r7, r4, 0
movs r5, 0
adds r0, r6, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -382,7 +382,7 @@ sub_807474C: @ 807474C
cmp r4, r0
bne _08074788
ldr r0, _08074780 @ =gUnknown_83AE04C
ldr r1, _08074784 @ =gUnknown_2024024
ldr r1, _08074784 @ =gBattleMonForms
adds r1, r6, r1
ldrb r1, [r1]
adds r1, r0
@@ -391,7 +391,7 @@ sub_807474C: @ 807474C
.align 2, 0
_0807477C: .4byte 0x00000181
_08074780: .4byte gUnknown_83AE04C
_08074784: .4byte gUnknown_2024024
_08074784: .4byte gBattleMonForms
_08074788:
movs r0, 0xCE
lsls r0, 1
@@ -425,7 +425,7 @@ sub_80747AC: @ 80747AC
lsls r2, 24
lsrs r7, r2, 24
adds r0, r6, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080747D4
@@ -451,7 +451,7 @@ _080747D4:
lsrs r5, r0, 16
_080747F2:
adds r0, r6, 0
bl GetBankIdentity
bl GetBattlerPosition
ldr r3, _0807483C @ =gUnknown_83AE01C
lsls r0, 24
lsrs r0, 22
@@ -469,7 +469,7 @@ _080747F2:
cmp r7, 0
beq _08074832
adds r0, r6, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0807482C
@@ -564,7 +564,7 @@ GetSubstituteSpriteDefault_Y: @ 80748BC
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080748E0
@@ -600,7 +600,7 @@ sub_8074900: @ 8074900
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -631,7 +631,7 @@ sub_807492C: @ 807492C
lsls r0, 24
lsrs r6, r0, 24
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08074978
@@ -686,7 +686,7 @@ _080749B0:
ldrh r4, [r1, 0x2]
_080749B2:
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080749CC
@@ -1605,7 +1605,7 @@ _08075030: .4byte gUnknown_2037F1A
_08075034: .4byte gUnknown_2037F1B
_08075038:
ldrb r0, [r7]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08075050
@@ -1820,8 +1820,8 @@ _080751BC: .4byte gUnknown_2037F1A
_080751C0: .4byte gUnknown_2037F02
thumb_func_end sub_8075160
thumb_func_start GetBankSide
GetBankSide: @ 80751C4
thumb_func_start GetBattlerSide
GetBattlerSide: @ 80751C4
lsls r0, 24
lsrs r0, 24
ldr r1, _080751D4 @ =gUnknown_2023BD6
@@ -1832,10 +1832,10 @@ GetBankSide: @ 80751C4
bx lr
.align 2, 0
_080751D4: .4byte gUnknown_2023BD6
thumb_func_end GetBankSide
thumb_func_end GetBattlerSide
thumb_func_start GetBankIdentity
GetBankIdentity: @ 80751D8
thumb_func_start GetBattlerPosition
GetBattlerPosition: @ 80751D8
lsls r0, 24
lsrs r0, 24
ldr r1, _080751E4 @ =gUnknown_2023BD6
@@ -1844,15 +1844,15 @@ GetBankIdentity: @ 80751D8
bx lr
.align 2, 0
_080751E4: .4byte gUnknown_2023BD6
thumb_func_end GetBankIdentity
thumb_func_end GetBattlerPosition
thumb_func_start GetBankByIdentity
GetBankByIdentity: @ 80751E8
thumb_func_start GetBattlerAtPosition
GetBattlerAtPosition: @ 80751E8
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
movs r1, 0
ldr r0, _0807521C @ =gUnknown_2023BCC
ldr r0, _0807521C @ =gBattlersCount
ldrb r2, [r0]
cmp r1, r2
bcs _08075212
@@ -1876,9 +1876,9 @@ _08075212:
pop {r1}
bx r1
.align 2, 0
_0807521C: .4byte gUnknown_2023BCC
_0807521C: .4byte gBattlersCount
_08075220: .4byte gUnknown_2023BD6
thumb_func_end GetBankByIdentity
thumb_func_end GetBattlerAtPosition
thumb_func_start sub_8075224
sub_8075224: @ 8075224
@@ -1892,7 +1892,7 @@ sub_8075224: @ 8075224
cmp r0, 0xFF
beq _08075288
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08075260
@@ -3346,7 +3346,7 @@ sub_8075CB8: @ 8075CB8
cmp r0, 0
beq _08075CF2
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl sub_8072DF0
@@ -3354,7 +3354,7 @@ sub_8075CB8: @ 8075CB8
cmp r0, 0
beq _08075CF2
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -3364,7 +3364,7 @@ _08075CF2:
cmp r5, 0
beq _08075D1E
movs r0, 0x2
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl sub_8072DF0
@@ -3372,7 +3372,7 @@ _08075CF2:
cmp r0, 0
beq _08075D1E
movs r0, 0x2
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3384,7 +3384,7 @@ _08075D1E:
cmp r6, 0
beq _08075D4A
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl sub_8072DF0
@@ -3392,7 +3392,7 @@ _08075D1E:
cmp r0, 0
beq _08075D4A
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3404,7 +3404,7 @@ _08075D4A:
cmp r7, 0
beq _08075D76
movs r0, 0x3
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl sub_8072DF0
@@ -3412,7 +3412,7 @@ _08075D4A:
cmp r0, 0
beq _08075D76
movs r0, 0x3
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3439,7 +3439,7 @@ sub_8075D88: @ 8075D88
push {lr}
lsls r0, 24
lsrs r0, 24
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -3520,7 +3520,7 @@ _08075E16:
bl sub_8075160
ldr r0, _08075E70 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08075E30
@@ -3571,7 +3571,7 @@ sub_8075E80: @ 8075E80
bl sub_8075160
ldr r0, _08075EE0 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08075EA0
@@ -3670,7 +3670,7 @@ _08075F4A:
ldrb r6, [r0]
ldr r0, _08075FAC @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08075F62
@@ -4437,7 +4437,7 @@ _08076508:
bne _080765AC
lsls r0, r4, 24
lsrs r0, 24
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08076568
@@ -4825,7 +4825,7 @@ _080767EC: .4byte gUnknown_2037F1A
sub_80767F0: @ 80767F0
push {r4-r6,lr}
movs r5, 0
ldr r0, _08076850 @ =gUnknown_2023BCC
ldr r0, _08076850 @ =gBattlersCount
ldrb r0, [r0]
cmp r5, r0
bge _0807684A
@@ -4864,7 +4864,7 @@ _080767FE:
strb r2, [r0, 0x5]
_08076840:
adds r5, 0x1
ldr r0, _08076850 @ =gUnknown_2023BCC
ldr r0, _08076850 @ =gBattlersCount
ldrb r0, [r0]
cmp r5, r0
blt _080767FE
@@ -4873,7 +4873,7 @@ _0807684A:
pop {r0}
bx r0
.align 2, 0
_08076850: .4byte gUnknown_2023BCC
_08076850: .4byte gBattlersCount
_08076854: .4byte gSprites
_08076858: .4byte gUnknown_2023D44
thumb_func_end sub_80767F0
@@ -4883,7 +4883,7 @@ sub_807685C: @ 807685C
push {lr}
lsls r0, 24
lsrs r0, 24
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0x1E
@@ -4907,7 +4907,7 @@ sub_8076884: @ 8076884
push {lr}
lsls r0, 24
lsrs r0, 24
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -4933,7 +4933,7 @@ sub_80768B0: @ 80768B0
push {lr}
lsls r0, 24
lsrs r0, 24
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -4994,7 +4994,7 @@ sub_80768D0: @ 80768D0
bl AllocSpritePalette
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _080769B8 @ =gUnknown_202401C
ldr r4, _080769B8 @ =gMonSpritesGfxPtr
ldr r0, [r4]
cmp r0, 0
beq _0807694E
@@ -5052,7 +5052,7 @@ _0807699A:
lsls r0, r6, 3
ldr r1, _080769C0 @ =gUnknown_82350AC
adds r0, r1
ldr r1, _080769B8 @ =gUnknown_202401C
ldr r1, _080769B8 @ =gMonSpritesGfxPtr
ldr r1, [r1]
movs r3, 0xBE
lsls r3, 1
@@ -5063,14 +5063,14 @@ _0807699A:
.align 2, 0
_080769B0: .4byte gUnknown_83AE084
_080769B4: .4byte gUnknown_83AE054
_080769B8: .4byte gUnknown_202401C
_080769B8: .4byte gMonSpritesGfxPtr
_080769BC: .4byte gUnknown_2024018
_080769C0: .4byte gUnknown_82350AC
_080769C4:
lsls r0, r6, 3
ldr r1, _080769E4 @ =gUnknown_82350AC
adds r0, r1
ldr r1, _080769E8 @ =gUnknown_202401C
ldr r1, _080769E8 @ =gMonSpritesGfxPtr
ldr r1, [r1]
movs r2, 0xBE
lsls r2, 1
@@ -5084,7 +5084,7 @@ _080769C4:
b _08076A7C
.align 2, 0
_080769E4: .4byte gUnknown_82350AC
_080769E8: .4byte gUnknown_202401C
_080769E8: .4byte gMonSpritesGfxPtr
_080769EC:
adds r0, r6, 0
ldr r1, [sp, 0x3C]
@@ -5122,7 +5122,7 @@ _08076A32:
lsls r0, r6, 3
ldr r1, _08076A58 @ =gUnknown_823654C
adds r0, r1
ldr r1, _08076A5C @ =gUnknown_202401C
ldr r1, _08076A5C @ =gMonSpritesGfxPtr
ldr r1, [r1]
movs r2, 0xBE
lsls r2, 1
@@ -5138,12 +5138,12 @@ _08076A46:
.align 2, 0
_08076A54: .4byte gUnknown_2024018
_08076A58: .4byte gUnknown_823654C
_08076A5C: .4byte gUnknown_202401C
_08076A5C: .4byte gMonSpritesGfxPtr
_08076A60:
lsls r0, r6, 3
ldr r1, _08076AC8 @ =gUnknown_823654C
adds r0, r1
ldr r1, _08076ACC @ =gUnknown_202401C
ldr r1, _08076ACC @ =gMonSpritesGfxPtr
ldr r1, [r1]
movs r3, 0xBE
lsls r3, 1
@@ -5154,7 +5154,7 @@ _08076A60:
mov r3, r8
bl sub_800ECF0
_08076A7C:
ldr r5, _08076ACC @ =gUnknown_202401C
ldr r5, _08076ACC @ =gMonSpritesGfxPtr
ldr r0, [r5]
movs r4, 0xBE
lsls r4, 1
@@ -5191,7 +5191,7 @@ _08076A7C:
b _08076AEE
.align 2, 0
_08076AC8: .4byte gUnknown_823654C
_08076ACC: .4byte gUnknown_202401C
_08076ACC: .4byte gMonSpritesGfxPtr
_08076AD0: .4byte 0x06010000
_08076AD4: .4byte gUnknown_83AE054
_08076AD8: .4byte gUnknown_82349CC
@@ -5250,7 +5250,7 @@ sub_8076B2C: @ 8076B2C
lsls r1, 24
lsrs r1, 24
mov r9, r1
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08076C08
@@ -5431,7 +5431,7 @@ _08076CA6:
ldr r0, _08076CBC @ =0x00000181
cmp r7, r0
bne _08076CC8
ldr r0, _08076CC0 @ =gUnknown_2024024
ldr r0, _08076CC0 @ =gBattleMonForms
add r0, r8
ldrb r0, [r0]
lsls r0, 2
@@ -5440,7 +5440,7 @@ _08076CA6:
b _08076CDE
.align 2, 0
_08076CBC: .4byte 0x00000181
_08076CC0: .4byte gUnknown_2024024
_08076CC0: .4byte gBattleMonForms
_08076CC4: .4byte gUnknown_83AE03C
_08076CC8:
movs r0, 0xCE
@@ -5721,7 +5721,7 @@ sub_8076ED8: @ 8076ED8
bl sub_8074FCC
ldr r0, _08076F10 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08076F18
@@ -5783,7 +5783,7 @@ sub_8076F58: @ 8076F58
adds r4, r0, 0
ldr r0, _08076F80 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08076F88
@@ -5844,7 +5844,7 @@ sub_8076FD0: @ 8076FD0
bl sub_8074FCC
ldr r0, _08076FF4 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08076FFC
@@ -5901,7 +5901,7 @@ sub_8077030: @ 8077030
strh r0, [r5, 0x8]
ldr r7, _080770C8 @ =gUnknown_2037F1A
ldrb r0, [r7]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
movs r1, 0x8
cmp r0, 0
@@ -6212,7 +6212,7 @@ sub_807729C: @ 807729C
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080772D4
@@ -6302,7 +6302,7 @@ sub_8077350: @ 8077350
strh r0, [r4, 0x36]
ldr r0, _0807738C @ =gUnknown_2037F1B
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08077390
asm/battle_anim_80989F8.s
+11 -11
View File
@@ -207,7 +207,7 @@ _08098B6C:
_08098B70:
movs r0, 0x3
_08098B72:
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
@@ -878,7 +878,7 @@ sub_809907C: @ 809907C
lsrs r4, r0, 24
ldr r0, _080990A4 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08099098
@@ -909,7 +909,7 @@ sub_80990AC: @ 80990AC
strb r0, [r2]
ldr r0, _080990D4 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080990DC
@@ -1206,7 +1206,7 @@ _080992FE:
adds r0, r2, r0
ldrb r6, [r0]
adds r0, r2, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08099328
@@ -1299,7 +1299,7 @@ _080993BE:
adds r0, r1, r0
ldrb r7, [r0]
adds r0, r1, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080993E8
@@ -1418,7 +1418,7 @@ sub_809949C: @ 809949C
lsrs r7, r0, 16
ldr r0, _08099524 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080994CE
@@ -1642,7 +1642,7 @@ _08099664:
strh r2, [r5, 0x8]
ldr r0, _08099688 @ =gUnknown_2037F1B
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08099690
@@ -1723,7 +1723,7 @@ sub_8099704: @ 8099704
lsrs r5, r0, 24
ldr r6, _08099754 @ =gUnknown_2037F1A
ldrb r0, [r6]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08099720
@@ -1829,7 +1829,7 @@ _080997D8: .4byte gTasks
_080997DC: .4byte gSprites
_080997E0:
ldrb r0, [r4, 0x12]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08099808
@@ -2121,7 +2121,7 @@ _08099A14:
ldr r0, _08099A6C @ =gUnknown_2037F1B
_08099A16:
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
movs r1, 0
lsls r0, 24
cmp r0, 0
@@ -2208,7 +2208,7 @@ _08099AC0:
ldr r0, _08099AF0 @ =gUnknown_2037F1B
_08099AC2:
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08099AD4
asm/battle_anim_80A22E8.s
+199 -199
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80DE2C0.s
+44 -44
View File
@@ -810,7 +810,7 @@ sub_80DE8B0: @ 80DE8B0
bl sub_8076D9C
ldr r0, _080DE918 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080DE8E4
@@ -963,7 +963,7 @@ sub_80DE9D8: @ 80DE9D8
bne _080DEA2C
ldr r0, _080DEA18 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080DEA1C
@@ -1063,7 +1063,7 @@ sub_80DEAB4: @ 80DEAB4
lsrs r4, r0, 24
ldr r0, _080DEAD0 @ =gUnknown_2037F1B
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2604,7 +2604,7 @@ sub_80DF688: @ 80DF688
adds r4, r0, 0
ldr r0, _080DF6A0 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080DF6A8
@@ -2638,7 +2638,7 @@ sub_80DF6C0: @ 80DF6C0
strh r0, [r4, 0x2E]
ldr r0, _080DF6E0 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080DF6E4
@@ -3155,16 +3155,16 @@ _080DFAB4: .4byte gUnknown_2037F1A
_080DFAB8: .4byte gUnknown_2037F1B
_080DFABC:
ldrb r0, [r6]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r1, r0, 24
_080DFAC6:
ldr r0, _080DFB08 @ =gUnknown_202401C
ldr r0, _080DFB08 @ =gMonSpritesGfxPtr
ldr r2, [r0]
lsls r0, r1, 2
adds r2, 0x4
adds r2, r0
ldr r1, _080DFB0C @ =gUnknown_2024024
ldr r1, _080DFB0C @ =gBattleMonForms
ldr r0, _080DFB10 @ =gUnknown_2037F1A
ldrb r0, [r0]
adds r0, r1
@@ -3192,8 +3192,8 @@ _080DFB00:
strh r0, [r1, 0x8]
b _080DFBCE
.align 2, 0
_080DFB08: .4byte gUnknown_202401C
_080DFB0C: .4byte gUnknown_2024024
_080DFB08: .4byte gMonSpritesGfxPtr
_080DFB0C: .4byte gBattleMonForms
_080DFB10: .4byte gUnknown_2037F1A
_080DFB14: .4byte 0x04000200
_080DFB18: .4byte gTasks
@@ -3258,7 +3258,7 @@ _080DFB8A:
bne _080DFBC8
ldr r4, _080DFBD8 @ =gUnknown_2037F1A
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3447,7 +3447,7 @@ _080DFD2C: .4byte 0x0000ffc8
_080DFD30:
ldr r0, _080DFD48 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080DFD54
@@ -4091,7 +4091,7 @@ _080E0260: .4byte 0x0000ffc8
_080E0264:
ldr r0, _080E02A4 @ =gUnknown_2037F1B
ldrb r0, [r0]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r4, r0, 24
bl sub_8075290
@@ -4176,7 +4176,7 @@ _080E0304:
strh r0, [r5, 0xE]
ldr r0, _080E033C @ =gUnknown_2037F1B
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4428,7 +4428,7 @@ _080E04FE:
strh r0, [r4, 0x32]
ldr r0, _080E052C @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080E0530
@@ -4539,7 +4539,7 @@ _080E05E8:
ldr r0, _080E0620 @ =gUnknown_2037F1B
_080E05EA:
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4756,7 +4756,7 @@ sub_80E0790: @ 80E0790
adds r4, r0, 0
ldr r0, _080E07AC @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -4800,7 +4800,7 @@ sub_80E07E0: @ 80E07E0
strh r0, [r4, 0x2E]
ldr r0, _080E0820 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080E0824
@@ -5301,7 +5301,7 @@ _080E0BB2:
cmp r0, 0
bne _080E0BD8
ldrb r0, [r6, 0x1E]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsls r2, r5, 4
cmp r0, 0
@@ -5828,7 +5828,7 @@ sub_80E0FB8: @ 80E0FB8
bl GetAnimBankSpriteId
ldr r0, _080E1040 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080E107C
@@ -5866,7 +5866,7 @@ sub_80E0FB8: @ 80E0FB8
cmp r0, 0
bne _080E1074
adds r0, r2, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080E1054
@@ -5940,7 +5940,7 @@ _080E107C:
cmp r0, 0
bne _080E110C
adds r0, r2, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080E10F4
@@ -6251,7 +6251,7 @@ _080E1326:
movs r0, 0x18
strh r0, [r4, 0x18]
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -7020,7 +7020,7 @@ sub_80E1928: @ 80E1928
bl StartSpriteAffineAnim
ldr r0, _080E1984 @ =gUnknown_2037F1B
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080E194E
@@ -7465,7 +7465,7 @@ sub_80E1C48: @ 80E1C48
strh r0, [r4, 0x14]
_080E1C8C:
ldrb r0, [r2]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080E1CBC
@@ -8019,7 +8019,7 @@ sub_80E20D4: @ 80E20D4
adds r5, r0, 0
ldr r6, _080E212C @ =gUnknown_2037F1A
ldrb r0, [r6]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -8084,7 +8084,7 @@ _080E2152:
_080E2160:
ldr r0, _080E218C @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080E2180
@@ -8158,7 +8158,7 @@ sub_80E21CC: @ 80E21CC
strh r1, [r6, 0x16]
ldr r5, _080E2220 @ =gUnknown_2037F1A
ldrb r0, [r5]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080E2224
@@ -8697,7 +8697,7 @@ _080E258A:
bl sub_8075068
mov r1, r10
ldrb r0, [r1]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -9651,7 +9651,7 @@ _080E2D40: .4byte 0x0000ffff
_080E2D44:
ldr r0, _080E2D58 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080E2D60
@@ -9916,7 +9916,7 @@ _080E2F3A:
ldrh r0, [r4, 0x3C]
lsls r0, 24
lsrs r0, 24
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -10303,7 +10303,7 @@ sub_80E321C: @ 80E321C
movs r1, 0x3
bl sub_8074480
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080E3258
@@ -10649,7 +10649,7 @@ sub_80E34D0: @ 80E34D0
adds r5, r0, 0
ldr r4, _080E34F4 @ =gUnknown_2037F1B
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080E34FC
@@ -11268,7 +11268,7 @@ _080E3978:
strh r0, [r6, 0xA]
ldr r0, _080E39C8 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -11339,7 +11339,7 @@ _080E3A28: .4byte gTasks
_080E3A2C:
ldr r4, _080E3A90 @ =gUnknown_2037F1A
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080E3ACC
@@ -11561,7 +11561,7 @@ _080E3BEC:
strh r0, [r6, 0xA]
ldr r0, _080E3C3C @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -11618,7 +11618,7 @@ _080E3C5A:
bne _080E3CDA
ldr r0, _080E3CB0 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080E3CB8
@@ -11702,7 +11702,7 @@ _080E3D0C:
bl sub_8076B20
ldr r0, _080E3D60 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -11765,7 +11765,7 @@ _080E3D90:
mov r10, r0
ldrb r0, [r0]
str r2, [sp, 0x18]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
mov r9, r4
ldr r2, [sp, 0x18]
@@ -11911,7 +11911,7 @@ _080E3E96:
strb r0, [r2]
ldr r0, _080E3F20 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -11981,7 +11981,7 @@ _080E3F6A:
strh r0, [r4, 0x32]
ldr r0, _080E3F94 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080E3F98
@@ -12242,7 +12242,7 @@ sub_80E4160: @ 80E4160
strh r0, [r4, 0xE]
ldr r0, _080E41CC @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
movs r2, 0x1
negs r2, r2
@@ -12425,7 +12425,7 @@ sub_80E42DC: @ 80E42DC
adds r4, r0, 0
ldr r0, _080E4330 @ =gUnknown_2037F1B
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
ldrh r0, [r4, 0x2E]
ldrh r1, [r4, 0x30]
@@ -12469,7 +12469,7 @@ sub_80E4334: @ 80E4334
adds r4, r0, 0
ldr r0, _080E436C @ =gUnknown_2037F1B
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080E4378
asm/battle_anim_80EEC0C.s
+15 -15
View File
@@ -906,7 +906,7 @@ sub_80EF344: @ 80EF344
adds r1, r0, r1
ldrb r1, [r1]
mov r9, r1
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080EF38C
@@ -1376,7 +1376,7 @@ _080EF708:
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl sub_807685C
@@ -1429,7 +1429,7 @@ _080EF708:
ldr r0, _080EF7D8 @ =SpriteCallbackDummy
str r0, [r4]
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080EF7DC @ =gUnknown_2023D44
lsls r0, 24
lsrs r0, 24
@@ -1475,7 +1475,7 @@ sub_80EF7EC: @ 80EF7EC
lsrs r5, r0, 24
ldr r6, _080EF84C @ =gSprites
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080EF850 @ =gUnknown_2023D44
lsls r0, 24
lsrs r0, 24
@@ -1532,7 +1532,7 @@ sub_80EF864: @ 80EF864
lsrs r5, r0, 24
ldr r6, _080EF8B8 @ =gSprites
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r4, _080EF8BC @ =gUnknown_2023D44
lsls r0, 24
lsrs r0, 24
@@ -1548,7 +1548,7 @@ sub_80EF864: @ 80EF864
cmp r0, 0
bge _080EF8B0
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -5120,7 +5120,7 @@ _080F1466:
adds r0, r4
strh r0, [r5, 0x8]
ldrb r0, [r3]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080F14A8
@@ -5198,7 +5198,7 @@ _080F150A:
adds r0, r2
strh r0, [r5, 0x8]
ldrb r0, [r3]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080F1540
@@ -5240,7 +5240,7 @@ _080F1558:
strh r1, [r0, 0x8]
ldr r0, _080F1594 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -5745,7 +5745,7 @@ _080F1948:
cmp r0, 0
bne _080F1990
mov r0, r8
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
movs r1, 0x3F
cmp r0, 0
@@ -5986,7 +5986,7 @@ sub_80F1B3C: @ 80F1B3C
movs r0, 0x1E
strh r0, [r4, 0x2E]
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -5998,7 +5998,7 @@ sub_80F1B3C: @ 80F1B3C
adds r0, r1
strh r0, [r4, 0x32]
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -6159,7 +6159,7 @@ sub_80F1C8C: @ 80F1C8C
_080F1CA4: .4byte gUnknown_2037F02
_080F1CA8:
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080F1CB8 @ =gUnknown_2037F1A
strb r0, [r1]
movs r0, 0x1
@@ -6168,12 +6168,12 @@ _080F1CA8:
_080F1CB8: .4byte gUnknown_2037F1A
_080F1CBC:
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080F1CDC @ =gUnknown_2037F1A
strb r0, [r1]
movs r0, 0
_080F1CC8:
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080F1CE0 @ =gUnknown_2037F1B
strb r0, [r1]
_080F1CD0:
asm/battle_anim_sound_tasks.s
+2 -2
View File
@@ -375,7 +375,7 @@ _080DD0E0: .4byte gUnknown_2037F1B
_080DD0E4: .4byte gUnknown_2037F02
_080DD0E8:
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080DD10C
@@ -487,7 +487,7 @@ _080DD1BC: .4byte gUnknown_2037F1B
_080DD1C0: .4byte gUnknown_2037F02
_080DD1C4:
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080DD1E8
asm/battle_controller_link_opponent.s
+125 -125
View File
@@ -286,7 +286,7 @@ _0803A888:
ldr r0, _0803A964 @ =gActiveBattler
mov r8, r0
ldrb r0, [r0]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x1
@@ -376,7 +376,7 @@ _0803A936:
beq _0803A97C
mov r1, r8
ldrb r0, [r1]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -523,7 +523,7 @@ _0803AA6C:
cmp r0, 0
beq _0803AABA
ldrb r0, [r7]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -2541,12 +2541,12 @@ _0803BB54:
adds r0, r4, 0
movs r1, 0xB
adds r2, r7, 0
bl sub_804037C
bl SetMonData
adds r2, r7, 0
adds r2, 0x2E
adds r0, r4, 0
movs r1, 0xC
bl sub_804037C
bl SetMonData
movs r0, 0
mov r8, r0
movs r0, 0x3B
@@ -2587,12 +2587,12 @@ _0803BBBA:
adds r1, 0xD
mov r0, r9
adds r2, r4, 0
bl sub_804037C
bl SetMonData
mov r1, r8
adds r1, 0x11
mov r0, r9
adds r2, r6, 0
bl sub_804037C
bl SetMonData
adds r6, 0x1
adds r4, 0x2
movs r0, 0x1
@@ -2608,15 +2608,15 @@ _0803BBBA:
adds r0, r4, 0
movs r1, 0x15
mov r2, r10
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x20
ldr r2, [sp, 0x20]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x19
ldr r2, [sp, 0x28]
bl sub_804037C
bl SetMonData
ldrb r0, [r7, 0x14]
lsls r0, 27
lsrs r0, 27
@@ -2625,7 +2625,7 @@ _0803BBBA:
adds r0, r4, 0
movs r1, 0x27
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrh r0, [r7, 0x14]
lsls r0, 22
@@ -2634,7 +2634,7 @@ _0803BBBA:
adds r0, r4, 0
movs r1, 0x28
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrb r0, [r7, 0x15]
lsls r0, 25
@@ -2643,7 +2643,7 @@ _0803BBBA:
adds r0, r4, 0
movs r1, 0x29
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldr r0, [r7, 0x14]
lsls r0, 12
@@ -2652,7 +2652,7 @@ _0803BBBA:
adds r0, r4, 0
movs r1, 0x2A
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrh r0, [r7, 0x16]
lsls r0, 23
@@ -2661,7 +2661,7 @@ _0803BBBA:
adds r0, r4, 0
movs r1, 0x2B
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrb r0, [r7, 0x17]
lsls r0, 26
@@ -2670,47 +2670,47 @@ _0803BBBA:
adds r0, r4, 0
movs r1, 0x2C
mov r2, sp
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0
ldr r2, [sp, 0x2C]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x37
ldr r2, [sp, 0x30]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x38
ldr r2, [sp, 0x1C]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x39
ldr r2, [sp, 0x18]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3A
ldr r2, [sp, 0x24]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3B
ldr r2, [sp, 0x4]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3C
ldr r2, [sp, 0x8]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3D
ldr r2, [sp, 0xC]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3E
ldr r2, [sp, 0x10]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3F
ldr r2, [sp, 0x14]
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BCE8: .4byte gEnemyParty
@@ -2723,7 +2723,7 @@ _0803BCEC:
lsls r2, 9
adds r2, r3
movs r1, 0xB
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BD04: .4byte gEnemyParty
@@ -2736,7 +2736,7 @@ _0803BD08:
lsls r2, 9
adds r2, r3
movs r1, 0xC
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BD20: .4byte gEnemyParty
@@ -2758,12 +2758,12 @@ _0803BD3C:
adds r1, 0xD
adds r0, r7, 0
adds r2, r4, 0
bl sub_804037C
bl SetMonData
mov r1, r8
adds r1, 0x11
adds r0, r7, 0
adds r2, r6, 0
bl sub_804037C
bl SetMonData
adds r6, 0x1
adds r4, 0x2
movs r0, 0x1
@@ -2777,7 +2777,7 @@ _0803BD3C:
adds r0, r1
movs r1, 0x15
mov r2, r9
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BD74: .4byte gEnemyParty
@@ -2809,7 +2809,7 @@ _0803BD98:
adds r0, r4, 0
movs r1, 0x11
str r3, [sp, 0x34]
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -2817,7 +2817,7 @@ _0803BD98:
adds r2, r0
adds r0, r4, 0
movs r1, 0x12
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -2825,7 +2825,7 @@ _0803BD98:
adds r2, r0
adds r0, r4, 0
movs r1, 0x13
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -2833,7 +2833,7 @@ _0803BD98:
adds r2, r0
adds r0, r4, 0
movs r1, 0x14
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -2841,7 +2841,7 @@ _0803BD98:
adds r2, r0
adds r0, r4, 0
movs r1, 0x15
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BDFC: .4byte gEnemyParty
@@ -2860,7 +2860,7 @@ _0803BE00:
_0803BE16:
adds r3, 0x3
adds r2, r3
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BE20: .4byte gEnemyParty
@@ -2874,7 +2874,7 @@ _0803BE28:
lsls r2, 9
adds r2, r3
movs r1, 0x1
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BE40: .4byte gEnemyParty
@@ -2887,7 +2887,7 @@ _0803BE44:
lsls r2, 9
adds r2, r3
movs r1, 0x19
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BE5C: .4byte gEnemyParty
@@ -2900,7 +2900,7 @@ _0803BE60:
lsls r2, 9
adds r2, r3
movs r1, 0x1A
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BE78: .4byte gEnemyParty
@@ -2913,7 +2913,7 @@ _0803BE7C:
lsls r2, 9
adds r2, r3
movs r1, 0x1B
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BE94: .4byte gEnemyParty
@@ -2926,7 +2926,7 @@ _0803BE98:
lsls r2, 9
adds r2, r3
movs r1, 0x1C
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BEB0: .4byte gEnemyParty
@@ -2939,7 +2939,7 @@ _0803BEB4:
lsls r2, 9
adds r2, r3
movs r1, 0x1D
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BECC: .4byte gEnemyParty
@@ -2952,7 +2952,7 @@ _0803BED0:
lsls r2, 9
adds r2, r3
movs r1, 0x1E
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BEE8: .4byte gEnemyParty
@@ -2965,7 +2965,7 @@ _0803BEEC:
lsls r2, 9
adds r2, r3
movs r1, 0x1F
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BF04: .4byte gEnemyParty
@@ -2978,7 +2978,7 @@ _0803BF08:
lsls r2, 9
adds r2, r3
movs r1, 0x20
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BF20: .4byte gEnemyParty
@@ -2991,7 +2991,7 @@ _0803BF24:
lsls r2, 9
adds r2, r3
movs r1, 0x22
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BF3C: .4byte gEnemyParty
@@ -3004,7 +3004,7 @@ _0803BF40:
lsls r2, 9
adds r2, r3
movs r1, 0x23
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BF58: .4byte gEnemyParty
@@ -3017,7 +3017,7 @@ _0803BF5C:
lsls r2, 9
adds r2, r3
movs r1, 0x24
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BF74: .4byte gEnemyParty
@@ -3030,7 +3030,7 @@ _0803BF78:
lsls r2, 9
adds r2, r3
movs r1, 0x25
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BF90: .4byte gEnemyParty
@@ -3043,7 +3043,7 @@ _0803BF94:
lsls r2, 9
adds r2, r3
movs r1, 0x26
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803BFAC: .4byte gEnemyParty
@@ -3059,7 +3059,7 @@ _0803BFB0:
adds r0, r4, 0
movs r1, 0x27
str r3, [sp, 0x34]
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -3067,7 +3067,7 @@ _0803BFB0:
adds r2, r0
adds r0, r4, 0
movs r1, 0x28
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -3075,7 +3075,7 @@ _0803BFB0:
adds r2, r0
adds r0, r4, 0
movs r1, 0x29
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -3083,7 +3083,7 @@ _0803BFB0:
adds r2, r0
adds r0, r4, 0
movs r1, 0x2A
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -3091,7 +3091,7 @@ _0803BFB0:
adds r2, r0
adds r0, r4, 0
movs r1, 0x2B
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -3110,7 +3110,7 @@ _0803C024:
lsls r2, 9
adds r2, r3
movs r1, 0x27
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C03C: .4byte gEnemyParty
@@ -3123,7 +3123,7 @@ _0803C040:
lsls r2, 9
adds r2, r3
movs r1, 0x28
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C058: .4byte gEnemyParty
@@ -3136,7 +3136,7 @@ _0803C05C:
lsls r2, 9
adds r2, r3
movs r1, 0x29
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C074: .4byte gEnemyParty
@@ -3149,7 +3149,7 @@ _0803C078:
lsls r2, 9
adds r2, r3
movs r1, 0x2A
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C090: .4byte gEnemyParty
@@ -3162,7 +3162,7 @@ _0803C094:
lsls r2, 9
adds r2, r3
movs r1, 0x2B
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C0AC: .4byte gEnemyParty
@@ -3176,7 +3176,7 @@ _0803C0B0:
adds r2, r3
_0803C0BE:
movs r1, 0x2C
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C0C8: .4byte gEnemyParty
@@ -3189,7 +3189,7 @@ _0803C0CC:
lsls r2, 9
adds r2, r3
movs r1, 0
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C0E4: .4byte gEnemyParty
@@ -3202,7 +3202,7 @@ _0803C0E8:
lsls r2, 9
adds r2, r3
movs r1, 0x9
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C100: .4byte gEnemyParty
@@ -3215,7 +3215,7 @@ _0803C104:
lsls r2, 9
adds r2, r3
movs r1, 0x37
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C11C: .4byte gEnemyParty
@@ -3228,7 +3228,7 @@ _0803C120:
lsls r2, 9
adds r2, r3
movs r1, 0x38
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C138: .4byte gEnemyParty
@@ -3241,7 +3241,7 @@ _0803C13C:
lsls r2, 9
adds r2, r3
movs r1, 0x39
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C154: .4byte gEnemyParty
@@ -3254,7 +3254,7 @@ _0803C158:
lsls r2, 9
adds r2, r3
movs r1, 0x3A
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C170: .4byte gEnemyParty
@@ -3267,7 +3267,7 @@ _0803C174:
lsls r2, 9
adds r2, r3
movs r1, 0x3B
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C18C: .4byte gEnemyParty
@@ -3280,7 +3280,7 @@ _0803C190:
lsls r2, 9
adds r2, r3
movs r1, 0x3C
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C1A8: .4byte gEnemyParty
@@ -3293,7 +3293,7 @@ _0803C1AC:
lsls r2, 9
adds r2, r3
movs r1, 0x3D
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C1C4: .4byte gEnemyParty
@@ -3306,7 +3306,7 @@ _0803C1C8:
lsls r2, 9
adds r2, r3
movs r1, 0x3E
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C1E0: .4byte gEnemyParty
@@ -3319,7 +3319,7 @@ _0803C1E4:
lsls r2, 9
adds r2, r3
movs r1, 0x3F
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C1FC: .4byte gEnemyParty
@@ -3332,7 +3332,7 @@ _0803C200:
lsls r2, 9
adds r2, r3
movs r1, 0x16
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C218: .4byte gEnemyParty
@@ -3345,7 +3345,7 @@ _0803C21C:
lsls r2, 9
adds r2, r3
movs r1, 0x17
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C234: .4byte gEnemyParty
@@ -3358,7 +3358,7 @@ _0803C238:
lsls r2, 9
adds r2, r3
movs r1, 0x18
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C250: .4byte gEnemyParty
@@ -3371,7 +3371,7 @@ _0803C254:
lsls r2, 9
adds r2, r3
movs r1, 0x21
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C26C: .4byte gEnemyParty
@@ -3384,7 +3384,7 @@ _0803C270:
lsls r2, 9
adds r2, r3
movs r1, 0x2F
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C288: .4byte gEnemyParty
@@ -3397,7 +3397,7 @@ _0803C28C:
lsls r2, 9
adds r2, r3
movs r1, 0x30
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C2A4: .4byte gEnemyParty
@@ -3410,7 +3410,7 @@ _0803C2A8:
lsls r2, 9
adds r2, r3
movs r1, 0x32
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C2C0: .4byte gEnemyParty
@@ -3423,7 +3423,7 @@ _0803C2C4:
lsls r2, 9
adds r2, r3
movs r1, 0x33
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C2DC: .4byte gEnemyParty
@@ -3436,7 +3436,7 @@ _0803C2E0:
lsls r2, 9
adds r2, r3
movs r1, 0x34
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C2F8: .4byte gEnemyParty
@@ -3449,7 +3449,7 @@ _0803C2FC:
lsls r2, 9
adds r2, r3
movs r1, 0x35
bl sub_804037C
bl SetMonData
b _0803C32C
.align 2, 0
_0803C314: .4byte gEnemyParty
@@ -3462,7 +3462,7 @@ _0803C318:
lsls r2, 9
adds r2, r3
movs r1, 0x36
bl sub_804037C
bl SetMonData
_0803C32C:
add sp, 0x38
pop {r3-r5}
@@ -3571,13 +3571,13 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4
add r0, r9
bl BattleLoadOpponentMonSpriteGfx
ldrb r0, [r6]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F7D4
ldr r0, _0803C4E8 @ =gUnknown_20244DC
ldr r0, _0803C4E8 @ =gMultiuseSpriteTemplate
mov r8, r0
ldrb r0, [r6]
movs r1, 0x2
@@ -3641,7 +3641,7 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, _0803C4F8 @ =gUnknown_2024024
ldr r1, _0803C4F8 @ =gBattleMonForms
adds r2, r1
ldrb r1, [r2]
bl StartSpriteAnim
@@ -3677,11 +3677,11 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4
_0803C4DC: .4byte gBattlerPartyIndexes
_0803C4E0: .4byte gActiveBattler
_0803C4E4: .4byte gEnemyParty
_0803C4E8: .4byte gUnknown_20244DC
_0803C4E8: .4byte gMultiuseSpriteTemplate
_0803C4EC: .4byte gUnknown_2023D44
_0803C4F0: .4byte gSprites
_0803C4F4: .4byte 0x0000ff10
_0803C4F8: .4byte gUnknown_2024024
_0803C4F8: .4byte gBattleMonForms
_0803C4FC: .4byte gUnknown_3004FE0
_0803C500: .4byte sub_803AC14
thumb_func_end LinkOpponentHandleLoadPokeSprite
@@ -3775,13 +3775,13 @@ sub_803C550: @ 803C550
adds r1, r6, 0
bl BattleLoadOpponentMonSpriteGfx
adds r0, r6, 0
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
ldr r0, _0803C6C0 @ =gUnknown_20244DC
ldr r0, _0803C6C0 @ =gMultiuseSpriteTemplate
mov r9, r0
adds r0, r6, 0
movs r1, 0x2
@@ -3844,7 +3844,7 @@ sub_803C550: @ 803C550
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, _0803C6CC @ =gUnknown_2024024
ldr r1, _0803C6CC @ =gBattleMonForms
adds r6, r1
ldrb r1, [r6]
bl StartSpriteAnim
@@ -3892,10 +3892,10 @@ _0803C6B0: .4byte gUnknown_2022BC4
_0803C6B4: .4byte gEnemyParty
_0803C6B8: .4byte sub_8033E3C
_0803C6BC: .4byte gUnknown_3004FFC
_0803C6C0: .4byte gUnknown_20244DC
_0803C6C0: .4byte gMultiuseSpriteTemplate
_0803C6C4: .4byte gUnknown_2023D44
_0803C6C8: .4byte gSprites
_0803C6CC: .4byte gUnknown_2024024
_0803C6CC: .4byte gBattleMonForms
_0803C6D0: .4byte SpriteCallbackDummy
thumb_func_end sub_803C550
@@ -4056,7 +4056,7 @@ sub_803C7F8: @ 803C7F8
beq _0803C8C0
ldr r6, _0803C888 @ =gActiveBattler
ldrb r0, [r6]
bl GetBankIdentity
bl GetBattlerPosition
movs r1, 0x2
ands r1, r0
movs r7, 0xC8
@@ -4066,7 +4066,7 @@ sub_803C7F8: @ 803C7F8
_0803C820:
ldrb r0, [r6]
bl GetBankMultiplayerId
ldr r5, _0803C88C @ =gUnknown_202273C
ldr r5, _0803C88C @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -4097,7 +4097,7 @@ _0803C820:
cmp r4, 0x3
bne _0803C8A0
_0803C866:
ldr r4, _0803C88C @ =gUnknown_202273C
ldr r4, _0803C88C @ =gLinkPlayers
ldr r0, _0803C888 @ =gActiveBattler
ldrb r0, [r0]
bl GetBankMultiplayerId
@@ -4108,20 +4108,20 @@ _0803C866:
ldrb r0, [r1, 0x13]
cmp r0, 0
beq _0803C894
ldr r0, _0803C890 @ =gUnknown_82538A8
ldr r0, _0803C890 @ =gFacilityClassToPicIndex
adds r0, 0x3D
b _0803C990
.align 2, 0
_0803C884: .4byte gBattleTypeFlags
_0803C888: .4byte gActiveBattler
_0803C88C: .4byte gUnknown_202273C
_0803C890: .4byte gUnknown_82538A8
_0803C88C: .4byte gLinkPlayers
_0803C890: .4byte gFacilityClassToPicIndex
_0803C894:
ldr r0, _0803C89C @ =gUnknown_82538A8
ldr r0, _0803C89C @ =gFacilityClassToPicIndex
adds r0, 0x3A
b _0803C990
.align 2, 0
_0803C89C: .4byte gUnknown_82538A8
_0803C89C: .4byte gFacilityClassToPicIndex
_0803C8A0:
ldrb r0, [r6]
bl GetBankMultiplayerId
@@ -4132,11 +4132,11 @@ _0803C8A0:
ldrb r0, [r1, 0x13]
cmp r0, 0
beq _0803C98C
ldr r0, _0803C8BC @ =gUnknown_82538A8
ldr r0, _0803C8BC @ =gFacilityClassToPicIndex
adds r0, 0x87
b _0803C990
.align 2, 0
_0803C8BC: .4byte gUnknown_82538A8
_0803C8BC: .4byte gFacilityClassToPicIndex
_0803C8C0:
movs r7, 0xB0
ldr r0, _0803C8D8 @ =gTrainerBattleOpponent_A
@@ -4153,7 +4153,7 @@ _0803C8C0:
_0803C8D8: .4byte gTrainerBattleOpponent_A
_0803C8DC:
bl GetMultiplayerId
ldr r6, _0803C954 @ =gUnknown_202273C
ldr r6, _0803C954 @ =gLinkPlayers
movs r5, 0x1
eors r0, r5
lsls r0, 24
@@ -4192,7 +4192,7 @@ _0803C8DC:
cmp r4, 0x3
bne _0803C968
_0803C930:
ldr r4, _0803C954 @ =gUnknown_202273C
ldr r4, _0803C954 @ =gLinkPlayers
bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
@@ -4205,18 +4205,18 @@ _0803C930:
ldrb r0, [r1, 0x13]
cmp r0, 0
beq _0803C95C
ldr r0, _0803C958 @ =gUnknown_82538A8
ldr r0, _0803C958 @ =gFacilityClassToPicIndex
adds r0, 0x3D
b _0803C990
.align 2, 0
_0803C954: .4byte gUnknown_202273C
_0803C958: .4byte gUnknown_82538A8
_0803C954: .4byte gLinkPlayers
_0803C958: .4byte gFacilityClassToPicIndex
_0803C95C:
ldr r0, _0803C964 @ =gUnknown_82538A8
ldr r0, _0803C964 @ =gFacilityClassToPicIndex
adds r0, 0x3A
b _0803C990
.align 2, 0
_0803C964: .4byte gUnknown_82538A8
_0803C964: .4byte gFacilityClassToPicIndex
_0803C968:
bl GetMultiplayerId
eors r0, r5
@@ -4229,13 +4229,13 @@ _0803C968:
ldrb r0, [r1, 0x13]
cmp r0, 0
beq _0803C98C
ldr r0, _0803C988 @ =gUnknown_82538A8
ldr r0, _0803C988 @ =gFacilityClassToPicIndex
adds r0, 0x87
b _0803C990
.align 2, 0
_0803C988: .4byte gUnknown_82538A8
_0803C988: .4byte gFacilityClassToPicIndex
_0803C98C:
ldr r0, _0803CAC8 @ =gUnknown_82538A8
ldr r0, _0803CAC8 @ =gFacilityClassToPicIndex
adds r0, 0x86
_0803C990:
ldrb r0, [r0]
@@ -4248,13 +4248,13 @@ _0803C992:
bl sub_80346C4
mov r1, r8
ldrb r0, [r1]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
mov r0, r9
bl sub_803F864
ldr r5, _0803CAD0 @ =gUnknown_20244DC
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r5, _0803CAD0 @ =gMultiuseSpriteTemplate
adds r6, r7, 0
ldr r1, _0803CAD4 @ =gUnknown_823932C
mov r2, r9
@@ -4388,9 +4388,9 @@ _0803C992:
pop {r0}
bx r0
.align 2, 0
_0803CAC8: .4byte gUnknown_82538A8
_0803CAC8: .4byte gFacilityClassToPicIndex
_0803CACC: .4byte gActiveBattler
_0803CAD0: .4byte gUnknown_20244DC
_0803CAD0: .4byte gMultiuseSpriteTemplate
_0803CAD4: .4byte gUnknown_823932C
_0803CAD8: .4byte gUnknown_2023D44
_0803CADC: .4byte gSprites
@@ -4969,7 +4969,7 @@ sub_803CF50: @ 803CF50
lsls r0, 24
cmp r0, 0
beq _0803CF98
ldr r0, _0803CF94 @ =gUnknown_202298C
ldr r0, _0803CF94 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
b _0803CFA0
@@ -4978,9 +4978,9 @@ _0803CF84: .4byte gUnknown_2022974
_0803CF88: .4byte gUnknown_2022976
_0803CF8C: .4byte gActiveBattler
_0803CF90: .4byte gUnknown_2022BC6
_0803CF94: .4byte gUnknown_202298C
_0803CF94: .4byte gDisplayedStringBattle
_0803CF98:
ldr r0, _0803CFB4 @ =gUnknown_202298C
ldr r0, _0803CFB4 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
_0803CFA0:
@@ -4995,7 +4995,7 @@ _0803CFA0:
pop {r0}
bx r0
.align 2, 0
_0803CFB4: .4byte gUnknown_202298C
_0803CFB4: .4byte gDisplayedStringBattle
_0803CFB8: .4byte gUnknown_3004FE0
_0803CFBC: .4byte gActiveBattler
_0803CFC0: .4byte CompleteOnInactiveTextPrinter_5
@@ -5501,7 +5501,7 @@ RecordedOpponentHandlePlaySE: @ 803D370
push {r4,lr}
ldr r4, _0803D3AC @ =gActiveBattler
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
movs r3, 0x3F
cmp r0, 0
@@ -5883,7 +5883,7 @@ RecordedOpponentHandleDrawPartyStatusSummary: @ 803D67C
cmp r0, 0
beq _0803D6AC
adds r0, r2, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0803D6AC
asm/battle_controller_link_partner.s
+108 -108
View File
@@ -2244,12 +2244,12 @@ _080D5478:
adds r0, r4, 0
movs r1, 0xB
adds r2, r6, 0
bl sub_804037C
bl SetMonData
adds r2, r6, 0
adds r2, 0x2E
adds r0, r4, 0
movs r1, 0xC
bl sub_804037C
bl SetMonData
movs r0, 0
mov r8, r0
movs r0, 0x3B
@@ -2290,12 +2290,12 @@ _080D54DE:
adds r1, 0xD
mov r0, r9
adds r2, r4, 0
bl sub_804037C
bl SetMonData
mov r1, r8
adds r1, 0x11
mov r0, r9
adds r2, r7, 0
bl sub_804037C
bl SetMonData
adds r7, 0x1
adds r4, 0x2
movs r0, 0x1
@@ -2311,15 +2311,15 @@ _080D54DE:
adds r0, r4, 0
movs r1, 0x15
mov r2, r10
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x20
ldr r2, [sp, 0x20]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x19
ldr r2, [sp, 0x28]
bl sub_804037C
bl SetMonData
ldrb r0, [r6, 0x14]
lsls r0, 27
lsrs r0, 27
@@ -2328,7 +2328,7 @@ _080D54DE:
adds r0, r4, 0
movs r1, 0x27
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrh r0, [r6, 0x14]
lsls r0, 22
@@ -2337,7 +2337,7 @@ _080D54DE:
adds r0, r4, 0
movs r1, 0x28
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrb r0, [r6, 0x15]
lsls r0, 25
@@ -2346,7 +2346,7 @@ _080D54DE:
adds r0, r4, 0
movs r1, 0x29
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldr r0, [r6, 0x14]
lsls r0, 12
@@ -2355,7 +2355,7 @@ _080D54DE:
adds r0, r4, 0
movs r1, 0x2A
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrh r0, [r6, 0x16]
lsls r0, 23
@@ -2364,7 +2364,7 @@ _080D54DE:
adds r0, r4, 0
movs r1, 0x2B
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrb r0, [r6, 0x17]
lsls r0, 26
@@ -2373,47 +2373,47 @@ _080D54DE:
adds r0, r4, 0
movs r1, 0x2C
mov r2, sp
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0
ldr r2, [sp, 0x2C]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x37
ldr r2, [sp, 0x30]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x38
ldr r2, [sp, 0x1C]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x39
ldr r2, [sp, 0x18]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3A
ldr r2, [sp, 0x24]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3B
ldr r2, [sp, 0x4]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3C
ldr r2, [sp, 0x8]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3D
ldr r2, [sp, 0xC]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3E
ldr r2, [sp, 0x10]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3F
ldr r2, [sp, 0x14]
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D560C: .4byte gPlayerParty
@@ -2427,7 +2427,7 @@ _080D5610:
lsls r2, 9
adds r2, r7
movs r1, 0xB
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5628: .4byte gPlayerParty
@@ -2442,7 +2442,7 @@ _080D5630:
lsls r2, 9
adds r2, r7
movs r1, 0xC
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5648: .4byte gPlayerParty
@@ -2466,12 +2466,12 @@ _080D566A:
adds r1, 0xD
adds r0, r7, 0
adds r2, r4, 0
bl sub_804037C
bl SetMonData
mov r1, r8
adds r1, 0x11
adds r0, r7, 0
adds r2, r6, 0
bl sub_804037C
bl SetMonData
adds r6, 0x1
adds r4, 0x2
movs r0, 0x1
@@ -2485,7 +2485,7 @@ _080D566A:
adds r0, r1
movs r1, 0x15
mov r2, r9
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D56A4: .4byte gPlayerParty
@@ -2519,35 +2519,35 @@ _080D56D0:
adds r2, r7
adds r0, r4, 0
movs r1, 0x11
bl sub_804037C
bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x1
adds r2, r0
adds r0, r4, 0
movs r1, 0x12
bl sub_804037C
bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x2
adds r2, r0
adds r0, r4, 0
movs r1, 0x13
bl sub_804037C
bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x3
adds r2, r0
adds r0, r4, 0
movs r1, 0x14
bl sub_804037C
bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x4
adds r2, r0
adds r0, r4, 0
movs r1, 0x15
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D572C: .4byte gPlayerParty
@@ -2568,7 +2568,7 @@ _080D5734:
_080D574C:
adds r3, 0x3
adds r2, r3
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5758: .4byte gPlayerParty
@@ -2584,7 +2584,7 @@ _080D5764:
lsls r2, 9
adds r2, r7
movs r1, 0x1
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D577C: .4byte gPlayerParty
@@ -2599,7 +2599,7 @@ _080D5784:
lsls r2, 9
adds r2, r7
movs r1, 0x19
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D579C: .4byte gPlayerParty
@@ -2614,7 +2614,7 @@ _080D57A4:
lsls r2, 9
adds r2, r7
movs r1, 0x1A
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D57BC: .4byte gPlayerParty
@@ -2629,7 +2629,7 @@ _080D57C4:
lsls r2, 9
adds r2, r7
movs r1, 0x1B
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D57DC: .4byte gPlayerParty
@@ -2644,7 +2644,7 @@ _080D57E4:
lsls r2, 9
adds r2, r7
movs r1, 0x1C
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D57FC: .4byte gPlayerParty
@@ -2659,7 +2659,7 @@ _080D5804:
lsls r2, 9
adds r2, r7
movs r1, 0x1D
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D581C: .4byte gPlayerParty
@@ -2674,7 +2674,7 @@ _080D5824:
lsls r2, 9
adds r2, r7
movs r1, 0x1E
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D583C: .4byte gPlayerParty
@@ -2689,7 +2689,7 @@ _080D5844:
lsls r2, 9
adds r2, r7
movs r1, 0x1F
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D585C: .4byte gPlayerParty
@@ -2704,7 +2704,7 @@ _080D5864:
lsls r2, 9
adds r2, r7
movs r1, 0x20
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D587C: .4byte gPlayerParty
@@ -2719,7 +2719,7 @@ _080D5884:
lsls r2, 9
adds r2, r7
movs r1, 0x22
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D589C: .4byte gPlayerParty
@@ -2734,7 +2734,7 @@ _080D58A4:
lsls r2, 9
adds r2, r7
movs r1, 0x23
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D58BC: .4byte gPlayerParty
@@ -2749,7 +2749,7 @@ _080D58C4:
lsls r2, 9
adds r2, r7
movs r1, 0x24
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D58DC: .4byte gPlayerParty
@@ -2764,7 +2764,7 @@ _080D58E4:
lsls r2, 9
adds r2, r7
movs r1, 0x25
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D58FC: .4byte gPlayerParty
@@ -2779,7 +2779,7 @@ _080D5904:
lsls r2, 9
adds r2, r7
movs r1, 0x26
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D591C: .4byte gPlayerParty
@@ -2796,35 +2796,35 @@ _080D5924:
adds r2, r7
adds r0, r4, 0
movs r1, 0x27
bl sub_804037C
bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x1
adds r2, r0
adds r0, r4, 0
movs r1, 0x28
bl sub_804037C
bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x2
adds r2, r0
adds r0, r4, 0
movs r1, 0x29
bl sub_804037C
bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x3
adds r2, r0
adds r0, r4, 0
movs r1, 0x2A
bl sub_804037C
bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x4
adds r2, r0
adds r0, r4, 0
movs r1, 0x2B
bl sub_804037C
bl SetMonData
ldrb r2, [r5]
lsls r2, 9
adds r0, r7, 0x5
@@ -2844,7 +2844,7 @@ _080D5994:
lsls r2, 9
adds r2, r7
movs r1, 0x27
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D59AC: .4byte gPlayerParty
@@ -2859,7 +2859,7 @@ _080D59B4:
lsls r2, 9
adds r2, r7
movs r1, 0x28
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D59CC: .4byte gPlayerParty
@@ -2874,7 +2874,7 @@ _080D59D4:
lsls r2, 9
adds r2, r7
movs r1, 0x29
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D59EC: .4byte gPlayerParty
@@ -2889,7 +2889,7 @@ _080D59F4:
lsls r2, 9
adds r2, r7
movs r1, 0x2A
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5A0C: .4byte gPlayerParty
@@ -2904,7 +2904,7 @@ _080D5A14:
lsls r2, 9
adds r2, r7
movs r1, 0x2B
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5A2C: .4byte gPlayerParty
@@ -2920,7 +2920,7 @@ _080D5A34:
adds r2, r7
_080D5A44:
movs r1, 0x2C
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5A4C: .4byte gPlayerParty
@@ -2935,7 +2935,7 @@ _080D5A54:
lsls r2, 9
adds r2, r7
movs r1, 0
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5A6C: .4byte gPlayerParty
@@ -2950,7 +2950,7 @@ _080D5A74:
lsls r2, 9
adds r2, r7
movs r1, 0x9
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5A8C: .4byte gPlayerParty
@@ -2965,7 +2965,7 @@ _080D5A94:
lsls r2, 9
adds r2, r7
movs r1, 0x37
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5AAC: .4byte gPlayerParty
@@ -2980,7 +2980,7 @@ _080D5AB4:
lsls r2, 9
adds r2, r7
movs r1, 0x38
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5ACC: .4byte gPlayerParty
@@ -2995,7 +2995,7 @@ _080D5AD4:
lsls r2, 9
adds r2, r7
movs r1, 0x39
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5AEC: .4byte gPlayerParty
@@ -3010,7 +3010,7 @@ _080D5AF4:
lsls r2, 9
adds r2, r7
movs r1, 0x3A
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5B0C: .4byte gPlayerParty
@@ -3025,7 +3025,7 @@ _080D5B14:
lsls r2, 9
adds r2, r7
movs r1, 0x3B
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5B2C: .4byte gPlayerParty
@@ -3040,7 +3040,7 @@ _080D5B34:
lsls r2, 9
adds r2, r7
movs r1, 0x3C
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5B4C: .4byte gPlayerParty
@@ -3055,7 +3055,7 @@ _080D5B54:
lsls r2, 9
adds r2, r7
movs r1, 0x3D
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5B6C: .4byte gPlayerParty
@@ -3070,7 +3070,7 @@ _080D5B74:
lsls r2, 9
adds r2, r7
movs r1, 0x3E
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5B8C: .4byte gPlayerParty
@@ -3085,7 +3085,7 @@ _080D5B94:
lsls r2, 9
adds r2, r7
movs r1, 0x3F
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5BAC: .4byte gPlayerParty
@@ -3100,7 +3100,7 @@ _080D5BB4:
lsls r2, 9
adds r2, r7
movs r1, 0x16
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5BCC: .4byte gPlayerParty
@@ -3115,7 +3115,7 @@ _080D5BD4:
lsls r2, 9
adds r2, r7
movs r1, 0x17
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5BEC: .4byte gPlayerParty
@@ -3130,7 +3130,7 @@ _080D5BF4:
lsls r2, 9
adds r2, r7
movs r1, 0x18
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5C0C: .4byte gPlayerParty
@@ -3145,7 +3145,7 @@ _080D5C14:
lsls r2, 9
adds r2, r7
movs r1, 0x21
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5C2C: .4byte gPlayerParty
@@ -3160,7 +3160,7 @@ _080D5C34:
lsls r2, 9
adds r2, r7
movs r1, 0x2F
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5C4C: .4byte gPlayerParty
@@ -3175,7 +3175,7 @@ _080D5C54:
lsls r2, 9
adds r2, r7
movs r1, 0x30
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5C6C: .4byte gPlayerParty
@@ -3190,7 +3190,7 @@ _080D5C74:
lsls r2, 9
adds r2, r7
movs r1, 0x32
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5C8C: .4byte gPlayerParty
@@ -3205,7 +3205,7 @@ _080D5C94:
lsls r2, 9
adds r2, r7
movs r1, 0x33
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5CAC: .4byte gPlayerParty
@@ -3220,7 +3220,7 @@ _080D5CB4:
lsls r2, 9
adds r2, r7
movs r1, 0x34
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5CCC: .4byte gPlayerParty
@@ -3235,7 +3235,7 @@ _080D5CD4:
lsls r2, 9
adds r2, r7
movs r1, 0x35
bl sub_804037C
bl SetMonData
b _080D5D0A
.align 2, 0
_080D5CEC: .4byte gPlayerParty
@@ -3250,7 +3250,7 @@ _080D5CF4:
lsls r2, 9
adds r2, r7
movs r1, 0x36
bl sub_804037C
bl SetMonData
_080D5D0A:
ldr r2, _080D5D3C @ =gBattlerPartyIndexes
ldr r0, _080D5D38 @ =gActiveBattler
@@ -3365,13 +3365,13 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4
lsls r4, 16
lsrs r4, 16
ldrb r0, [r6]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F7D4
ldr r0, _080D5EB4 @ =gUnknown_20244DC
ldr r0, _080D5EB4 @ =gMultiuseSpriteTemplate
mov r8, r0
ldrb r0, [r6]
movs r1, 0x2
@@ -3435,7 +3435,7 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, _080D5EC4 @ =gUnknown_2024024
ldr r1, _080D5EC4 @ =gBattleMonForms
adds r2, r1
ldrb r1, [r2]
bl StartSpriteAnim
@@ -3454,11 +3454,11 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4
_080D5EA8: .4byte gBattlerPartyIndexes
_080D5EAC: .4byte gActiveBattler
_080D5EB0: .4byte gPlayerParty
_080D5EB4: .4byte gUnknown_20244DC
_080D5EB4: .4byte gMultiuseSpriteTemplate
_080D5EB8: .4byte gUnknown_2023D44
_080D5EBC: .4byte gSprites
_080D5EC0: .4byte 0x0000ff10
_080D5EC4: .4byte gUnknown_2024024
_080D5EC4: .4byte gBattleMonForms
_080D5EC8: .4byte gUnknown_3004FE0
_080D5ECC: .4byte sub_80D4590
thumb_func_end LinkPartnerHandleLoadPokeSprite
@@ -3557,13 +3557,13 @@ sub_80D5F40: @ 80D5F40
mov r1, r9
strb r0, [r1]
adds r0, r6, 0
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
ldr r0, _080D6098 @ =gUnknown_20244DC
ldr r0, _080D6098 @ =gMultiuseSpriteTemplate
mov r10, r0
adds r0, r6, 0
movs r1, 0x2
@@ -3626,7 +3626,7 @@ sub_80D5F40: @ 80D5F40
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, _080D60A4 @ =gUnknown_2024024
ldr r1, _080D60A4 @ =gBattleMonForms
adds r6, r1
ldrb r1, [r6]
bl StartSpriteAnim
@@ -3674,10 +3674,10 @@ _080D6088: .4byte gUnknown_2022BC4
_080D608C: .4byte gPlayerParty
_080D6090: .4byte sub_8033E3C
_080D6094: .4byte gUnknown_3004FFC
_080D6098: .4byte gUnknown_20244DC
_080D6098: .4byte gMultiuseSpriteTemplate
_080D609C: .4byte gUnknown_2023D44
_080D60A0: .4byte gSprites
_080D60A4: .4byte gUnknown_2024024
_080D60A4: .4byte gBattleMonForms
_080D60A8: .4byte SpriteCallbackDummy
thumb_func_end sub_80D5F40
@@ -3829,7 +3829,7 @@ sub_80D61C8: @ 80D61C8
push {r7}
ldr r6, _080D6240 @ =gActiveBattler
ldrb r0, [r6]
bl GetBankIdentity
bl GetBattlerPosition
movs r1, 0x2
ands r1, r0
movs r7, 0x20
@@ -3839,7 +3839,7 @@ sub_80D61C8: @ 80D61C8
_080D61E2:
ldrb r0, [r6]
bl GetBankMultiplayerId
ldr r5, _080D6244 @ =gUnknown_202273C
ldr r5, _080D6244 @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -3873,7 +3873,7 @@ _080D6228:
ldr r0, _080D6240 @ =gActiveBattler
ldrb r0, [r0]
bl GetBankMultiplayerId
ldr r2, _080D6244 @ =gUnknown_202273C
ldr r2, _080D6244 @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -3883,7 +3883,7 @@ _080D6228:
b _080D6258
.align 2, 0
_080D6240: .4byte gActiveBattler
_080D6244: .4byte gUnknown_202273C
_080D6244: .4byte gLinkPlayers
_080D6248:
ldrb r0, [r6]
bl GetBankMultiplayerId
@@ -3898,13 +3898,13 @@ _080D6258:
adds r0, r4, 0
bl sub_8034750
ldrb r0, [r5]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F864
ldr r6, _080D631C @ =gUnknown_20244DC
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r6, _080D631C @ =gMultiuseSpriteTemplate
mov r8, r7
ldr r0, _080D6320 @ =gUnknown_8239F8C
lsls r4, 2
@@ -3985,7 +3985,7 @@ _080D6258:
bx r0
.align 2, 0
_080D6318: .4byte gActiveBattler
_080D631C: .4byte gUnknown_20244DC
_080D631C: .4byte gMultiuseSpriteTemplate
_080D6320: .4byte gUnknown_8239F8C
_080D6324: .4byte gUnknown_2023D44
_080D6328: .4byte gSprites
@@ -4590,7 +4590,7 @@ sub_80D67CC: @ 80D67CC
lsls r0, 24
cmp r0, 0
beq _080D6814
ldr r0, _080D6810 @ =gUnknown_202298C
ldr r0, _080D6810 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
b _080D681C
@@ -4599,9 +4599,9 @@ _080D6800: .4byte gUnknown_2022974
_080D6804: .4byte gUnknown_2022976
_080D6808: .4byte gActiveBattler
_080D680C: .4byte gUnknown_2022BC6
_080D6810: .4byte gUnknown_202298C
_080D6810: .4byte gDisplayedStringBattle
_080D6814:
ldr r0, _080D6830 @ =gUnknown_202298C
ldr r0, _080D6830 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
_080D681C:
@@ -4616,7 +4616,7 @@ _080D681C:
pop {r0}
bx r0
.align 2, 0
_080D6830: .4byte gUnknown_202298C
_080D6830: .4byte gDisplayedStringBattle
_080D6834: .4byte gUnknown_3004FE0
_080D6838: .4byte gActiveBattler
_080D683C: .4byte sub_80D4718
@@ -5122,7 +5122,7 @@ LinkPartnerHandleEffectivenessSound: @ 80D6BEC
push {r4,lr}
ldr r4, _080D6C28 @ =gActiveBattler
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
movs r3, 0x3F
cmp r0, 0
@@ -5315,7 +5315,7 @@ sub_80D6CD4: @ 80D6CD4
lsrs r7, r0, 24
ldrb r0, [r6]
bl GetBankMultiplayerId
ldr r4, _080D6DF8 @ =gUnknown_202273C
ldr r4, _080D6DF8 @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -5349,7 +5349,7 @@ _080D6DC2:
ldr r0, _080D6DE0 @ =gActiveBattler
ldrb r0, [r0]
bl GetBankMultiplayerId
ldr r2, _080D6DF8 @ =gUnknown_202273C
ldr r2, _080D6DF8 @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -5365,7 +5365,7 @@ _080D6DE8: .4byte 0x0000ffd8
_080D6DEC: .4byte sub_8075590
_080D6DF0: .4byte sub_80335F8
_080D6DF4: .4byte 0x0000d6f9
_080D6DF8: .4byte gUnknown_202273C
_080D6DF8: .4byte gLinkPlayers
_080D6DFC:
ldrb r0, [r6]
bl GetBankMultiplayerId
@@ -5605,7 +5605,7 @@ sub_80D6FDC: @ 80D6FDC
cmp r0, 0
beq _080D700C
adds r0, r2, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080D700C
asm/battle_controller_oak.s
+141 -141
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_opponent.s
+115 -115
View File
@@ -2567,12 +2567,12 @@ _08036F9C:
adds r0, r4, 0
movs r1, 0xB
adds r2, r7, 0
bl sub_804037C
bl SetMonData
adds r2, r7, 0
adds r2, 0x2E
adds r0, r4, 0
movs r1, 0xC
bl sub_804037C
bl SetMonData
movs r0, 0
mov r8, r0
movs r0, 0x3B
@@ -2613,12 +2613,12 @@ _08037002:
adds r1, 0xD
mov r0, r9
adds r2, r4, 0
bl sub_804037C
bl SetMonData
mov r1, r8
adds r1, 0x11
mov r0, r9
adds r2, r6, 0
bl sub_804037C
bl SetMonData
adds r6, 0x1
adds r4, 0x2
movs r0, 0x1
@@ -2634,15 +2634,15 @@ _08037002:
adds r0, r4, 0
movs r1, 0x15
mov r2, r10
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x20
ldr r2, [sp, 0x20]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x19
ldr r2, [sp, 0x28]
bl sub_804037C
bl SetMonData
ldrb r0, [r7, 0x14]
lsls r0, 27
lsrs r0, 27
@@ -2651,7 +2651,7 @@ _08037002:
adds r0, r4, 0
movs r1, 0x27
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrh r0, [r7, 0x14]
lsls r0, 22
@@ -2660,7 +2660,7 @@ _08037002:
adds r0, r4, 0
movs r1, 0x28
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrb r0, [r7, 0x15]
lsls r0, 25
@@ -2669,7 +2669,7 @@ _08037002:
adds r0, r4, 0
movs r1, 0x29
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldr r0, [r7, 0x14]
lsls r0, 12
@@ -2678,7 +2678,7 @@ _08037002:
adds r0, r4, 0
movs r1, 0x2A
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrh r0, [r7, 0x16]
lsls r0, 23
@@ -2687,7 +2687,7 @@ _08037002:
adds r0, r4, 0
movs r1, 0x2B
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, sp
ldrb r0, [r7, 0x17]
lsls r0, 26
@@ -2696,47 +2696,47 @@ _08037002:
adds r0, r4, 0
movs r1, 0x2C
mov r2, sp
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0
ldr r2, [sp, 0x2C]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x37
ldr r2, [sp, 0x30]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x38
ldr r2, [sp, 0x1C]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x39
ldr r2, [sp, 0x18]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3A
ldr r2, [sp, 0x24]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3B
ldr r2, [sp, 0x4]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3C
ldr r2, [sp, 0x8]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3D
ldr r2, [sp, 0xC]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3E
ldr r2, [sp, 0x10]
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x3F
ldr r2, [sp, 0x14]
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037130: .4byte gEnemyParty
@@ -2749,7 +2749,7 @@ _08037134:
lsls r2, 9
adds r2, r3
movs r1, 0xB
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_0803714C: .4byte gEnemyParty
@@ -2762,7 +2762,7 @@ _08037150:
lsls r2, 9
adds r2, r3
movs r1, 0xC
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037168: .4byte gEnemyParty
@@ -2784,12 +2784,12 @@ _08037184:
adds r1, 0xD
adds r0, r7, 0
adds r2, r4, 0
bl sub_804037C
bl SetMonData
mov r1, r8
adds r1, 0x11
adds r0, r7, 0
adds r2, r6, 0
bl sub_804037C
bl SetMonData
adds r6, 0x1
adds r4, 0x2
movs r0, 0x1
@@ -2803,7 +2803,7 @@ _08037184:
adds r0, r1
movs r1, 0x15
mov r2, r9
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080371BC: .4byte gEnemyParty
@@ -2835,7 +2835,7 @@ _080371E0:
adds r0, r4, 0
movs r1, 0x11
str r3, [sp, 0x34]
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -2843,7 +2843,7 @@ _080371E0:
adds r2, r0
adds r0, r4, 0
movs r1, 0x12
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -2851,7 +2851,7 @@ _080371E0:
adds r2, r0
adds r0, r4, 0
movs r1, 0x13
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -2859,7 +2859,7 @@ _080371E0:
adds r2, r0
adds r0, r4, 0
movs r1, 0x14
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -2867,7 +2867,7 @@ _080371E0:
adds r2, r0
adds r0, r4, 0
movs r1, 0x15
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037244: .4byte gEnemyParty
@@ -2886,7 +2886,7 @@ _08037248:
_0803725E:
adds r3, 0x3
adds r2, r3
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037268: .4byte gEnemyParty
@@ -2900,7 +2900,7 @@ _08037270:
lsls r2, 9
adds r2, r3
movs r1, 0x1
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037288: .4byte gEnemyParty
@@ -2913,7 +2913,7 @@ _0803728C:
lsls r2, 9
adds r2, r3
movs r1, 0x19
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080372A4: .4byte gEnemyParty
@@ -2926,7 +2926,7 @@ _080372A8:
lsls r2, 9
adds r2, r3
movs r1, 0x1A
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080372C0: .4byte gEnemyParty
@@ -2939,7 +2939,7 @@ _080372C4:
lsls r2, 9
adds r2, r3
movs r1, 0x1B
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080372DC: .4byte gEnemyParty
@@ -2952,7 +2952,7 @@ _080372E0:
lsls r2, 9
adds r2, r3
movs r1, 0x1C
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080372F8: .4byte gEnemyParty
@@ -2965,7 +2965,7 @@ _080372FC:
lsls r2, 9
adds r2, r3
movs r1, 0x1D
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037314: .4byte gEnemyParty
@@ -2978,7 +2978,7 @@ _08037318:
lsls r2, 9
adds r2, r3
movs r1, 0x1E
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037330: .4byte gEnemyParty
@@ -2991,7 +2991,7 @@ _08037334:
lsls r2, 9
adds r2, r3
movs r1, 0x1F
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_0803734C: .4byte gEnemyParty
@@ -3004,7 +3004,7 @@ _08037350:
lsls r2, 9
adds r2, r3
movs r1, 0x20
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037368: .4byte gEnemyParty
@@ -3017,7 +3017,7 @@ _0803736C:
lsls r2, 9
adds r2, r3
movs r1, 0x22
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037384: .4byte gEnemyParty
@@ -3030,7 +3030,7 @@ _08037388:
lsls r2, 9
adds r2, r3
movs r1, 0x23
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080373A0: .4byte gEnemyParty
@@ -3043,7 +3043,7 @@ _080373A4:
lsls r2, 9
adds r2, r3
movs r1, 0x24
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080373BC: .4byte gEnemyParty
@@ -3056,7 +3056,7 @@ _080373C0:
lsls r2, 9
adds r2, r3
movs r1, 0x25
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080373D8: .4byte gEnemyParty
@@ -3069,7 +3069,7 @@ _080373DC:
lsls r2, 9
adds r2, r3
movs r1, 0x26
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080373F4: .4byte gEnemyParty
@@ -3085,7 +3085,7 @@ _080373F8:
adds r0, r4, 0
movs r1, 0x27
str r3, [sp, 0x34]
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -3093,7 +3093,7 @@ _080373F8:
adds r2, r0
adds r0, r4, 0
movs r1, 0x28
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -3101,7 +3101,7 @@ _080373F8:
adds r2, r0
adds r0, r4, 0
movs r1, 0x29
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -3109,7 +3109,7 @@ _080373F8:
adds r2, r0
adds r0, r4, 0
movs r1, 0x2A
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -3117,7 +3117,7 @@ _080373F8:
adds r2, r0
adds r0, r4, 0
movs r1, 0x2B
bl sub_804037C
bl SetMonData
ldrb r2, [r6]
lsls r2, 9
ldr r3, [sp, 0x34]
@@ -3136,7 +3136,7 @@ _0803746C:
lsls r2, 9
adds r2, r3
movs r1, 0x27
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037484: .4byte gEnemyParty
@@ -3149,7 +3149,7 @@ _08037488:
lsls r2, 9
adds r2, r3
movs r1, 0x28
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080374A0: .4byte gEnemyParty
@@ -3162,7 +3162,7 @@ _080374A4:
lsls r2, 9
adds r2, r3
movs r1, 0x29
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080374BC: .4byte gEnemyParty
@@ -3175,7 +3175,7 @@ _080374C0:
lsls r2, 9
adds r2, r3
movs r1, 0x2A
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080374D8: .4byte gEnemyParty
@@ -3188,7 +3188,7 @@ _080374DC:
lsls r2, 9
adds r2, r3
movs r1, 0x2B
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080374F4: .4byte gEnemyParty
@@ -3202,7 +3202,7 @@ _080374F8:
adds r2, r3
_08037506:
movs r1, 0x2C
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037510: .4byte gEnemyParty
@@ -3215,7 +3215,7 @@ _08037514:
lsls r2, 9
adds r2, r3
movs r1, 0
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_0803752C: .4byte gEnemyParty
@@ -3228,7 +3228,7 @@ _08037530:
lsls r2, 9
adds r2, r3
movs r1, 0x9
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037548: .4byte gEnemyParty
@@ -3241,7 +3241,7 @@ _0803754C:
lsls r2, 9
adds r2, r3
movs r1, 0x37
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037564: .4byte gEnemyParty
@@ -3254,7 +3254,7 @@ _08037568:
lsls r2, 9
adds r2, r3
movs r1, 0x38
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037580: .4byte gEnemyParty
@@ -3267,7 +3267,7 @@ _08037584:
lsls r2, 9
adds r2, r3
movs r1, 0x39
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_0803759C: .4byte gEnemyParty
@@ -3280,7 +3280,7 @@ _080375A0:
lsls r2, 9
adds r2, r3
movs r1, 0x3A
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080375B8: .4byte gEnemyParty
@@ -3293,7 +3293,7 @@ _080375BC:
lsls r2, 9
adds r2, r3
movs r1, 0x3B
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080375D4: .4byte gEnemyParty
@@ -3306,7 +3306,7 @@ _080375D8:
lsls r2, 9
adds r2, r3
movs r1, 0x3C
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080375F0: .4byte gEnemyParty
@@ -3319,7 +3319,7 @@ _080375F4:
lsls r2, 9
adds r2, r3
movs r1, 0x3D
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_0803760C: .4byte gEnemyParty
@@ -3332,7 +3332,7 @@ _08037610:
lsls r2, 9
adds r2, r3
movs r1, 0x3E
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037628: .4byte gEnemyParty
@@ -3345,7 +3345,7 @@ _0803762C:
lsls r2, 9
adds r2, r3
movs r1, 0x3F
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037644: .4byte gEnemyParty
@@ -3358,7 +3358,7 @@ _08037648:
lsls r2, 9
adds r2, r3
movs r1, 0x16
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037660: .4byte gEnemyParty
@@ -3371,7 +3371,7 @@ _08037664:
lsls r2, 9
adds r2, r3
movs r1, 0x17
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_0803767C: .4byte gEnemyParty
@@ -3384,7 +3384,7 @@ _08037680:
lsls r2, 9
adds r2, r3
movs r1, 0x18
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037698: .4byte gEnemyParty
@@ -3397,7 +3397,7 @@ _0803769C:
lsls r2, 9
adds r2, r3
movs r1, 0x21
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080376B4: .4byte gEnemyParty
@@ -3410,7 +3410,7 @@ _080376B8:
lsls r2, 9
adds r2, r3
movs r1, 0x2F
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080376D0: .4byte gEnemyParty
@@ -3423,7 +3423,7 @@ _080376D4:
lsls r2, 9
adds r2, r3
movs r1, 0x30
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_080376EC: .4byte gEnemyParty
@@ -3436,7 +3436,7 @@ _080376F0:
lsls r2, 9
adds r2, r3
movs r1, 0x32
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037708: .4byte gEnemyParty
@@ -3449,7 +3449,7 @@ _0803770C:
lsls r2, 9
adds r2, r3
movs r1, 0x33
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037724: .4byte gEnemyParty
@@ -3462,7 +3462,7 @@ _08037728:
lsls r2, 9
adds r2, r3
movs r1, 0x34
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_08037740: .4byte gEnemyParty
@@ -3475,7 +3475,7 @@ _08037744:
lsls r2, 9
adds r2, r3
movs r1, 0x35
bl sub_804037C
bl SetMonData
b _08037774
.align 2, 0
_0803775C: .4byte gEnemyParty
@@ -3488,7 +3488,7 @@ _08037760:
lsls r2, 9
adds r2, r3
movs r1, 0x36
bl sub_804037C
bl SetMonData
_08037774:
add sp, 0x38
pop {r3-r5}
@@ -3644,13 +3644,13 @@ _08037890:
_080378AA:
ldr r7, _0803799C @ =gActiveBattler
ldrb r0, [r7]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
ldr r6, _080379A0 @ =gUnknown_20244DC
ldr r6, _080379A0 @ =gMultiuseSpriteTemplate
ldrb r0, [r7]
movs r1, 0x2
bl sub_8074480
@@ -3717,7 +3717,7 @@ _080378AA:
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, _080379B0 @ =gUnknown_2024024
ldr r1, _080379B0 @ =gBattleMonForms
adds r2, r1
ldrb r1, [r2]
bl StartSpriteAnim
@@ -3758,11 +3758,11 @@ _08037986:
bx r0
.align 2, 0
_0803799C: .4byte gActiveBattler
_080379A0: .4byte gUnknown_20244DC
_080379A0: .4byte gMultiuseSpriteTemplate
_080379A4: .4byte gUnknown_2023D44
_080379A8: .4byte gSprites
_080379AC: .4byte 0x0000ff10
_080379B0: .4byte gUnknown_2024024
_080379B0: .4byte gBattleMonForms
_080379B4: .4byte gBattleTypeFlags
_080379B8: .4byte gBattlerPartyIndexes
_080379BC: .4byte gEnemyParty
@@ -3867,13 +3867,13 @@ sub_8037A28: @ 8037A28
adds r1, r6, 0
bl BattleLoadOpponentMonSpriteGfx
adds r0, r6, 0
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
ldr r0, _08037B98 @ =gUnknown_20244DC
ldr r0, _08037B98 @ =gMultiuseSpriteTemplate
mov r9, r0
adds r0, r6, 0
movs r1, 0x2
@@ -3936,7 +3936,7 @@ sub_8037A28: @ 8037A28
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, _08037BA4 @ =gUnknown_2024024
ldr r1, _08037BA4 @ =gBattleMonForms
adds r6, r1
ldrb r1, [r6]
bl StartSpriteAnim
@@ -3984,10 +3984,10 @@ _08037B88: .4byte gUnknown_2022BC4
_08037B8C: .4byte gEnemyParty
_08037B90: .4byte sub_8033E3C
_08037B94: .4byte gUnknown_3004FFC
_08037B98: .4byte gUnknown_20244DC
_08037B98: .4byte gMultiuseSpriteTemplate
_08037B9C: .4byte gUnknown_2023D44
_08037BA0: .4byte gSprites
_08037BA4: .4byte gUnknown_2024024
_08037BA4: .4byte gBattleMonForms
_08037BA8: .4byte SpriteCallbackDummy
thumb_func_end sub_8037A28
@@ -4198,13 +4198,13 @@ _08037D3A:
bl sub_80346C4
mov r1, r8
ldrb r0, [r1]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
mov r0, r9
bl sub_803F864
ldr r5, _08037E74 @ =gUnknown_20244DC
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r5, _08037E74 @ =gMultiuseSpriteTemplate
ldr r1, _08037E78 @ =gUnknown_823932C
mov r2, r9
lsls r0, r2, 2
@@ -4339,7 +4339,7 @@ _08037D3A:
.align 2, 0
_08037E6C: .4byte gTrainers
_08037E70: .4byte gActiveBattler
_08037E74: .4byte gUnknown_20244DC
_08037E74: .4byte gMultiuseSpriteTemplate
_08037E78: .4byte gUnknown_823932C
_08037E7C: .4byte gUnknown_2023D44
_08037E80: .4byte gSprites
@@ -4417,13 +4417,13 @@ _08037F0E:
bl sub_80346C4
mov r1, r8
ldrb r0, [r1]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
mov r0, r9
bl sub_803F864
ldr r0, _08038048 @ =gUnknown_20244DC
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r0, _08038048 @ =gMultiuseSpriteTemplate
ldr r2, _0803804C @ =gUnknown_823932C
mov r3, r9
lsls r1, r3, 2
@@ -4559,7 +4559,7 @@ _08037F0E:
.align 2, 0
_08038040: .4byte gTrainers
_08038044: .4byte gActiveBattler
_08038048: .4byte gUnknown_20244DC
_08038048: .4byte gMultiuseSpriteTemplate
_0803804C: .4byte gUnknown_823932C
_08038050: .4byte gUnknown_2023D44
_08038054: .4byte gSprites
@@ -5130,7 +5130,7 @@ sub_80384BC: @ 80384BC
lsls r0, 24
cmp r0, 0
beq _08038504
ldr r0, _08038500 @ =gUnknown_202298C
ldr r0, _08038500 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
b _0803850C
@@ -5139,9 +5139,9 @@ _080384F0: .4byte gUnknown_2022974
_080384F4: .4byte gUnknown_2022976
_080384F8: .4byte gActiveBattler
_080384FC: .4byte gUnknown_2022BC6
_08038500: .4byte gUnknown_202298C
_08038500: .4byte gDisplayedStringBattle
_08038504:
ldr r0, _08038534 @ =gUnknown_202298C
ldr r0, _08038534 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
_0803850C:
@@ -5165,7 +5165,7 @@ _0803850C:
ldr r1, _08038548 @ =sub_80E85C0
b _08038574
.align 2, 0
_08038534: .4byte gUnknown_202298C
_08038534: .4byte gDisplayedStringBattle
_08038538: .4byte gBattleTypeFlags
_0803853C: .4byte 0x0000017f
_08038540: .4byte gUnknown_3004FE0
@@ -5292,7 +5292,7 @@ _0803861C:
cmp r0, 0
beq _08038656
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r5, _08038674 @ =gBattlerTarget
strb r0, [r5]
ldr r0, _08038678 @ =gAbsentBattlerFlags
@@ -5306,7 +5306,7 @@ _0803861C:
cmp r1, 0
beq _08038656
movs r0, 0x2
bl GetBankByIdentity
bl GetBattlerAtPosition
strb r0, [r5]
_08038656:
ldr r0, _08038674 @ =gBattlerTarget
@@ -5371,7 +5371,7 @@ _080386C4:
lsls r1, 24
lsrs r1, 24
adds r0, r1, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
adds r2, r0, 0
lsls r2, 24
lsrs r2, 16
@@ -5384,7 +5384,7 @@ _080386C4:
_080386F4: .4byte gBattleTypeFlags
_080386F8:
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
adds r2, r0, 0
lsls r2, 24
lsrs r2, 16
@@ -5427,7 +5427,7 @@ sub_8038744: @ 8038744
push {r4-r6,lr}
ldr r6, _08038788 @ =gActiveBattler
ldrb r0, [r6]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
ldr r5, _0803878C @ =gBattleStruct
@@ -5449,7 +5449,7 @@ sub_8038744: @ 8038744
cmp r0, 0
bne _08038794
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
@@ -5460,11 +5460,11 @@ _0803878C: .4byte gBattleStruct
_08038790: .4byte gBattleTypeFlags
_08038794:
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0x3
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r5, r0, 24
_080387A8:
@@ -5500,7 +5500,7 @@ _080387DC: .4byte gEnemyParty
_080387E0: .4byte gBattlerPartyIndexes
_080387E4:
ldrb r0, [r6]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
ldr r1, [r5]
@@ -5508,7 +5508,7 @@ _080387E4:
adds r0, 0x92
ldrb r4, [r0]
ldrb r0, [r6]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
ldr r1, [r5]
@@ -5990,7 +5990,7 @@ OpponentHandleEffectivenessSound: @ 8038B9C
push {r4,lr}
ldr r4, _08038BD8 @ =gActiveBattler
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
movs r3, 0x3F
cmp r0, 0
@@ -6372,7 +6372,7 @@ sub_8038EA8: @ 8038EA8
cmp r0, 0
beq _08038ED8
adds r0, r2, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08038ED8
asm/battle_controller_player.s
+168 -168
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_pokedude.s
+148 -148
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_safari.s
+16 -16
View File
@@ -623,13 +623,13 @@ SafariHandleDrawTrainerPic: @ 80DD9C4
ldr r0, [r4]
ldrb r6, [r0, 0x8]
ldrb r0, [r5]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
bl sub_803F864
ldr r0, _080DDA84 @ =gUnknown_20244DC
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r0, _080DDA84 @ =gMultiuseSpriteTemplate
ldr r2, _080DDA88 @ =gUnknown_8239F8C
ldr r1, [r4]
ldrb r1, [r1, 0x8]
@@ -704,7 +704,7 @@ SafariHandleDrawTrainerPic: @ 80DD9C4
.align 2, 0
_080DDA7C: .4byte gSaveBlock2Ptr
_080DDA80: .4byte gActiveBattler
_080DDA84: .4byte gUnknown_20244DC
_080DDA84: .4byte gMultiuseSpriteTemplate
_080DDA88: .4byte gUnknown_8239F8C
_080DDA8C: .4byte gUnknown_2023D44
_080DDA90: .4byte gSprites
@@ -760,7 +760,7 @@ sub_80DDAD4: @ 80DDAD4
ldr r5, _080DDB1C @ =gActiveBattler
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -804,7 +804,7 @@ sub_80DDB28: @ 80DDB28
strb r0, [r1]
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -866,7 +866,7 @@ sub_80DDBA0: @ 80DDBA0
lsls r0, 24
cmp r0, 0
beq _080DDBE8
ldr r0, _080DDBE4 @ =gUnknown_202298C
ldr r0, _080DDBE4 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
b _080DDBF0
@@ -875,9 +875,9 @@ _080DDBD4: .4byte gUnknown_2022974
_080DDBD8: .4byte gUnknown_2022976
_080DDBDC: .4byte gActiveBattler
_080DDBE0: .4byte gUnknown_2022BC6
_080DDBE4: .4byte gUnknown_202298C
_080DDBE4: .4byte gDisplayedStringBattle
_080DDBE8:
ldr r0, _080DDC04 @ =gUnknown_202298C
ldr r0, _080DDC04 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
_080DDBF0:
@@ -892,7 +892,7 @@ _080DDBF0:
pop {r0}
bx r0
.align 2, 0
_080DDC04: .4byte gUnknown_202298C
_080DDC04: .4byte gDisplayedStringBattle
_080DDC08: .4byte gUnknown_3004FE0
_080DDC0C: .4byte gActiveBattler
_080DDC10: .4byte CompleteOnInactiveTextPrinter_3
@@ -903,7 +903,7 @@ sub_80DDC14: @ 80DDC14
push {lr}
ldr r0, _080DDC2C @ =gActiveBattler
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080DDC30
@@ -982,7 +982,7 @@ _080DDC9A:
bl ActionSelectionCreateCursorAt
ldr r0, _080DDCE4 @ =gUnknown_83FE6E6
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080DDCE8 @ =gUnknown_202298C
ldr r0, _080DDCE8 @ =gDisplayedStringBattle
movs r1, 0x1
bl sub_80D87BC
pop {r4}
@@ -996,7 +996,7 @@ _080DDCD8: .4byte gUnknown_83FDA4C
_080DDCDC: .4byte gUnknown_83FE747
_080DDCE0: .4byte gUnknown_2023FF8
_080DDCE4: .4byte gUnknown_83FE6E6
_080DDCE8: .4byte gUnknown_202298C
_080DDCE8: .4byte gDisplayedStringBattle
thumb_func_end sub_80DDC78
thumb_func_start sub_80DDCEC
@@ -1033,7 +1033,7 @@ sub_80DDD04: @ 80DDD04
adds r0, r1
ldr r1, _080DDD3C @ =sub_80DD82C
str r1, [r0]
ldr r1, _080DDD40 @ =gUnknown_2024004
ldr r1, _080DDD40 @ =gBattlerInMenuId
ldrb r0, [r2]
strb r0, [r1]
add sp, 0x4
@@ -1043,7 +1043,7 @@ sub_80DDD04: @ 80DDD04
_080DDD34: .4byte gUnknown_3004FE0
_080DDD38: .4byte gActiveBattler
_080DDD3C: .4byte sub_80DD82C
_080DDD40: .4byte gUnknown_2024004
_080DDD40: .4byte gBattlerInMenuId
thumb_func_end sub_80DDD04
thumb_func_start sub_80DDD44
@@ -1239,7 +1239,7 @@ SafariHandlePlaySE: @ 80DDE70
push {r4,lr}
ldr r4, _080DDEAC @ =gActiveBattler
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
movs r3, 0x3F
cmp r0, 0
asm/battle_controllers.s
+48 -48
View File
@@ -81,7 +81,7 @@ _0800D298:
movs r4, 0
str r4, [r0]
bl ClearBattleAnimationVars
bl sub_8043FBC
bl ClearBattleMonForms
bl BattleAI_HandleItemUseBeforeAISetup
ldr r0, _0800D304 @ =gUnknown_2022B54
str r4, [r0]
@@ -129,7 +129,7 @@ _0800D328:
cmp r0, 0
bne _0800D356
movs r4, 0
ldr r0, _0800D360 @ =gUnknown_2023BCC
ldr r0, _0800D360 @ =gBattlersCount
ldrb r1, [r0]
cmp r4, r1
bge _0800D356
@@ -149,7 +149,7 @@ _0800D356:
bx r0
.align 2, 0
_0800D35C: .4byte gBattleTypeFlags
_0800D360: .4byte gUnknown_2023BCC
_0800D360: .4byte gBattlersCount
thumb_func_end sub_800D30C
thumb_func_start sub_800D364
@@ -177,7 +177,7 @@ sub_800D364: @ 800D364
strb r3, [r0]
str r1, [r2, 0x4]
strb r4, [r0, 0x1]
ldr r1, _0800D3B0 @ =gUnknown_2023BCC
ldr r1, _0800D3B0 @ =gBattlersCount
movs r0, 0x2
b _0800D478
.align 2, 0
@@ -187,7 +187,7 @@ _0800D3A0: .4byte sub_80123C0
_0800D3A4: .4byte gUnknown_3004FE0
_0800D3A8: .4byte sub_81560A4
_0800D3AC: .4byte gUnknown_2023BD6
_0800D3B0: .4byte gUnknown_2023BCC
_0800D3B0: .4byte gBattlersCount
_0800D3B4:
movs r0, 0x80
ands r0, r2
@@ -224,7 +224,7 @@ _0800D3E8:
str r0, [r2, 0x4]
movs r0, 0x1
strb r0, [r1, 0x1]
ldr r1, _0800D410 @ =gUnknown_2023BCC
ldr r1, _0800D410 @ =gBattlersCount
movs r0, 0x2
b _0800D478
.align 2, 0
@@ -232,7 +232,7 @@ _0800D400: .4byte gUnknown_3004FE0
_0800D404: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D408: .4byte gUnknown_2023BD6
_0800D40C: .4byte sub_8035A7C
_0800D410: .4byte gUnknown_2023BCC
_0800D410: .4byte gBattlersCount
_0800D414:
ldr r1, _0800D444 @ =gUnknown_3004F84
ldr r0, _0800D448 @ =sub_80123C0
@@ -279,7 +279,7 @@ _0800D458:
movs r0, 0x3
strb r0, [r1, 0x3]
_0800D474:
ldr r1, _0800D490 @ =gUnknown_2023BCC
ldr r1, _0800D490 @ =gBattlersCount
movs r0, 0x4
_0800D478:
strb r0, [r1]
@@ -291,7 +291,7 @@ _0800D480: .4byte gUnknown_3004FE0
_0800D484: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D488: .4byte gUnknown_2023BD6
_0800D48C: .4byte sub_8035A7C
_0800D490: .4byte gUnknown_2023BCC
_0800D490: .4byte gBattlersCount
thumb_func_end sub_800D364
thumb_func_start sub_800D494
@@ -323,7 +323,7 @@ sub_800D494: @ 800D494
ldr r0, _0800D4E8 @ =sub_803A668
str r0, [r2, 0x4]
strb r5, [r1, 0x1]
ldr r1, _0800D4EC @ =gUnknown_2023BCC
ldr r1, _0800D4EC @ =gBattlersCount
movs r0, 0x2
b _0800D752
.align 2, 0
@@ -334,7 +334,7 @@ _0800D4DC: .4byte gUnknown_3004FE0
_0800D4E0: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D4E4: .4byte gUnknown_2023BD6
_0800D4E8: .4byte sub_803A668
_0800D4EC: .4byte gUnknown_2023BCC
_0800D4EC: .4byte gBattlersCount
_0800D4F0:
ldr r2, _0800D508 @ =gUnknown_3004FE0
ldr r0, _0800D50C @ =SetBankFuncToPlayerBufferRunCommand
@@ -344,7 +344,7 @@ _0800D4F0:
ldr r0, _0800D514 @ =sub_803A668
str r0, [r2]
strb r5, [r1]
ldr r1, _0800D518 @ =gUnknown_2023BCC
ldr r1, _0800D518 @ =gBattlersCount
movs r0, 0x2
b _0800D752
.align 2, 0
@@ -352,7 +352,7 @@ _0800D508: .4byte gUnknown_3004FE0
_0800D50C: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D510: .4byte gUnknown_2023BD6
_0800D514: .4byte sub_803A668
_0800D518: .4byte gUnknown_2023BCC
_0800D518: .4byte gBattlersCount
_0800D51C:
movs r5, 0x41
ands r5, r0
@@ -405,7 +405,7 @@ _0800D56C:
movs r0, 0x3
strb r0, [r1, 0x2]
_0800D588:
ldr r0, _0800D5A0 @ =gUnknown_2023BCC
ldr r0, _0800D5A0 @ =gBattlersCount
strb r6, [r0]
b _0800D754
.align 2, 0
@@ -413,7 +413,7 @@ _0800D590: .4byte gUnknown_3004FE0
_0800D594: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D598: .4byte gUnknown_2023BD6
_0800D59C: .4byte sub_803A668
_0800D5A0: .4byte gUnknown_2023BCC
_0800D5A0: .4byte gBattlersCount
_0800D5A4:
bl GetMultiplayerId
lsls r0, 24
@@ -429,7 +429,7 @@ _0800D5A4:
_0800D5BC:
movs r0, 0
mov r10, r0
ldr r1, _0800D5EC @ =gUnknown_202273C
ldr r1, _0800D5EC @ =gLinkPlayers
mov r12, r1
ldr r7, _0800D5F0 @ =gUnknown_2023BD6
mov r8, r0
@@ -451,21 +451,21 @@ _0800D5D0:
.align 2, 0
_0800D5E4: .4byte gUnknown_3004F84
_0800D5E8: .4byte sub_80123C0
_0800D5EC: .4byte gUnknown_202273C
_0800D5EC: .4byte gLinkPlayers
_0800D5F0: .4byte gUnknown_2023BD6
_0800D5F4: .4byte gBattlerPartyIndexes
_0800D5F8:
cmp r0, 0x3
bne _0800D61A
_0800D5FC:
ldr r0, _0800D60C @ =gUnknown_202273C
ldr r0, _0800D60C @ =gLinkPlayers
adds r0, r4, r0
ldrb r0, [r0, 0x18]
movs r1, 0
bl sub_8127DA8
b _0800D61A
.align 2, 0
_0800D60C: .4byte gUnknown_202273C
_0800D60C: .4byte gLinkPlayers
_0800D610:
lsls r0, 24
lsrs r0, 24
@@ -474,7 +474,7 @@ _0800D610:
_0800D61A:
cmp r10, r5
bne _0800D66A
ldr r0, _0800D640 @ =gUnknown_202273C
ldr r0, _0800D640 @ =gLinkPlayers
adds r3, r4, r0
ldrh r1, [r3, 0x18]
lsls r1, 2
@@ -492,7 +492,7 @@ _0800D61A:
beq _0800D650
b _0800D740
.align 2, 0
_0800D640: .4byte gUnknown_202273C
_0800D640: .4byte gLinkPlayers
_0800D644: .4byte gUnknown_3004FE0
_0800D648: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D64C:
@@ -514,7 +514,7 @@ _0800D660:
ldrh r0, [r3, 0x18]
b _0800D738
_0800D66A:
ldr r2, _0800D690 @ =gUnknown_202273C
ldr r2, _0800D690 @ =gLinkPlayers
adds r0, r4, r2
ldrh r1, [r0, 0x18]
movs r3, 0x1
@@ -534,7 +534,7 @@ _0800D66A:
beq _0800D6A6
b _0800D6EC
.align 2, 0
_0800D690: .4byte gUnknown_202273C
_0800D690: .4byte gLinkPlayers
_0800D694:
lsls r0, r5, 3
subs r0, r5
@@ -639,7 +639,7 @@ _0800D740:
bgt _0800D74E
b _0800D5D0
_0800D74E:
ldr r1, _0800D764 @ =gUnknown_2023BCC
ldr r1, _0800D764 @ =gBattlersCount
movs r0, 0x4
_0800D752:
strb r0, [r1]
@@ -652,7 +652,7 @@ _0800D754:
pop {r0}
bx r0
.align 2, 0
_0800D764: .4byte gUnknown_2023BCC
_0800D764: .4byte gBattlersCount
thumb_func_end sub_800D494
thumb_func_start sub_800D768
@@ -801,7 +801,7 @@ _0800D888:
_0800D890:
mov r8, r10
_0800D892:
ldr r0, _0800D8AC @ =gUnknown_2023BCC
ldr r0, _0800D8AC @ =gBattlersCount
ldrb r0, [r0]
cmp r8, r0
bge _0800D89C
@@ -815,7 +815,7 @@ _0800D89C:
pop {r0}
bx r0
.align 2, 0
_0800D8AC: .4byte gUnknown_2023BCC
_0800D8AC: .4byte gBattlersCount
thumb_func_end sub_800D768
thumb_func_start PrepareBufferDataTransfer
@@ -1413,7 +1413,7 @@ sub_800DD28: @ 800DD28
ands r0, r1
cmp r0, 0
beq _0800DE28
ldr r0, _0800DD64 @ =gUnknown_202273C
ldr r0, _0800DD64 @ =gLinkPlayers
ldr r1, [r0, 0x14]
ldr r0, _0800DD68 @ =0x00002211
cmp r1, r0
@@ -1426,7 +1426,7 @@ sub_800DD28: @ 800DD28
.align 2, 0
_0800DD5C: .4byte gUnknown_3003F64
_0800DD60: .4byte gBattleTypeFlags
_0800DD64: .4byte gUnknown_202273C
_0800DD64: .4byte gLinkPlayers
_0800DD68: .4byte 0x00002211
_0800DD6C: .4byte gUnknown_2022118
_0800DD70:
@@ -1709,8 +1709,8 @@ _0800DF9C: .4byte gBitTable
_0800DFA0: .4byte gTasks
thumb_func_end Task_HandleCopyReceivedLinkBuffersData
thumb_func_start EmitGetMonData
EmitGetMonData: @ 800DFA4
thumb_func_start BtlController_EmitGetMonData
BtlController_EmitGetMonData: @ 800DFA4
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -1728,7 +1728,7 @@ EmitGetMonData: @ 800DFA4
bx r0
.align 2, 0
_0800DFC4: .4byte gUnknown_2022874
thumb_func_end EmitGetMonData
thumb_func_end BtlController_EmitGetMonData
thumb_func_start EmitGetRawMonData
EmitGetRawMonData: @ 800DFC8
@@ -2106,7 +2106,7 @@ EmitMoveAnimation: @ 800E1FC
movs r1, 0
movs r2, 0xD
movs r3, 0
bl sub_8019F18
bl AbilityBattleEffects
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -2116,7 +2116,7 @@ EmitMoveAnimation: @ 800E1FC
movs r1, 0
movs r2, 0x4D
movs r3, 0
bl sub_8019F18
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
bne _0800E29C
@@ -2194,7 +2194,7 @@ EmitPrintString: @ 800E2D4
ldr r0, _0800E3C4 @ =gUnknown_2023D68
ldrh r0, [r0]
strh r0, [r1, 0x4]
ldr r0, _0800E3C8 @ =gUnknown_2023D6A
ldr r0, _0800E3C8 @ =gLastUsedAbility
ldrb r0, [r0]
strb r0, [r1, 0x6]
ldr r0, _0800E3CC @ =gBattleScripting
@@ -2210,7 +2210,7 @@ EmitPrintString: @ 800E2D4
adds r0, 0xAD
ldrb r0, [r0]
strb r0, [r3, 0x9]
ldr r0, _0800E3D4 @ =gUnknown_2023D6F
ldr r0, _0800E3D4 @ =gPotentialItemEffectBattler
ldrb r0, [r0]
strb r0, [r3, 0xA]
ldr r3, _0800E3D8 @ =gBattleMoves
@@ -2243,12 +2243,12 @@ _0800E35A:
adds r5, 0x10
mov r4, r12
adds r4, 0x20
ldr r6, _0800E3E4 @ =gUnknown_2022AC8
ldr r6, _0800E3E4 @ =gBattleTextBuff2
mov r2, r12
adds r2, 0x30
_0800E378:
adds r1, r5, r3
ldr r7, _0800E3E8 @ =gUnknown_2022AB8
ldr r7, _0800E3E8 @ =gBattleTextBuff1
adds r0, r3, r7
ldrb r0, [r0]
strb r0, [r1]
@@ -2281,15 +2281,15 @@ _0800E3B8: .4byte gUnknown_2023E8A
_0800E3BC: .4byte gCurrentMove
_0800E3C0: .4byte gUnknown_2023D4C
_0800E3C4: .4byte gUnknown_2023D68
_0800E3C8: .4byte gUnknown_2023D6A
_0800E3C8: .4byte gLastUsedAbility
_0800E3CC: .4byte gBattleScripting
_0800E3D0: .4byte gBattleStruct
_0800E3D4: .4byte gUnknown_2023D6F
_0800E3D4: .4byte gPotentialItemEffectBattler
_0800E3D8: .4byte gBattleMoves
_0800E3DC: .4byte gUnknown_2022AD8
_0800E3E0: .4byte gBattleMons
_0800E3E4: .4byte gUnknown_2022AC8
_0800E3E8: .4byte gUnknown_2022AB8
_0800E3E4: .4byte gBattleTextBuff2
_0800E3E8: .4byte gBattleTextBuff1
thumb_func_end EmitPrintString
thumb_func_start EmitPrintSelectionString
@@ -2323,7 +2323,7 @@ EmitPrintSelectionString: @ 800E3EC
ldr r0, _0800E4B4 @ =gUnknown_2023D68
ldrh r0, [r0]
strh r0, [r1, 0x4]
ldr r0, _0800E4B8 @ =gUnknown_2023D6A
ldr r0, _0800E4B8 @ =gLastUsedAbility
ldrb r0, [r0]
strb r0, [r1, 0x6]
ldr r0, _0800E4BC @ =gBattleScripting
@@ -2356,12 +2356,12 @@ _0800E44E:
adds r5, 0x10
mov r4, r12
adds r4, 0x20
ldr r6, _0800E4CC @ =gUnknown_2022AC8
ldr r6, _0800E4CC @ =gBattleTextBuff2
mov r2, r12
adds r2, 0x30
_0800E46C:
adds r1, r5, r3
ldr r7, _0800E4D0 @ =gUnknown_2022AB8
ldr r7, _0800E4D0 @ =gBattleTextBuff1
adds r0, r3, r7
ldrb r0, [r0]
strb r0, [r1]
@@ -2393,13 +2393,13 @@ _0800E4A8: .4byte gUnknown_2022874
_0800E4AC: .4byte gCurrentMove
_0800E4B0: .4byte gUnknown_2023D4C
_0800E4B4: .4byte gUnknown_2023D68
_0800E4B8: .4byte gUnknown_2023D6A
_0800E4B8: .4byte gLastUsedAbility
_0800E4BC: .4byte gBattleScripting
_0800E4C0: .4byte gBattleStruct
_0800E4C4: .4byte gUnknown_2022AD8
_0800E4C8: .4byte gBattleMons
_0800E4CC: .4byte gUnknown_2022AC8
_0800E4D0: .4byte gUnknown_2022AB8
_0800E4CC: .4byte gBattleTextBuff2
_0800E4D0: .4byte gBattleTextBuff1
thumb_func_end EmitPrintSelectionString
thumb_func_start EmitChooseAction
asm/battle_dome_cards.s
+6 -6
View File
@@ -291,7 +291,7 @@ _0810BD90: .4byte gUnknown_203AD40
_0810BD94: .4byte gUnknown_82349BC
_0810BD98:
ldr r0, _0810BDA4 @ =gUnknown_203AD40
ldr r1, _0810BDA8 @ =gUnknown_82390DC
ldr r1, _0810BDA8 @ =gTrainerFrontAnimsPtrTable
ldr r1, [r1]
str r1, [r0, 0x8]
_0810BDA0:
@@ -299,7 +299,7 @@ _0810BDA0:
bx r0
.align 2, 0
_0810BDA4: .4byte gUnknown_203AD40
_0810BDA8: .4byte gUnknown_82390DC
_0810BDA8: .4byte gTrainerFrontAnimsPtrTable
thumb_func_end uns_builder_assign_animtable1
thumb_func_start oamt_spawn_poke_or_trainer_picture
@@ -1082,21 +1082,21 @@ sub_810C374: @ 810C374
bne _0810C39A
cmp r0, 0
beq _0810C394
ldr r0, _0810C390 @ =gUnknown_82538A8
ldr r0, _0810C390 @ =gFacilityClassToPicIndex
adds r0, 0x87
ldrb r0, [r0]
b _0810C39A
.align 2, 0
_0810C390: .4byte gUnknown_82538A8
_0810C390: .4byte gFacilityClassToPicIndex
_0810C394:
ldr r0, _0810C3A0 @ =gUnknown_82538A8
ldr r0, _0810C3A0 @ =gFacilityClassToPicIndex
adds r0, 0x86
ldrb r0, [r0]
_0810C39A:
pop {r1}
bx r1
.align 2, 0
_0810C3A0: .4byte gUnknown_82538A8
_0810C3A0: .4byte gFacilityClassToPicIndex
thumb_func_end sub_810C374
.align 2, 0 @ Don't pad with nop.
asm/battle_gfx_sfx_util.s
+78 -78
View File
@@ -348,7 +348,7 @@ TryHandleLaunchBattleTableAnimation: @ 803401C
ands r0, r7
cmp r0, 0
beq _08034064
ldr r0, _08034060 @ =gUnknown_2024024
ldr r0, _08034060 @ =gBattleMonForms
adds r0, r6, r0
movs r2, 0x7F
adds r1, r7, 0
@@ -357,7 +357,7 @@ TryHandleLaunchBattleTableAnimation: @ 803401C
movs r0, 0x1
b _08034132
.align 2, 0
_08034060: .4byte gUnknown_2024024
_08034060: .4byte gBattleMonForms
_08034064:
ldr r0, _08034090 @ =gUnknown_2024018
mov r9, r0
@@ -753,12 +753,12 @@ _0803436C:
bl GetMonData
mov r10, r0
mov r0, r8
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsls r2, r5, 3
ldr r1, _080343C4 @ =gUnknown_82350AC
adds r2, r1
ldr r1, _080343C8 @ =gUnknown_202401C
ldr r1, _080343C8 @ =gMonSpritesGfxPtr
ldr r1, [r1]
lsrs r0, 22
adds r1, 0x4
@@ -789,7 +789,7 @@ _0803436C:
.align 2, 0
_080343C0: .4byte gUnknown_2024008
_080343C4: .4byte gUnknown_82350AC
_080343C8: .4byte gUnknown_202401C
_080343C8: .4byte gMonSpritesGfxPtr
_080343CC: .4byte gUnknown_2024018
_080343D0:
adds r0, r5, 0
@@ -829,7 +829,7 @@ _080343DA:
adds r1, r4
adds r0, r6, 0
bl LZDecompressWram
ldr r0, _08034480 @ =gUnknown_2024024
ldr r0, _08034480 @ =gBattleMonForms
add r0, r8
ldrb r1, [r0]
lsls r1, 5
@@ -872,7 +872,7 @@ _08034468:
.align 2, 0
_08034478: .4byte 0x00000181
_0803447C: .4byte gBattleStruct
_08034480: .4byte gUnknown_2024024
_08034480: .4byte gBattleMonForms
_08034484: .4byte gUnknown_2024018
_08034488: .4byte 0x00007fff
_0803448C: .4byte gUnknown_20375F8
@@ -924,7 +924,7 @@ _080344E4:
bl GetMonData
str r0, [sp, 0x4]
mov r0, r8
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0x1
@@ -948,7 +948,7 @@ _0803451C:
lsls r0, r5, 3
ldr r1, _08034540 @ =gUnknown_823654C
adds r0, r1
ldr r1, _08034544 @ =gUnknown_202401C
ldr r1, _08034544 @ =gMonSpritesGfxPtr
ldr r1, [r1]
lsls r2, r7, 2
adds r1, 0x4
@@ -962,12 +962,12 @@ _0803451C:
_08034538: .4byte gUnknown_2024008
_0803453C: .4byte gUnknown_2024018
_08034540: .4byte gUnknown_823654C
_08034544: .4byte gUnknown_202401C
_08034544: .4byte gMonSpritesGfxPtr
_08034548:
lsls r0, r5, 3
ldr r1, _08034584 @ =gUnknown_823654C
adds r0, r1
ldr r1, _08034588 @ =gUnknown_202401C
ldr r1, _08034588 @ =gMonSpritesGfxPtr
ldr r1, [r1]
lsls r2, r7, 2
adds r1, 0x4
@@ -995,7 +995,7 @@ _08034562:
b _0803459A
.align 2, 0
_08034584: .4byte gUnknown_823654C
_08034588: .4byte gUnknown_202401C
_08034588: .4byte gMonSpritesGfxPtr
_0803458C: .4byte gUnknown_2024018
_08034590:
adds r0, r5, 0
@@ -1035,7 +1035,7 @@ _0803459A:
adds r1, r4
adds r0, r6, 0
bl LZDecompressWram
ldr r0, _08034640 @ =gUnknown_2024024
ldr r0, _08034640 @ =gBattleMonForms
add r0, r8
ldrb r1, [r0]
lsls r1, 5
@@ -1077,7 +1077,7 @@ _08034626:
.align 2, 0
_08034638: .4byte 0x00000181
_0803463C: .4byte gBattleStruct
_08034640: .4byte gUnknown_2024024
_08034640: .4byte gBattleMonForms
_08034644: .4byte gUnknown_2024018
_08034648: .4byte 0x00007fff
_0803464C: .4byte gUnknown_20375F8
@@ -1091,10 +1091,10 @@ sub_8034658: @ 8034658
lsls r4, r1, 24
lsrs r4, 24
adds r0, r4, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
ldr r2, _080346B8 @ =gUnknown_8E93B38
ldr r1, _080346BC @ =gUnknown_202401C
ldr r1, _080346BC @ =gMonSpritesGfxPtr
ldr r1, [r1]
lsrs r0, 22
adds r1, 0x4
@@ -1129,7 +1129,7 @@ sub_8034658: @ 8034658
bx r0
.align 2, 0
_080346B8: .4byte gUnknown_8E93B38
_080346BC: .4byte gUnknown_202401C
_080346BC: .4byte gMonSpritesGfxPtr
_080346C0: .4byte gUnknown_8E93B14
thumb_func_end sub_8034658
@@ -1145,13 +1145,13 @@ sub_80346C4: @ 80346C4
lsrs r5, 16
lsls r0, 24
lsrs r0, 24
bl GetBankIdentity
bl GetBattlerPosition
adds r4, r0, 0
lsls r4, 24
lsls r5, 3
ldr r6, _0803473C @ =gUnknown_823957C
adds r6, r5, r6
ldr r0, _08034740 @ =gUnknown_202401C
ldr r0, _08034740 @ =gMonSpritesGfxPtr
mov r8, r0
ldr r0, [r0]
lsrs r4, 22
@@ -1193,7 +1193,7 @@ sub_80346C4: @ 80346C4
bx r0
.align 2, 0
_0803473C: .4byte gUnknown_823957C
_08034740: .4byte gUnknown_202401C
_08034740: .4byte gMonSpritesGfxPtr
_08034744: .4byte 0xffff0000
_08034748: .4byte 0x0000ffff
_0803474C: .4byte gUnknown_8239A1C
@@ -1467,7 +1467,7 @@ _0803495A:
LoadBattleBarGfx: @ 8034964
push {lr}
ldr r0, _0803497C @ =gUnknown_8D093D8
ldr r1, _08034980 @ =gUnknown_202401C
ldr r1, _08034980 @ =gMonSpritesGfxPtr
ldr r1, [r1]
movs r2, 0xBA
lsls r2, 1
@@ -1478,7 +1478,7 @@ LoadBattleBarGfx: @ 8034964
bx r0
.align 2, 0
_0803497C: .4byte gUnknown_8D093D8
_08034980: .4byte gUnknown_202401C
_08034980: .4byte gMonSpritesGfxPtr
thumb_func_end LoadBattleBarGfx
thumb_func_start BattleInitAllSprites
@@ -1577,7 +1577,7 @@ _08034A34:
_08034A44: .4byte gUnknown_3004FF0
_08034A48:
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08034A90
@@ -1632,7 +1632,7 @@ _08034ABA:
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
ldr r1, _08034AE4 @ =gUnknown_2023BCC
ldr r1, _08034AE4 @ =gBattlersCount
lsls r0, 24
lsrs r0, 24
ldrb r1, [r1]
@@ -1650,7 +1650,7 @@ _08034AD0:
_08034AD8: .4byte gUnknown_3004FF0
_08034ADC: .4byte gBattlerPartyIndexes
_08034AE0: .4byte gEnemyParty
_08034AE4: .4byte gUnknown_2023BCC
_08034AE4: .4byte gBattlersCount
_08034AE8:
bl LoadAndCreateEnemyShadowSprites
bl sub_8127CAC
@@ -1706,7 +1706,7 @@ CopyAllBattleSpritesInvisibilities: @ 8034B40
mov r6, r8
push {r6,r7}
movs r4, 0
ldr r5, _08034BA4 @ =gUnknown_2023BCC
ldr r5, _08034BA4 @ =gBattlersCount
ldrb r0, [r5]
cmp r4, r0
bge _08034B96
@@ -1753,7 +1753,7 @@ _08034B96:
pop {r0}
bx r0
.align 2, 0
_08034BA4: .4byte gUnknown_2023BCC
_08034BA4: .4byte gBattlersCount
_08034BA8: .4byte gSprites
_08034BAC: .4byte gUnknown_2024018
_08034BB0: .4byte gUnknown_2023D44
@@ -1813,7 +1813,7 @@ sub_8034BF4: @ 8034BF4
beq _08034C16
b _08034D88
_08034C16:
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -1854,7 +1854,7 @@ _08034C16:
lsls r0, r1, 3
ldr r1, _08034D60 @ =gUnknown_82350AC
adds r0, r1
ldr r4, _08034D64 @ =gUnknown_202401C
ldr r4, _08034D64 @ =gMonSpritesGfxPtr
ldr r1, [r4]
mov r2, r10
lsls r5, r2, 2
@@ -1927,7 +1927,7 @@ _08034C16:
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, _08034D7C @ =gUnknown_2024024
ldr r1, _08034D7C @ =gBattleMonForms
add r1, r9
ldrb r1, [r1]
bl StartSpriteAnim
@@ -1940,10 +1940,10 @@ _08034C16:
movs r1, 0xB
mov r2, r8
muls r2, r1
ldr r1, _08034D80 @ =gUnknown_8245EE0
ldr r1, _08034D80 @ =gSpeciesNames
adds r2, r1
movs r1, 0x2
bl sub_804037C
bl SetMonData
ldr r4, _08034D84 @ =gUnknown_3004FF0
add r4, r9
ldrb r0, [r4]
@@ -1962,14 +1962,14 @@ _08034C16:
_08034D58: .4byte gBattlerPartyIndexes
_08034D5C: .4byte gEnemyParty
_08034D60: .4byte gUnknown_82350AC
_08034D64: .4byte gUnknown_202401C
_08034D64: .4byte gMonSpritesGfxPtr
_08034D68: .4byte gSprites
_08034D6C: .4byte gUnknown_2023D44
_08034D70: .4byte 0x06010000
_08034D74: .4byte 0x040000d4
_08034D78: .4byte 0x84000200
_08034D7C: .4byte gUnknown_2024024
_08034D80: .4byte gUnknown_8245EE0
_08034D7C: .4byte gBattleMonForms
_08034D80: .4byte gSpeciesNames
_08034D84: .4byte gUnknown_3004FF0
_08034D88:
cmp r2, 0
@@ -2008,7 +2008,7 @@ _08034D88:
mov r1, r10
movs r2, 0x20
bl LoadPalette
ldr r1, _08034E38 @ =gUnknown_2024024
ldr r1, _08034E38 @ =gBattleMonForms
add r1, r9
ldr r0, [r4]
ldr r0, [r0, 0x8]
@@ -2052,19 +2052,19 @@ _08034E28: .4byte gUnknown_2023D44
_08034E2C: .4byte gSprites
_08034E30: .4byte gUnknown_2024018
_08034E34: .4byte gBattleStruct
_08034E38: .4byte gUnknown_2024024
_08034E38: .4byte gBattleMonForms
_08034E3C: .4byte 0x00007fff
_08034E40: .4byte gUnknown_20375F8
_08034E44: .4byte gUnknown_20371F8
_08034E48: .4byte 0x04000008
_08034E4C:
mov r0, r9
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldr r0, [sp]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2098,7 +2098,7 @@ _08034E90:
lsrs r0, 16
mov r8, r0
mov r0, r9
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08034F10
@@ -2124,7 +2124,7 @@ _08034E90:
lsls r0, r2, 3
ldr r1, _08034F04 @ =gUnknown_823654C
adds r0, r1
ldr r1, _08034F08 @ =gUnknown_202401C
ldr r1, _08034F08 @ =gMonSpritesGfxPtr
ldr r1, [r1]
mov r3, r10
lsls r5, r3, 2
@@ -2143,7 +2143,7 @@ _08034E90:
_08034EFC: .4byte gBattlerPartyIndexes
_08034F00: .4byte gPlayerParty
_08034F04: .4byte gUnknown_823654C
_08034F08: .4byte gUnknown_202401C
_08034F08: .4byte gMonSpritesGfxPtr
_08034F0C: .4byte gUnknown_2024008
_08034F10:
ldr r0, _08035074 @ =gBattlerPartyIndexes
@@ -2168,7 +2168,7 @@ _08034F10:
lsls r0, r2, 3
ldr r1, _0803507C @ =gUnknown_82350AC
adds r0, r1
ldr r1, _08035080 @ =gUnknown_202401C
ldr r1, _08035080 @ =gMonSpritesGfxPtr
ldr r1, [r1]
mov r3, r10
lsls r5, r3, 2
@@ -2184,7 +2184,7 @@ _08034F10:
bl HandleLoadSpecialPokePic_DontHandleDeoxys
_08034F5E:
str r4, [sp, 0x14]
ldr r0, _08035080 @ =gUnknown_202401C
ldr r0, _08035080 @ =gMonSpritesGfxPtr
ldr r0, [r0]
adds r0, 0x4
adds r0, r5
@@ -2244,7 +2244,7 @@ _08034F5E:
adds r1, r4
adds r0, r6, 0
bl LZDecompressWram
ldr r0, _080350A4 @ =gUnknown_2024024
ldr r0, _080350A4 @ =gBattleMonForms
ldr r1, [sp]
adds r0, r1, r0
ldrb r1, [r0]
@@ -2276,7 +2276,7 @@ _08034FFC:
adds r0, r3, r0
mov r1, r8
strh r1, [r0, 0x2]
ldr r0, _080350A4 @ =gUnknown_2024024
ldr r0, _080350A4 @ =gBattleMonForms
mov r2, r9
adds r4, r2, r0
ldr r3, [sp]
@@ -2316,7 +2316,7 @@ _08035062:
_08035074: .4byte gBattlerPartyIndexes
_08035078: .4byte gEnemyParty
_0803507C: .4byte gUnknown_82350AC
_08035080: .4byte gUnknown_202401C
_08035080: .4byte gMonSpritesGfxPtr
_08035084: .4byte gUnknown_2024008
_08035088: .4byte gUnknown_2023D44
_0803508C: .4byte gSprites
@@ -2325,7 +2325,7 @@ _08035094: .4byte 0x040000d4
_08035098: .4byte 0x84000200
_0803509C: .4byte 0x00000181
_080350A0: .4byte gBattleStruct
_080350A4: .4byte gUnknown_2024024
_080350A4: .4byte gBattleMonForms
_080350A8: .4byte 0x00007fff
_080350AC: .4byte gUnknown_20375F8
_080350B0: .4byte gUnknown_20371F8
@@ -2343,16 +2343,16 @@ sub_80350BC: @ 80350BC
cmp r1, 0
bne _08035158
adds r0, r4, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080350FC
ldr r0, _080350F4 @ =gUnknown_8D2D0B4
ldr r1, _080350F8 @ =gUnknown_202401C
ldr r1, _080350F8 @ =gMonSpritesGfxPtr
ldr r1, [r1]
lsls r4, r5, 2
adds r1, 0x4
@@ -2362,10 +2362,10 @@ sub_80350BC: @ 80350BC
b _0803510E
.align 2, 0
_080350F4: .4byte gUnknown_8D2D0B4
_080350F8: .4byte gUnknown_202401C
_080350F8: .4byte gMonSpritesGfxPtr
_080350FC:
ldr r0, _08035144 @ =gUnknown_8D2D2F4
ldr r1, _08035148 @ =gUnknown_202401C
ldr r1, _08035148 @ =gMonSpritesGfxPtr
ldr r1, [r1]
lsls r4, r5, 2
adds r1, 0x4
@@ -2376,7 +2376,7 @@ _0803510E:
movs r3, 0x1
lsls r6, 4
ldr r7, _0803514C @ =gUnknown_8D2D090
ldr r0, _08035148 @ =gUnknown_202401C
ldr r0, _08035148 @ =gMonSpritesGfxPtr
ldr r0, [r0]
adds r0, 0x4
adds r4, r0, r4
@@ -2402,13 +2402,13 @@ _08035120:
b _0803519A
.align 2, 0
_08035144: .4byte gUnknown_8D2D2F4
_08035148: .4byte gUnknown_202401C
_08035148: .4byte gMonSpritesGfxPtr
_0803514C: .4byte gUnknown_8D2D090
_08035150: .4byte 0x040000d4
_08035154: .4byte 0x84000200
_08035158:
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08035184
@@ -2465,7 +2465,7 @@ LoadBattleMonGfxAndAnimate: @ 80351A8
lsls r0, 2
ldr r1, _080351E4 @ =gSprites
adds r4, r0, r1
ldr r0, _080351E8 @ =gUnknown_2024024
ldr r0, _080351E8 @ =gBattleMonForms
adds r0, r6, r0
ldrb r1, [r0]
adds r0, r4, 0
@@ -2477,7 +2477,7 @@ LoadBattleMonGfxAndAnimate: @ 80351A8
b _080351F2
.align 2, 0
_080351E4: .4byte gSprites
_080351E8: .4byte gUnknown_2024024
_080351E8: .4byte gBattleMonForms
_080351EC:
adds r0, r6, 0
bl GetBankSpriteDefault_Y
@@ -2640,7 +2640,7 @@ _0803530E:
BattleStopLowHpSound: @ 8035314
push {r4-r6,lr}
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
ldr r5, _08035364 @ =gUnknown_2024018
@@ -2720,12 +2720,12 @@ sub_803539C: @ 803539C
cmp r0, 0
beq _08035432
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
mov r8, r0
movs r0, 0x2
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
mov r9, r0
@@ -2799,7 +2799,7 @@ sub_8035450: @ 8035450
lsrs r0, 24
mov r8, r0
movs r5, 0
ldr r0, _080354E0 @ =gUnknown_2023BCC
ldr r0, _080354E0 @ =gBattlersCount
ldrb r0, [r0]
cmp r5, r0
bge _08035520
@@ -2862,7 +2862,7 @@ _0803547C:
strb r1, [r0, 0x3]
b _08035514
.align 2, 0
_080354E0: .4byte gUnknown_2023BCC
_080354E0: .4byte gBattlersCount
_080354E4: .4byte gSprites
_080354E8: .4byte gUnknown_2023D44
_080354EC: .4byte gUnknown_2024018
@@ -2888,7 +2888,7 @@ _080354F0:
_08035514:
adds r6, 0xC
adds r5, 0x1
ldr r0, _08035534 @ =gUnknown_2023BCC
ldr r0, _08035534 @ =gBattlersCount
ldrb r0, [r0]
cmp r5, r0
blt _0803547C
@@ -2902,7 +2902,7 @@ _08035520:
bx r0
.align 2, 0
_08035530: .4byte gUnknown_2024018
_08035534: .4byte gUnknown_2023BCC
_08035534: .4byte gBattlersCount
thumb_func_end sub_8035450
thumb_func_start LoadAndCreateEnemyShadowSprites
@@ -2913,7 +2913,7 @@ LoadAndCreateEnemyShadowSprites: @ 8035538
ldr r0, _08035614 @ =gUnknown_8250A0C
bl sub_800F034
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -2962,7 +2962,7 @@ LoadAndCreateEnemyShadowSprites: @ 8035538
cmp r0, 0
beq _0803560A
movs r0, 0x3
bl GetBankByIdentity
bl GetBattlerAtPosition
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -3147,7 +3147,7 @@ SetBankEnemyShadowSpriteCallback: @ 8035708
lsls r1, 16
lsrs r5, r1, 16
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08035784
@@ -3371,7 +3371,7 @@ ClearTemporarySpeciesSpriteData: @ 803589C
movs r3, 0
movs r2, 0
strh r2, [r0, 0x2]
ldr r0, _080358D0 @ =gUnknown_2024024
ldr r0, _080358D0 @ =gBattleMonForms
adds r0, r4, r0
strb r3, [r0]
cmp r1, 0
@@ -3384,7 +3384,7 @@ _080358C4:
bx r0
.align 2, 0
_080358CC: .4byte gUnknown_2024018
_080358D0: .4byte gUnknown_2024024
_080358D0: .4byte gBattleMonForms
thumb_func_end ClearTemporarySpeciesSpriteData
thumb_func_start AllocateMonSpritesGfx
@@ -3395,7 +3395,7 @@ AllocateMonSpritesGfx: @ 80358D4
mov r5, r8
push {r5-r7}
movs r6, 0
ldr r4, _080359A4 @ =gUnknown_202401C
ldr r4, _080359A4 @ =gMonSpritesGfxPtr
str r6, [r4]
movs r0, 0xC0
lsls r0, 1
@@ -3407,7 +3407,7 @@ AllocateMonSpritesGfx: @ 80358D4
ldr r1, [r4]
str r0, [r1]
_080358FA:
ldr r0, _080359A4 @ =gUnknown_202401C
ldr r0, _080359A4 @ =gMonSpritesGfxPtr
ldr r1, [r0]
lsls r4, r6, 2
adds r2, r1, 0x4
@@ -3436,7 +3436,7 @@ _080358FA:
mov r12, r8
adds r7, r4, 0
_08035932:
ldr r2, _080359A4 @ =gUnknown_202401C
ldr r2, _080359A4 @ =gMonSpritesGfxPtr
ldr r1, [r2]
lsls r4, r5, 3
add r4, r12
@@ -3459,7 +3459,7 @@ _08035932:
lsrs r5, r0, 24
cmp r5, 0x3
bls _08035932
ldr r1, _080359A4 @ =gUnknown_202401C
ldr r1, _080359A4 @ =gMonSpritesGfxPtr
ldr r2, [r1]
mov r5, r9
adds r0, r5, r6
@@ -3479,7 +3479,7 @@ _08035932:
movs r0, 0x80
lsls r0, 5
bl AllocZeroed
ldr r1, _080359A4 @ =gUnknown_202401C
ldr r1, _080359A4 @ =gMonSpritesGfxPtr
ldr r1, [r1]
movs r2, 0xBA
lsls r2, 1
@@ -3493,14 +3493,14 @@ _08035932:
pop {r0}
bx r0
.align 2, 0
_080359A4: .4byte gUnknown_202401C
_080359A4: .4byte gMonSpritesGfxPtr
_080359A8: .4byte gUnknown_825DEF0
thumb_func_end AllocateMonSpritesGfx
thumb_func_start FreeMonSpritesGfx
FreeMonSpritesGfx: @ 80359AC
push {r4-r6,lr}
ldr r6, _08035A24 @ =gUnknown_202401C
ldr r6, _08035A24 @ =gMonSpritesGfxPtr
ldr r0, [r6]
cmp r0, 0
beq _08035A1E
@@ -3558,7 +3558,7 @@ _08035A1E:
pop {r0}
bx r0
.align 2, 0
_08035A24: .4byte gUnknown_202401C
_08035A24: .4byte gMonSpritesGfxPtr
thumb_func_end FreeMonSpritesGfx
thumb_func_start ShouldPlayNormalPokeCry
asm/battle_interface.s
+55 -55
View File
@@ -273,7 +273,7 @@ CreateBankHealthboxSprites: @ 8047CE0
cmp r0, 0
bne _08047DF4
mov r0, r10
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08047D78
@@ -385,12 +385,12 @@ _08047DEC: .4byte 0xfffffc00
_08047DF0: .4byte sub_8048128
_08047DF4:
mov r0, r10
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08047E98
mov r0, r10
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 25
@@ -406,7 +406,7 @@ _08047DF4:
lsls r0, 24
lsrs r6, r0, 24
mov r0, r10
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 25
@@ -459,7 +459,7 @@ _08047E90: .4byte 0xfffffc00
_08047E94: .4byte sub_8048128
_08047E98:
mov r0, r10
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 25
@@ -475,7 +475,7 @@ _08047E98:
lsls r0, 24
lsrs r6, r0, 24
mov r0, r10
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 25
@@ -544,7 +544,7 @@ _08047F1C:
mov r8, r1
add r4, r8
mov r0, r10
bl GetBankSide
bl GetBattlerSide
adds r1, r0, 0
lsls r1, 24
lsrs r1, 21
@@ -984,7 +984,7 @@ UpdateOamPriorityInAllHealthboxes: @ 804828C
lsls r0, 24
lsrs r0, 24
movs r6, 0
ldr r1, _08048310 @ =gUnknown_2023BCC
ldr r1, _08048310 @ =gBattlersCount
mov r8, r1
ldrb r2, [r1]
cmp r6, r2
@@ -1046,7 +1046,7 @@ _08048304:
pop {r0}
bx r0
.align 2, 0
_08048310: .4byte gUnknown_2023BCC
_08048310: .4byte gBattlersCount
_08048314: .4byte gSprites
_08048318: .4byte gUnknown_3004FF0
thumb_func_end UpdateOamPriorityInAllHealthboxes
@@ -1063,7 +1063,7 @@ SetBankHealthboxSpritePos: @ 804831C
cmp r0, 0
bne _08048348
adds r0, r6, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08048342
@@ -1076,7 +1076,7 @@ _08048342:
b _08048380
_08048348:
adds r0, r6, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1165,7 +1165,7 @@ UpdateLvlInHealthbox: @ 8048398
ldrh r0, [r1, 0x3A]
lsls r0, 24
lsrs r0, 24
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08048420
@@ -1226,7 +1226,7 @@ sub_8048440: @ 8048440
ldrh r0, [r4, 0x3A]
lsls r0, 24
lsrs r0, 24
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08048514
@@ -1321,7 +1321,7 @@ _08048514:
cmp r0, 0x1
beq _0804854C
adds r0, r6, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1341,7 +1341,7 @@ _08048564:
ldrh r0, [r7, 0x3A]
lsls r0, 24
lsrs r0, 24
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08048580
@@ -1366,7 +1366,7 @@ _0804858A:
movs r2, 0x1
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r0, _08048608 @ =gUnknown_202401C
ldr r0, _08048608 @ =gMonSpritesGfxPtr
ldr r0, [r0]
movs r1, 0xBA
lsls r1, 1
@@ -1387,7 +1387,7 @@ _0804858A:
lsls r0, 2
adds r4, r0, r1
_080485C6:
ldr r0, _08048608 @ =gUnknown_202401C
ldr r0, _08048608 @ =gMonSpritesGfxPtr
ldr r0, [r0]
movs r1, 0xBA
lsls r1, 1
@@ -1421,7 +1421,7 @@ _080485F8:
pop {r0}
bx r0
.align 2, 0
_08048608: .4byte gUnknown_202401C
_08048608: .4byte gMonSpritesGfxPtr
_0804860C: .4byte gSprites
_08048610: .4byte 0x06010000
_08048614: .4byte 0x04000008
@@ -1492,7 +1492,7 @@ _0804866A:
ldr r1, _08048704 @ =gUnknown_8260540
bl StringCopy
_08048698:
ldr r0, _08048708 @ =gUnknown_202401C
ldr r0, _08048708 @ =gMonSpritesGfxPtr
ldr r0, [r0]
movs r3, 0xBA
lsls r3, 1
@@ -1517,7 +1517,7 @@ _08048698:
_080486C6:
cmp r4, 0x2
bhi _08048714
ldr r0, _08048708 @ =gUnknown_202401C
ldr r0, _08048708 @ =gMonSpritesGfxPtr
ldr r0, [r0]
movs r1, 0xBA
lsls r1, 1
@@ -1543,11 +1543,11 @@ _080486F8: .4byte gUnknown_8260542
_080486FC: .4byte gSprites
_08048700: .4byte gUnknown_2024018
_08048704: .4byte gUnknown_8260540
_08048708: .4byte gUnknown_202401C
_08048708: .4byte gMonSpritesGfxPtr
_0804870C: .4byte 0x06010000
_08048710: .4byte 0x04000008
_08048714:
ldr r0, _08048790 @ =gUnknown_202401C
ldr r0, _08048790 @ =gMonSpritesGfxPtr
ldr r0, [r0]
movs r3, 0xBA
lsls r3, 1
@@ -1577,7 +1577,7 @@ _08048748:
mov r3, r8
cmp r3, 0
bne _080487A8
ldr r0, _08048790 @ =gUnknown_202401C
ldr r0, _08048790 @ =gMonSpritesGfxPtr
ldr r0, [r0]
movs r1, 0xBA
lsls r1, 1
@@ -1608,7 +1608,7 @@ _08048748:
bl CpuSet
b _080487DC
.align 2, 0
_08048790: .4byte gUnknown_202401C
_08048790: .4byte gMonSpritesGfxPtr
_08048794: .4byte 0x06010020
_08048798: .4byte 0x04000008
_0804879C: .4byte gSprites
@@ -1616,7 +1616,7 @@ _080487A0: .4byte 0x06010000
_080487A4: .4byte 0x05000008
_080487A8:
mov r0, r10
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080487DC
@@ -1678,8 +1678,8 @@ sub_80487F8: @ 80487F8
ldrh r0, [r0, 0x3A]
lsls r0, 24
lsrs r0, 24
bl GetBankIdentity
ldr r1, _080488B4 @ =gUnknown_202401C
bl GetBattlerPosition
ldr r1, _080488B4 @ =gMonSpritesGfxPtr
ldr r2, [r1]
movs r3, 0xBA
lsls r3, 1
@@ -1745,7 +1745,7 @@ _080488A8:
.align 2, 0
_080488AC: .4byte gUnknown_826052C
_080488B0: .4byte gSprites
_080488B4: .4byte gUnknown_202401C
_080488B4: .4byte gMonSpritesGfxPtr
_080488B8: .4byte gUnknown_8463E60
_080488BC:
adds r0, r1, 0
@@ -1866,7 +1866,7 @@ _08048966:
adds r2, r0, 0
movs r0, 0xBA
strb r0, [r2, 0x8]
ldr r5, _08048A08 @ =gUnknown_202401C
ldr r5, _08048A08 @ =gMonSpritesGfxPtr
ldr r0, [r5]
movs r2, 0xBA
lsls r2, 1
@@ -1910,7 +1910,7 @@ _080489F8: .4byte 0x04000008
_080489FC: .4byte gSprites
_08048A00: .4byte 0x06010000
_08048A04: .4byte gBattleStruct
_08048A08: .4byte gUnknown_202401C
_08048A08: .4byte gMonSpritesGfxPtr
_08048A0C:
ldr r0, [r5]
movs r3, 0xBA
@@ -1955,7 +1955,7 @@ sub_8048A4C: @ 8048A4C
sub sp, 0x4
movs r0, 0
mov r9, r0
ldr r0, _08048B78 @ =gUnknown_2023BCC
ldr r0, _08048B78 @ =gBattlersCount
ldrb r0, [r0]
cmp r9, r0
blt _08048A66
@@ -1986,7 +1986,7 @@ _08048A8C:
lsls r0, r2, 24
lsrs r7, r0, 24
adds r0, r7, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1998,7 +1998,7 @@ _08048AA2:
cmp r0, 0
bne _08048ABA
adds r0, r7, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08048ABA
@@ -2032,7 +2032,7 @@ _08048ABA:
lsls r0, 27
lsrs r4, r0, 31
adds r0, r7, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08048BE8
@@ -2096,7 +2096,7 @@ _08048B16:
ldr r2, _08048B9C @ =gPlayerParty
b _08048C6E
.align 2, 0
_08048B78: .4byte gUnknown_2023BCC
_08048B78: .4byte gBattlersCount
_08048B7C: .4byte gSprites
_08048B80: .4byte gBattlerPartyIndexes
_08048B84: .4byte gUnknown_3004FF0
@@ -2258,7 +2258,7 @@ _08048CE0:
add r8, r0
movs r1, 0x1
add r9, r1
ldr r0, _08048D10 @ =gUnknown_2023BCC
ldr r0, _08048D10 @ =gBattlersCount
ldrb r0, [r0]
cmp r9, r0
bge _08048CF2
@@ -2276,7 +2276,7 @@ _08048CF2:
_08048D04: .4byte gEnemyParty
_08048D08: .4byte gBattleTypeFlags
_08048D0C: .4byte gUnknown_3004FF0
_08048D10: .4byte gUnknown_2023BCC
_08048D10: .4byte gBattlersCount
thumb_func_end sub_8048A4C
thumb_func_start sub_8048D14
@@ -2299,14 +2299,14 @@ sub_8048D14: @ 8048D14
str r3, [sp, 0x10]
cmp r4, 0
beq _08048D44
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _08048D88
_08048D44:
ldr r0, [sp, 0x8]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08048D64
@@ -2588,7 +2588,7 @@ _08048F66:
b _08048E80
_08048F86:
ldr r0, [sp, 0x8]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0804906E
@@ -2966,7 +2966,7 @@ _0804925A:
_08049268:
ldr r0, [sp, 0x8]
str r3, [sp, 0x14]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r2, r0, 24
ldr r3, [sp, 0x14]
@@ -3555,7 +3555,7 @@ sub_80496C0: @ 80496C0
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, _08049760 @ =gUnknown_202298C
ldr r0, _08049760 @ =gDisplayedStringBattle
ldr r1, _08049764 @ =gUnknown_8260556
bl StringCopy
adds r5, r0, 0
@@ -3592,7 +3592,7 @@ sub_80496C0: @ 80496C0
_08049720:
movs r0, 0xB
muls r1, r0
ldr r0, _08049768 @ =gUnknown_8245EE0
ldr r0, _08049768 @ =gSpeciesNames
adds r1, r0
mov r0, sp
bl StringCompare
@@ -3623,9 +3623,9 @@ _08049754:
movs r0, 0xB
b _08049782
.align 2, 0
_08049760: .4byte gUnknown_202298C
_08049760: .4byte gDisplayedStringBattle
_08049764: .4byte gUnknown_8260556
_08049768: .4byte gUnknown_8245EE0
_08049768: .4byte gSpeciesNames
_0804976C: .4byte gSprites
_08049770:
movs r0, 0xB
@@ -3642,7 +3642,7 @@ _08049782:
strb r0, [r5]
movs r0, 0xFF
strb r0, [r5, 0x1]
ldr r0, _080497E4 @ =gUnknown_202298C
ldr r0, _080497E4 @ =gDisplayedStringBattle
add r3, sp, 0xC
movs r1, 0
movs r2, 0x3
@@ -3659,7 +3659,7 @@ _08049782:
ldrh r0, [r1, 0x3A]
lsls r0, 24
lsrs r0, 24
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080497F8
@@ -3684,7 +3684,7 @@ _080497D4:
bl sub_804A6E8
b _08049804
.align 2, 0
_080497E4: .4byte gUnknown_202298C
_080497E4: .4byte gDisplayedStringBattle
_080497E8: .4byte gSprites
_080497EC: .4byte 0x06010040
_080497F0: .4byte 0x06010400
@@ -3742,7 +3742,7 @@ sub_804981C: @ 804981C
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0804991C
@@ -3862,7 +3862,7 @@ UpdateStatusIconInHealthbox: @ 8049934
lsrs r0, 24
mov r10, r0
adds r0, r7, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080499A4
@@ -4090,7 +4090,7 @@ _08049AF4:
cmp r0, 0x1
beq _08049B62
adds r0, r7, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4386,7 +4386,7 @@ UpdateHealthboxAttribute: @ 8049D98
cmp r0, 0
bne _08049DD4
mov r0, r9
bl GetBankSide
bl GetBattlerSide
_08049DD4:
ldr r1, _08049F44 @ =gSprites
lsls r0, r6, 4
@@ -4396,7 +4396,7 @@ _08049DD4:
ldrh r0, [r0, 0x3A]
lsls r0, 24
lsrs r0, 24
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08049DF0
@@ -4499,7 +4499,7 @@ _08049E96:
movs r1, 0x19
bl GetMonData
adds r3, r0, 0
ldr r0, _08049F48 @ =gUnknown_8253AE4
ldr r0, _08049F48 @ =gExperienceTables
mov r12, r0
lsls r1, r4, 2
ldr r2, _08049F4C @ =gBaseStats
@@ -4565,7 +4565,7 @@ _08049F2E:
b _08049FC6
.align 2, 0
_08049F44: .4byte gSprites
_08049F48: .4byte gUnknown_8253AE4
_08049F48: .4byte gExperienceTables
_08049F4C: .4byte gBaseStats
_08049F50:
cmp r7, 0x3
asm/battle_message.s
+99 -99
View File
@@ -26,7 +26,7 @@ sub_80D7274: @ 80D7274
ldr r2, _080D733C @ =gUnknown_2023D68
ldrh r0, [r1, 0x4]
strh r0, [r2]
ldr r2, _080D7340 @ =gUnknown_2023D6A
ldr r2, _080D7340 @ =gLastUsedAbility
ldrb r0, [r1, 0x6]
strb r0, [r2]
ldr r5, _080D7344 @ =gBattleScripting
@@ -42,7 +42,7 @@ sub_80D7274: @ 80D7274
ldr r1, [r4]
ldrb r1, [r1, 0x9]
strb r1, [r0]
ldr r1, _080D734C @ =gUnknown_2023D6F
ldr r1, _080D734C @ =gPotentialItemEffectBattler
ldr r2, [r4]
ldrb r0, [r2, 0xA]
strb r0, [r1]
@@ -53,7 +53,7 @@ sub_80D7274: @ 80D7274
movs r2, 0
mov r12, r8
mov r10, r5
ldr r1, _080D7350 @ =gUnknown_2022AB8
ldr r1, _080D7350 @ =gBattleTextBuff1
mov r9, r1
ldr r3, _080D7354 @ =gUnknown_2039A30
_080D72D6:
@@ -67,10 +67,10 @@ _080D72D6:
cmp r2, 0x3
ble _080D72D6
movs r2, 0
ldr r0, _080D7350 @ =gUnknown_2022AB8
ldr r0, _080D7350 @ =gBattleTextBuff1
mov r8, r0
ldr r3, _080D7330 @ =gUnknown_2039A34
ldr r5, _080D7358 @ =gUnknown_2022AC8
ldr r5, _080D7358 @ =gBattleTextBuff2
ldr r4, _080D735C @ =gUnknown_2022AD8
_080D72F4:
mov r0, r8
@@ -109,13 +109,13 @@ _080D7330: .4byte gUnknown_2039A34
_080D7334: .4byte gActiveBattler
_080D7338: .4byte gUnknown_2022BC8
_080D733C: .4byte gUnknown_2023D68
_080D7340: .4byte gUnknown_2023D6A
_080D7340: .4byte gLastUsedAbility
_080D7344: .4byte gBattleScripting
_080D7348: .4byte gBattleStruct
_080D734C: .4byte gUnknown_2023D6F
_080D7350: .4byte gUnknown_2022AB8
_080D734C: .4byte gPotentialItemEffectBattler
_080D7350: .4byte gBattleTextBuff1
_080D7354: .4byte gUnknown_2039A30
_080D7358: .4byte gUnknown_2022AC8
_080D7358: .4byte gBattleTextBuff2
_080D735C: .4byte gUnknown_2022AD8
_080D7360: .4byte _080D7364
.align 2, 0
@@ -217,7 +217,7 @@ _080D7424: .4byte gUnknown_83FD2AA
_080D7428:
mov r1, r12
ldrb r0, [r1]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080D7468
@@ -297,7 +297,7 @@ _080D74C4: .4byte gUnknown_83FD3B1
_080D74C8:
mov r1, r12
ldrb r0, [r1]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080D7520
@@ -369,7 +369,7 @@ _080D7554: .4byte gUnknown_83FD522
_080D7558:
mov r1, r10
ldrb r0, [r1, 0x17]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080D75B0
@@ -452,7 +452,7 @@ _080D75F0:
lsls r0, 1
cmp r1, r0
bls _080D762C
ldr r0, _080D7620 @ =gUnknown_2022AC8
ldr r0, _080D7620 @ =gBattleTextBuff2
ldr r2, _080D7624 @ =gUnknown_83FEA28
ldr r1, _080D7628 @ =gBattleStruct
ldr r1, [r1]
@@ -465,11 +465,11 @@ _080D75F0:
b _080D763C
.align 2, 0
_080D761C: .4byte gUnknown_2039A34
_080D7620: .4byte gUnknown_2022AC8
_080D7620: .4byte gBattleTextBuff2
_080D7624: .4byte gUnknown_83FEA28
_080D7628: .4byte gBattleStruct
_080D762C:
ldr r0, _080D7648 @ =gUnknown_2022AC8
ldr r0, _080D7648 @ =gBattleTextBuff2
ldrh r2, [r2]
movs r1, 0xD
muls r1, r2
@@ -477,16 +477,16 @@ _080D762C:
adds r1, r2
bl StringCopy
_080D763C:
ldr r0, _080D7648 @ =gUnknown_2022AC8
ldr r0, _080D7648 @ =gBattleTextBuff2
bl sub_80D8720
ldr r7, _080D7650 @ =gUnknown_83FD57B
b _080D77DC
.align 2, 0
_080D7648: .4byte gUnknown_2022AC8
_080D7648: .4byte gBattleTextBuff2
_080D764C: .4byte gUnknown_8247094
_080D7650: .4byte gUnknown_83FD57B
_080D7654:
ldr r4, _080D7694 @ =gUnknown_2022AB8
ldr r4, _080D7694 @ =gBattleTextBuff1
ldrb r1, [r4]
movs r0, 0x80
ands r0, r1
@@ -497,7 +497,7 @@ _080D7654:
strb r0, [r4]
mov r1, r12
ldrb r0, [r1]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -509,7 +509,7 @@ _080D7654:
eors r0, r1
strb r0, [r4]
_080D7682:
ldr r0, _080D7694 @ =gUnknown_2022AB8
ldr r0, _080D7694 @ =gBattleTextBuff1
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
@@ -519,7 +519,7 @@ _080D7682:
ldr r7, _080D7698 @ =gUnknown_83FCC8A
b _080D77DC
.align 2, 0
_080D7694: .4byte gUnknown_2022AB8
_080D7694: .4byte gBattleTextBuff1
_080D7698: .4byte gUnknown_83FCC8A
_080D769C:
ldr r0, _080D76AC @ =gBattleTypeFlags
@@ -552,7 +552,7 @@ _080D76D0: .4byte gUnknown_83FE9D4
_080D76D4:
mov r1, r12
ldrb r0, [r1]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -570,7 +570,7 @@ _080D76F0:
ands r0, r1
cmp r0, 0
beq _080D7738
ldr r0, _080D7714 @ =gUnknown_2022AB8
ldr r0, _080D7714 @ =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _080D7728
@@ -581,7 +581,7 @@ _080D76F0:
b _080D77DC
.align 2, 0
_080D7710: .4byte gBattleTypeFlags
_080D7714: .4byte gUnknown_2022AB8
_080D7714: .4byte gBattleTextBuff1
_080D7718:
cmp r0, 0x3
beq _080D7730
@@ -608,7 +608,7 @@ _080D7738:
lsls r0, 4
cmp r1, r0
bne _080D7780
ldr r0, _080D775C @ =gUnknown_2022AB8
ldr r0, _080D775C @ =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _080D7770
@@ -619,7 +619,7 @@ _080D7738:
b _080D77DC
.align 2, 0
_080D7758: .4byte gTrainerBattleOpponent_A
_080D775C: .4byte gUnknown_2022AB8
_080D775C: .4byte gBattleTextBuff1
_080D7760:
cmp r0, 0x3
beq _080D7778
@@ -640,7 +640,7 @@ _080D7778:
.align 2, 0
_080D777C: .4byte gUnknown_83FE9FF
_080D7780:
ldr r0, _080D7794 @ =gUnknown_2022AB8
ldr r0, _080D7794 @ =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _080D77A8
@@ -650,7 +650,7 @@ _080D7780:
beq _080D779E
b _080D77DC
.align 2, 0
_080D7794: .4byte gUnknown_2022AB8
_080D7794: .4byte gBattleTextBuff1
_080D7798:
cmp r0, 0x3
beq _080D77B0
@@ -674,13 +674,13 @@ _080D77B8:
ldr r0, _080D77C8 @ =0x00000181
cmp r6, r0
bls _080D77D0
ldr r1, _080D77CC @ =gUnknown_202298C
ldr r1, _080D77CC @ =gDisplayedStringBattle
movs r0, 0xFF
strb r0, [r1]
b _080D77E2
.align 2, 0
_080D77C8: .4byte 0x00000181
_080D77CC: .4byte gUnknown_202298C
_080D77CC: .4byte gDisplayedStringBattle
_080D77D0:
ldr r1, _080D77F0 @ =gUnknown_83FDF3C
adds r0, r6, 0
@@ -706,12 +706,12 @@ _080D77F0: .4byte gUnknown_83FDF3C
thumb_func_start BattleStringExpandPlaceholdersToDisplayedString
BattleStringExpandPlaceholdersToDisplayedString: @ 80D77F4
push {lr}
ldr r1, _080D7800 @ =gUnknown_202298C
bl sub_80D7868
ldr r1, _080D7800 @ =gDisplayedStringBattle
bl BattleStringExpandPlaceholders
pop {r1}
bx r1
.align 2, 0
_080D7800: .4byte gUnknown_202298C
_080D7800: .4byte gDisplayedStringBattle
thumb_func_end BattleStringExpandPlaceholdersToDisplayedString
thumb_func_start TryGetStatusString
@@ -770,8 +770,8 @@ _080D785E:
bx r1
thumb_func_end TryGetStatusString
thumb_func_start sub_80D7868
sub_80D7868: @ 80D7868
thumb_func_start BattleStringExpandPlaceholders
BattleStringExpandPlaceholders: @ 80D7868
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -859,7 +859,7 @@ _080D78B0:
.4byte _080D8250
.4byte _080D79B8
_080D7974:
ldr r5, _080D7984 @ =gUnknown_2022AB8
ldr r5, _080D7984 @ =gBattleTextBuff1
ldrb r0, [r5]
cmp r0, 0xFD
bne _080D798C
@@ -867,7 +867,7 @@ _080D7974:
adds r0, r5, 0
b _080D79C4
.align 2, 0
_080D7984: .4byte gUnknown_2022AB8
_080D7984: .4byte gBattleTextBuff1
_080D7988: .4byte gStringVar1
_080D798C:
adds r0, r5, 0
@@ -880,14 +880,14 @@ _080D799C:
adds r4, r5, 0
bl _080D8382
_080D79A2:
ldr r1, _080D79B0 @ =gUnknown_2022AC8
ldr r1, _080D79B0 @ =gBattleTextBuff2
ldrb r0, [r1]
cmp r0, 0xFD
bne _080D79D8
ldr r4, _080D79B4 @ =gStringVar2
b _080D79C2
.align 2, 0
_080D79B0: .4byte gUnknown_2022AC8
_080D79B0: .4byte gBattleTextBuff2
_080D79B4: .4byte gStringVar2
_080D79B8:
ldr r1, _080D79D0 @ =gUnknown_2022AD8
@@ -924,7 +924,7 @@ _080D79F4:
_080D79FC: .4byte gStringVar3
_080D7A00:
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080D7A1C @ =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
@@ -940,7 +940,7 @@ _080D7A1C: .4byte gBattlerPartyIndexes
_080D7A20: .4byte gPlayerParty
_080D7A24:
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080D7A40 @ =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
@@ -956,7 +956,7 @@ _080D7A40: .4byte gBattlerPartyIndexes
_080D7A44: .4byte gEnemyParty
_080D7A48:
movs r0, 0x2
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080D7A64 @ =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
@@ -972,7 +972,7 @@ _080D7A64: .4byte gBattlerPartyIndexes
_080D7A68: .4byte gPlayerParty
_080D7A6C:
movs r0, 0x3
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080D7A88 @ =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
@@ -988,7 +988,7 @@ _080D7A88: .4byte gBattlerPartyIndexes
_080D7A8C: .4byte gEnemyParty
_080D7A90:
ldr r2, _080D7AB0 @ =gBattlerPartyIndexes
ldr r1, _080D7AB4 @ =gUnknown_202273C
ldr r1, _080D7AB4 @ =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1004,11 +1004,11 @@ _080D7A90:
bl _080D82AA
.align 2, 0
_080D7AB0: .4byte gBattlerPartyIndexes
_080D7AB4: .4byte gUnknown_202273C
_080D7AB4: .4byte gLinkPlayers
_080D7AB8: .4byte gPlayerParty
_080D7ABC:
ldr r2, _080D7AE0 @ =gBattlerPartyIndexes
ldr r1, _080D7AE4 @ =gUnknown_202273C
ldr r1, _080D7AE4 @ =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1026,11 +1026,11 @@ _080D7ABC:
bl _080D82AA
.align 2, 0
_080D7AE0: .4byte gBattlerPartyIndexes
_080D7AE4: .4byte gUnknown_202273C
_080D7AE4: .4byte gLinkPlayers
_080D7AE8: .4byte gEnemyParty
_080D7AEC:
ldr r2, _080D7B10 @ =gBattlerPartyIndexes
ldr r1, _080D7B14 @ =gUnknown_202273C
ldr r1, _080D7B14 @ =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1048,11 +1048,11 @@ _080D7AEC:
bl _080D82AA
.align 2, 0
_080D7B10: .4byte gBattlerPartyIndexes
_080D7B14: .4byte gUnknown_202273C
_080D7B14: .4byte gLinkPlayers
_080D7B18: .4byte gPlayerParty
_080D7B1C:
ldr r2, _080D7B40 @ =gBattlerPartyIndexes
ldr r1, _080D7B44 @ =gUnknown_202273C
ldr r1, _080D7B44 @ =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1070,12 +1070,12 @@ _080D7B1C:
b _080D82AA
.align 2, 0
_080D7B40: .4byte gBattlerPartyIndexes
_080D7B44: .4byte gUnknown_202273C
_080D7B44: .4byte gLinkPlayers
_080D7B48: .4byte gEnemyParty
_080D7B4C:
ldr r4, _080D7B70 @ =sBattler_AI
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
adds r2, r4, 0
cmp r0, 0
@@ -1106,11 +1106,11 @@ _080D7B8A:
cmp r0, 0xFF
bne _080D7B80
ldrb r0, [r2]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080D7BB8 @ =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
@@ -1126,11 +1126,11 @@ _080D7BB8: .4byte gBattlerPartyIndexes
_080D7BBC: .4byte gEnemyParty
_080D7BC0:
ldrb r0, [r2]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080D7BDC @ =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
@@ -1142,16 +1142,16 @@ _080D7BDC: .4byte gBattlerPartyIndexes
_080D7BE0:
ldr r4, _080D7C14 @ =sBattler_AI
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080D7C20
ldrb r0, [r4]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080D7C18 @ =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
@@ -1169,11 +1169,11 @@ _080D7C18: .4byte gBattlerPartyIndexes
_080D7C1C: .4byte gPlayerParty
_080D7C20:
ldrb r0, [r4]
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _080D7C44 @ =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
@@ -1190,7 +1190,7 @@ _080D7C48: .4byte gEnemyParty
_080D7C4C:
ldr r5, _080D7C98 @ =sBattler_AI
ldrb r0, [r5]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D7CB0
@@ -1246,7 +1246,7 @@ _080D7CBC: .4byte gBattlerPartyIndexes
_080D7CC0:
ldr r5, _080D7D0C @ =gBattlerTarget
ldrb r0, [r5]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D7D24
@@ -1302,7 +1302,7 @@ _080D7D30: .4byte gBattlerPartyIndexes
_080D7D34:
ldr r5, _080D7D80 @ =gUnknown_2023D6E
ldrb r0, [r5]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D7D98
@@ -1358,7 +1358,7 @@ _080D7DA4: .4byte gBattlerPartyIndexes
_080D7DA8:
ldr r5, _080D7DF4 @ =gActiveBattler
ldrb r0, [r5]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D7E0C
@@ -1414,7 +1414,7 @@ _080D7E18: .4byte gBattlerPartyIndexes
_080D7E1C:
ldr r5, _080D7E68 @ =gBattleScripting
ldrb r0, [r5, 0x17]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D7E80
@@ -1531,7 +1531,7 @@ _080D7EE4:
ldrb r0, [r0]
cmp r0, 0
beq _080D7F2C
ldr r2, _080D7F28 @ =gUnknown_2023D6F
ldr r2, _080D7F28 @ =gPotentialItemEffectBattler
ldrb r1, [r2]
movs r0, 0x1
ands r0, r1
@@ -1542,9 +1542,9 @@ _080D7EE4:
_080D7F1C: .4byte gBattleTypeFlags
_080D7F20: .4byte gUnknown_2023D68
_080D7F24: .4byte gBattleStruct
_080D7F28: .4byte gUnknown_2023D6F
_080D7F28: .4byte gPotentialItemEffectBattler
_080D7F2C:
ldr r2, _080D7F40 @ =gUnknown_2023D6F
ldr r2, _080D7F40 @ =gPotentialItemEffectBattler
ldrb r1, [r2]
movs r0, 0x1
ands r0, r1
@@ -1556,9 +1556,9 @@ _080D7F38:
subs r1, r0
b _080D7F64
.align 2, 0
_080D7F40: .4byte gUnknown_2023D6F
_080D7F40: .4byte gPotentialItemEffectBattler
_080D7F44:
ldr r2, _080D7F7C @ =gUnknown_202273C
ldr r2, _080D7F7C @ =gLinkPlayers
ldr r0, _080D7F80 @ =gBattleStruct
ldr r0, [r0]
adds r0, 0xB5
@@ -1567,7 +1567,7 @@ _080D7F44:
subs r0, r1
lsls r0, 2
adds r0, r2
ldr r1, _080D7F84 @ =gUnknown_2023D6F
ldr r1, _080D7F84 @ =gPotentialItemEffectBattler
ldrb r2, [r1]
ldrh r0, [r0, 0x18]
cmp r0, r2
@@ -1576,7 +1576,7 @@ _080D7F44:
subs r1, r2
_080D7F64:
lsls r1, 2
ldr r0, _080D7F88 @ =gUnknown_2023F54
ldr r0, _080D7F88 @ =gEnigmaBerries
adds r1, r0
mov r0, sp
bl StringCopy
@@ -1586,10 +1586,10 @@ _080D7F64:
mov r4, sp
b _080D8382
.align 2, 0
_080D7F7C: .4byte gUnknown_202273C
_080D7F7C: .4byte gLinkPlayers
_080D7F80: .4byte gBattleStruct
_080D7F84: .4byte gUnknown_2023D6F
_080D7F88: .4byte gUnknown_2023F54
_080D7F84: .4byte gPotentialItemEffectBattler
_080D7F88: .4byte gEnigmaBerries
_080D7F8C: .4byte gUnknown_83FD8AF
_080D7F90:
ldr r4, _080D7F94 @ =gUnknown_83FD8A2
@@ -1610,10 +1610,10 @@ _080D7FA0:
.align 2, 0
_080D7FAC: .4byte gUnknown_2023D68
_080D7FB0:
ldr r0, _080D7FB4 @ =gUnknown_2023D6A
ldr r0, _080D7FB4 @ =gLastUsedAbility
b _080D7FF0
.align 2, 0
_080D7FB4: .4byte gUnknown_2023D6A
_080D7FB4: .4byte gLastUsedAbility
_080D7FB8:
ldr r1, _080D7FC0 @ =gUnknown_2039A30
ldr r0, _080D7FC4 @ =sBattler_AI
@@ -1726,12 +1726,12 @@ _080D8084:
movs r0, 0xD
_080D8094:
muls r1, r0
ldr r0, _080D80A0 @ =gUnknown_823E558
ldr r0, _080D80A0 @ =gTrainerClassNames
adds r4, r1, r0
b _080D8382
.align 2, 0
_080D809C: .4byte gTrainers
_080D80A0: .4byte gUnknown_823E558
_080D80A0: .4byte gTrainerClassNames
_080D80A4:
ldr r0, _080D80E8 @ =gTrainerBattleOpponent_A
ldrh r2, [r0]
@@ -1840,7 +1840,7 @@ _080D8162:
.align 2, 0
_080D8170: .4byte gUnknown_2022744
_080D8174:
ldr r4, _080D8184 @ =gUnknown_202273C
ldr r4, _080D8184 @ =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1849,9 +1849,9 @@ _080D8174:
movs r0, 0x2
b _080D81AA
.align 2, 0
_080D8184: .4byte gUnknown_202273C
_080D8184: .4byte gLinkPlayers
_080D8188:
ldr r4, _080D8198 @ =gUnknown_202273C
ldr r4, _080D8198 @ =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1860,9 +1860,9 @@ _080D8188:
movs r0, 0x1
b _080D81AA
.align 2, 0
_080D8198: .4byte gUnknown_202273C
_080D8198: .4byte gLinkPlayers
_080D819C:
ldr r4, _080D81BC @ =gUnknown_202273C
ldr r4, _080D81BC @ =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1879,7 +1879,7 @@ _080D81AA:
adds r4, r1, r4
b _080D8382
.align 2, 0
_080D81BC: .4byte gUnknown_202273C
_080D81BC: .4byte gLinkPlayers
_080D81C0:
ldr r0, _080D81D4 @ =gBattleScripting
ldrb r0, [r0, 0x17]
@@ -1959,7 +1959,7 @@ _080D825C: .4byte gStringVar4
_080D8260:
ldr r0, _080D82B4 @ =gBattleScripting
ldrb r0, [r0, 0x17]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D82CC
@@ -2053,7 +2053,7 @@ _080D8320:
ldr r0, _080D8334 @ =gBattlerTarget
_080D8322:
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
ldr r4, _080D8338 @ =gUnknown_83FD569
cmp r0, 0
@@ -2073,7 +2073,7 @@ _080D8348:
ldr r0, _080D835C @ =gBattlerTarget
_080D834A:
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
ldr r4, _080D8360 @ =gUnknown_83FD560
cmp r0, 0
@@ -2093,7 +2093,7 @@ _080D8370:
ldr r0, _080D83D4 @ =gBattlerTarget
_080D8372:
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
ldr r4, _080D83D8 @ =gUnknown_83FD572
cmp r0, 0
@@ -2177,7 +2177,7 @@ _080D83FA:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_80D7868
thumb_func_end BattleStringExpandPlaceholders
thumb_func_start ExpandBattleTextBuffPlaceholders
ExpandBattleTextBuffPlaceholders: @ 80D8418
@@ -2310,7 +2310,7 @@ _080D8504:
_080D8510: .4byte gUnknown_824F1A0
_080D8514:
ldrb r0, [r4, 0x1]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080D8538
@@ -2385,7 +2385,7 @@ _080D85A0:
_080D85B2:
adds r4, r5, r7
ldrb r0, [r4, 0x1]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080D85D8
@@ -2454,7 +2454,7 @@ _080D8628:
beq _080D86A6
cmp r2, 0xAF
bne _080D869C
ldr r2, _080D8678 @ =gUnknown_202273C
ldr r2, _080D8678 @ =gLinkPlayers
ldr r0, _080D867C @ =gBattleStruct
ldr r0, [r0]
adds r0, 0xB5
@@ -2463,7 +2463,7 @@ _080D8628:
subs r0, r1
lsls r0, 2
adds r0, r2
ldr r1, _080D8680 @ =gUnknown_2023D6F
ldr r1, _080D8680 @ =gPotentialItemEffectBattler
ldrb r2, [r1]
ldrh r0, [r0, 0x18]
cmp r0, r2
@@ -2471,7 +2471,7 @@ _080D8628:
lsls r1, r2, 3
subs r1, r2
lsls r1, 2
ldr r0, _080D8684 @ =gUnknown_2023F54
ldr r0, _080D8684 @ =gEnigmaBerries
adds r1, r0
adds r0, r6, 0
bl StringCopy
@@ -2479,10 +2479,10 @@ _080D8628:
b _080D868E
.align 2, 0
_080D8674: .4byte gBattleTypeFlags
_080D8678: .4byte gUnknown_202273C
_080D8678: .4byte gLinkPlayers
_080D867C: .4byte gBattleStruct
_080D8680: .4byte gUnknown_2023D6F
_080D8684: .4byte gUnknown_2023F54
_080D8680: .4byte gPotentialItemEffectBattler
_080D8684: .4byte gEnigmaBerries
_080D8688: .4byte gUnknown_83FD8AF
_080D868C:
ldr r1, _080D8698 @ =gUnknown_83FD8A2
asm/battle_records.s
+2 -2
View File
@@ -980,7 +980,7 @@ sub_80CD98C: @ 80CD98C
ldrh r2, [r2, 0xE]
ldr r3, _080CD9EC @ =gUnknown_2023E8A
ldrb r3, [r3]
ldr r5, _080CD9F0 @ =gUnknown_202273C
ldr r5, _080CD9F0 @ =gLinkPlayers
lsls r4, r6, 3
subs r4, r6
lsls r4, 2
@@ -999,7 +999,7 @@ _080CD9E0: .4byte gSaveBlock2Ptr
_080CD9E4: .4byte 0x00000a98
_080CD9E8: .4byte gUnknown_2039654
_080CD9EC: .4byte gUnknown_2023E8A
_080CD9F0: .4byte gUnknown_202273C
_080CD9F0: .4byte gLinkPlayers
thumb_func_end sub_80CD98C
thumb_func_start sub_80CD9F4
asm/battle_script_commands.s
+422 -422
View File
File diff suppressed because it is too large Load Diff
asm/battle_setup.s
+8 -8
View File
@@ -260,7 +260,7 @@ sub_807F810: @ 807F810
ldr r0, _0807F860 @ =gEnemyParty
ldr r2, _0807F864 @ =gUnknown_841D148
movs r1, 0x2
bl sub_804037C
bl SetMonData
movs r0, 0x7
bl IncrementGameStat
movs r0, 0x8
@@ -396,7 +396,7 @@ _0807F960:
ldr r0, _0807F990 @ =gEnemyParty
ldr r2, _0807F994 @ =gUnknown_841D148
movs r1, 0x2
bl sub_804037C
bl SetMonData
movs r0, 0x7
bl IncrementGameStat
movs r0, 0x8
@@ -579,7 +579,7 @@ _0807FAF4: .4byte gBattleTypeFlags
thumb_func_start sub_807FAF8
sub_807FAF8: @ 807FAF8
push {lr}
bl sub_804C230
bl LoadPlayerParty
bl sub_807FB40
pop {r0}
bx r0
@@ -594,7 +594,7 @@ sub_807FB08: @ 807FB08
ldr r1, _0807FB38 @ =gMain
ldr r0, _0807FB3C @ =sub_807FAF8
str r0, [r1, 0x8]
bl copy_player_party_to_sav1
bl SavePlayerParty
bl sub_8159F40
bl GetWildBattleTransition
lsls r0, 24
@@ -1650,7 +1650,7 @@ TrainerWantsBattle: @ 8080334
ldr r2, _08080368 @ =gUnknown_3005074
strb r0, [r2]
ldr r4, _0808036C @ =gUnknown_20370D2
ldr r3, _08080370 @ =gUnknown_2036E38
ldr r3, _08080370 @ =gMapObjects
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@@ -1669,7 +1669,7 @@ TrainerWantsBattle: @ 8080334
.align 2, 0
_08080368: .4byte gUnknown_3005074
_0808036C: .4byte gUnknown_20370D2
_08080370: .4byte gUnknown_2036E38
_08080370: .4byte gMapObjects
_08080374: .4byte gUnknown_81A4EB4
thumb_func_end TrainerWantsBattle
@@ -1698,7 +1698,7 @@ sub_8080398: @ 8080398
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080803C8 @ =gUnknown_2036E38
ldr r0, _080803C8 @ =gMapObjects
adds r4, r0
ldrb r0, [r4, 0x18]
lsls r0, 28
@@ -1714,7 +1714,7 @@ sub_8080398: @ 8080398
bx r0
.align 2, 0
_080803C4: .4byte gUnknown_3005074
_080803C8: .4byte gUnknown_2036E38
_080803C8: .4byte gMapObjects
thumb_func_end sub_8080398
thumb_func_start sub_80803CC
asm/battle_tower.s
+23 -23
View File
@@ -939,7 +939,7 @@ sub_80E6078: @ 80E6078
ldrb r0, [r1]
cmp r0, 0xC8
bne _080E60A4
ldr r1, _080E609C @ =gUnknown_82538A8
ldr r1, _080E609C @ =gFacilityClassToPicIndex
ldr r2, _080E60A0 @ =0x000004a1
adds r0, r3, r2
ldrb r0, [r0]
@@ -948,12 +948,12 @@ sub_80E6078: @ 80E6078
.align 2, 0
_080E6094: .4byte gSaveBlock2Ptr
_080E6098: .4byte 0x0000056c
_080E609C: .4byte gUnknown_82538A8
_080E609C: .4byte gFacilityClassToPicIndex
_080E60A0: .4byte 0x000004a1
_080E60A4:
cmp r0, 0x63
bls _080E60C4
ldr r2, _080E60C0 @ =gUnknown_82538A8
ldr r2, _080E60C0 @ =gFacilityClassToPicIndex
ldrb r0, [r1]
subs r0, 0x64
movs r1, 0xA4
@@ -965,9 +965,9 @@ _080E60A4:
adds r0, r2
b _080E60D6
.align 2, 0
_080E60C0: .4byte gUnknown_82538A8
_080E60C0: .4byte gFacilityClassToPicIndex
_080E60C4:
ldr r3, _080E60DC @ =gUnknown_82538A8
ldr r3, _080E60DC @ =gFacilityClassToPicIndex
ldr r2, _080E60E0 @ =gUnknown_83FFAC4
ldrb r1, [r1]
lsls r0, r1, 2
@@ -981,7 +981,7 @@ _080E60D6:
pop {r1}
bx r1
.align 2, 0
_080E60DC: .4byte gUnknown_82538A8
_080E60DC: .4byte gFacilityClassToPicIndex
_080E60E0: .4byte gUnknown_83FFAC4
thumb_func_end sub_80E6078
@@ -995,7 +995,7 @@ sub_80E60E4: @ 80E60E4
ldrb r0, [r1]
cmp r0, 0xC8
bne _080E6110
ldr r1, _080E6108 @ =gUnknown_825393E
ldr r1, _080E6108 @ =gFacilityClassToTrainerClass
ldr r2, _080E610C @ =0x000004a1
adds r0, r3, r2
ldrb r0, [r0]
@@ -1004,12 +1004,12 @@ sub_80E60E4: @ 80E60E4
.align 2, 0
_080E6100: .4byte gSaveBlock2Ptr
_080E6104: .4byte 0x0000056c
_080E6108: .4byte gUnknown_825393E
_080E6108: .4byte gFacilityClassToTrainerClass
_080E610C: .4byte 0x000004a1
_080E6110:
cmp r0, 0x63
bhi _080E6130
ldr r3, _080E6128 @ =gUnknown_825393E
ldr r3, _080E6128 @ =gFacilityClassToTrainerClass
ldr r2, _080E612C @ =gUnknown_83FFAC4
ldrb r1, [r1]
lsls r0, r1, 2
@@ -1020,10 +1020,10 @@ _080E6110:
adds r0, r3
b _080E6144
.align 2, 0
_080E6128: .4byte gUnknown_825393E
_080E6128: .4byte gFacilityClassToTrainerClass
_080E612C: .4byte gUnknown_83FFAC4
_080E6130:
ldr r2, _080E614C @ =gUnknown_825393E
ldr r2, _080E614C @ =gFacilityClassToTrainerClass
ldrb r0, [r1]
subs r0, 0x64
movs r1, 0xA4
@@ -1038,7 +1038,7 @@ _080E6144:
pop {r1}
bx r1
.align 2, 0
_080E614C: .4byte gUnknown_825393E
_080E614C: .4byte gFacilityClassToTrainerClass
thumb_func_end sub_80E60E4
thumb_func_start sub_80E6150
@@ -1465,7 +1465,7 @@ _080E646E:
adds r0, r4, 0
movs r1, 0x20
add r2, sp, 0xC
bl sub_804037C
bl SetMonData
mov r0, r8
add r0, r10
ldrb r2, [r0, 0x2]
@@ -1474,7 +1474,7 @@ _080E646E:
adds r2, r0
adds r0, r4, 0
movs r1, 0xC
bl sub_804037C
bl SetMonData
mov r6, r9
_080E64A0:
cmp r6, 0x3
@@ -1523,7 +1523,7 @@ _080E64EC:
movs r0, 0xB
adds r1, r5, 0
muls r1, r0
ldr r0, _080E651C @ =gUnknown_8245EE0
ldr r0, _080E651C @ =gSpeciesNames
adds r1, r0
adds r0, r6, 0
bl StringAppend
@@ -1537,7 +1537,7 @@ _080E64EC:
.align 2, 0
_080E6514: .4byte gStringVar1
_080E6518: .4byte gUnknown_83FE859
_080E651C: .4byte gUnknown_8245EE0
_080E651C: .4byte gSpeciesNames
_080E6520:
cmp r4, 0x8
beq _080E6538
@@ -1999,7 +1999,7 @@ _080E6874:
adds r0, r4, 0
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
adds r5, 0x1
cmp r5, 0x5
ble _080E6874
@@ -2101,7 +2101,7 @@ _080E6948:
adds r0, r4
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
adds r5, 0x1
cmp r5, 0x5
ble _080E6948
@@ -3306,7 +3306,7 @@ _080E72EA:
adds r0, r4, 0
adds r1, r7, 0
adds r2, r6, 0
bl sub_804037C
bl SetMonData
_080E731A:
adds r5, 0x1
cmp r5, 0x2
@@ -3437,7 +3437,7 @@ _080E741C: .4byte gPlayerParty
thumb_func_start GetEreaderTrainerFrontSpriteId
GetEreaderTrainerFrontSpriteId: @ 80E7420
ldr r1, _080E7434 @ =gUnknown_82538A8
ldr r1, _080E7434 @ =gFacilityClassToPicIndex
ldr r0, _080E7438 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, _080E743C @ =0x000004a1
@@ -3447,14 +3447,14 @@ GetEreaderTrainerFrontSpriteId: @ 80E7420
ldrb r0, [r0]
bx lr
.align 2, 0
_080E7434: .4byte gUnknown_82538A8
_080E7434: .4byte gFacilityClassToPicIndex
_080E7438: .4byte gSaveBlock2Ptr
_080E743C: .4byte 0x000004a1
thumb_func_end GetEreaderTrainerFrontSpriteId
thumb_func_start GetEreaderTrainerClassId
GetEreaderTrainerClassId: @ 80E7440
ldr r1, _080E7454 @ =gUnknown_825393E
ldr r1, _080E7454 @ =gFacilityClassToTrainerClass
ldr r0, _080E7458 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, _080E745C @ =0x000004a1
@@ -3464,7 +3464,7 @@ GetEreaderTrainerClassId: @ 80E7440
ldrb r0, [r0]
bx lr
.align 2, 0
_080E7454: .4byte gUnknown_825393E
_080E7454: .4byte gFacilityClassToTrainerClass
_080E7458: .4byte gSaveBlock2Ptr
_080E745C: .4byte 0x000004a1
thumb_func_end GetEreaderTrainerClassId
asm/battle_transition.s
+2 -2
View File
@@ -4942,7 +4942,7 @@ sub_80D2EA4: @ 80D2EA4
adds r2, 0x2A
lsls r2, 16
asrs r2, 16
ldr r5, _080D3004 @ =gUnknown_201C000
ldr r5, _080D3004 @ =gDecompressionBuffer
str r5, [sp]
movs r3, 0
bl CreateTrainerSprite
@@ -5077,7 +5077,7 @@ sub_80D2EA4: @ 80D2EA4
_080D2FF8: .4byte gReservedSpritePaletteCount
_080D2FFC: .4byte gUnknown_83FA494
_080D3000: .4byte gUnknown_83FA4AE
_080D3004: .4byte gUnknown_201C000
_080D3004: .4byte gDecompressionBuffer
_080D3008: .4byte gSaveBlock2Ptr
_080D300C: .4byte gSprites
_080D3010: .4byte sub_80D301C
asm/battle_util.s
+322 -322
View File
File diff suppressed because it is too large Load Diff
asm/battle_util2.s
+6 -6
View File
@@ -229,11 +229,11 @@ sub_802E228: @ 802E228
cmp r0, 0
beq _0802E274
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r3, r0, 24
ldr r2, _0802E270 @ =gBattleMons
@@ -256,7 +256,7 @@ _0802E26C: .4byte gBattleTypeFlags
_0802E270: .4byte gBattleMons
_0802E274:
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
_0802E27E:
@@ -289,7 +289,7 @@ _0802E27E:
ldr r1, _0802E2C8 @ =gPlayerParty
adds r0, r1
movs r1, 0x9
bl sub_80436F8
bl AdjustFriendship
b _0802E302
.align 2, 0
_0802E2C0: .4byte gBattleMons
@@ -305,7 +305,7 @@ _0802E2CC:
ldr r1, _0802E2E8 @ =gPlayerParty
adds r0, r1
movs r1, 0x7
bl sub_80436F8
bl AdjustFriendship
b _0802E302
.align 2, 0
_0802E2E4: .4byte gBattlerPartyIndexes
@@ -320,7 +320,7 @@ _0802E2EC:
ldr r1, _0802E30C @ =gPlayerParty
adds r0, r1
movs r1, 0x7
bl sub_80436F8
bl AdjustFriendship
_0802E302:
pop {r4,r5}
pop {r0}
asm/bike.s
+12 -12
View File
@@ -77,7 +77,7 @@ sub_80BD100: @ 80BD100
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080BD160 @ =gUnknown_2036E38
ldr r0, _080BD160 @ =gMapObjects
adds r4, r0
bl player_get_direction_upper_nybble
lsls r0, 24
@@ -106,7 +106,7 @@ sub_80BD100: @ 80BD100
b _080BD1B6
.align 2, 0
_080BD15C: .4byte gUnknown_2037078
_080BD160: .4byte gUnknown_2036E38
_080BD160: .4byte gMapObjects
_080BD164: .4byte gMain
_080BD168:
ldrb r0, [r6]
@@ -204,7 +204,7 @@ sub_80BD1E8: @ 80BD1E8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080BD244 @ =gUnknown_2036E38
ldr r1, _080BD244 @ =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x1E]
bl sub_805A1DC
@@ -227,7 +227,7 @@ sub_80BD1E8: @ 80BD1E8
b _080BD270
.align 2, 0
_080BD240: .4byte gUnknown_2037078
_080BD244: .4byte gUnknown_2036E38
_080BD244: .4byte gMapObjects
_080BD248:
movs r0, 0x2
strb r0, [r4, 0x2]
@@ -281,7 +281,7 @@ sub_80BD28C: @ 80BD28C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080BD2C4 @ =gUnknown_2036E38
ldr r1, _080BD2C4 @ =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -299,7 +299,7 @@ _080BD2B2:
bx r0
.align 2, 0
_080BD2C0: .4byte gUnknown_2037078
_080BD2C4: .4byte gUnknown_2036E38
_080BD2C4: .4byte gMapObjects
thumb_func_end sub_80BD28C
thumb_func_start sub_80BD2C8
@@ -313,7 +313,7 @@ sub_80BD2C8: @ 80BD2C8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080BD2FC @ =gUnknown_2036E38
ldr r1, _080BD2FC @ =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -327,7 +327,7 @@ sub_80BD2C8: @ 80BD2C8
b _080BD350
.align 2, 0
_080BD2F8: .4byte gUnknown_2037078
_080BD2FC: .4byte gUnknown_2036E38
_080BD2FC: .4byte gMapObjects
_080BD300:
adds r0, r4, 0
bl sub_80BD3A0
@@ -425,7 +425,7 @@ sub_80BD3A0: @ 80BD3A0
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080BD408 @ =gUnknown_2036E38
ldr r0, _080BD408 @ =gMapObjects
adds r4, r0
ldrh r1, [r4, 0x10]
add r0, sp, 0x4
@@ -463,7 +463,7 @@ sub_80BD3A0: @ 80BD3A0
bx r1
.align 2, 0
_080BD404: .4byte gUnknown_2037078
_080BD408: .4byte gUnknown_2036E38
_080BD408: .4byte gMapObjects
thumb_func_end sub_80BD3A0
thumb_func_start sub_80BD40C
@@ -689,7 +689,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
lsls r0, 24
cmp r0, 0
beq _080BD5C0
ldr r2, _080BD5B8 @ =gUnknown_2036E38
ldr r2, _080BD5B8 @ =gMapObjects
ldr r0, _080BD5BC @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -704,7 +704,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
movs r0, 0
b _080BD5C2
.align 2, 0
_080BD5B8: .4byte gUnknown_2036E38
_080BD5B8: .4byte gMapObjects
_080BD5BC: .4byte gUnknown_2037078
_080BD5C0:
movs r0, 0x1
asm/cable_club.s
+20 -20
View File
@@ -800,10 +800,10 @@ _08080D88: .4byte sub_8080E6C
sub_8080D8C: @ 8080D8C
push {r4,r5,lr}
movs r5, 0
ldr r4, _08080D94 @ =gUnknown_202273C
ldr r4, _08080D94 @ =gLinkPlayers
b _08080DAC
.align 2, 0
_08080D94: .4byte gUnknown_202273C
_08080D94: .4byte gLinkPlayers
_08080D98:
ldrb r0, [r4]
subs r0, 0x1
@@ -929,7 +929,7 @@ sub_8080E6C: @ 8080E6C
mov r8, r0
b _08080EF8
_08080E9A:
ldr r1, _08080ED0 @ =gUnknown_202273C
ldr r1, _08080ED0 @ =gLinkPlayers
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
@@ -956,7 +956,7 @@ _08080E9A:
strb r0, [r4]
b _08080EF2
.align 2, 0
_08080ED0: .4byte gUnknown_202273C
_08080ED0: .4byte gLinkPlayers
_08080ED4: .4byte gUnknown_2022118
_08080ED8: .4byte gUnknown_2039624
_08080EDC:
@@ -1580,7 +1580,7 @@ _080813AA:
.align 2, 0
_080813B4: .4byte gUnknown_3003F64
_080813B8:
ldr r0, _080813CC @ =gUnknown_202273C
ldr r0, _080813CC @ =gLinkPlayers
ldr r0, [r0, 0x4]
movs r1, 0x1
ands r0, r1
@@ -1590,7 +1590,7 @@ _080813B8:
bl PlayMapChosenOrBattleBGM
b _080813DC
.align 2, 0
_080813CC: .4byte gUnknown_202273C
_080813CC: .4byte gLinkPlayers
_080813D0: .4byte 0x00000109
_080813D4:
movs r0, 0x85
@@ -1740,10 +1740,10 @@ _080814F0:
b _0808160A
_08081504:
movs r4, 0
ldr r5, _0808150C @ =gUnknown_202273C
ldr r5, _0808150C @ =gLinkPlayers
b _08081536
.align 2, 0
_0808150C: .4byte gUnknown_202273C
_0808150C: .4byte gLinkPlayers
_08081510:
lsls r1, r4, 8
ldr r2, _08081548 @ =gUnknown_2022118
@@ -1798,7 +1798,7 @@ _0808156A:
strh r0, [r6]
b _0808160A
_0808157A:
ldr r0, _08081590 @ =gUnknown_202273C
ldr r0, _08081590 @ =gLinkPlayers
ldr r0, [r0, 0x4]
movs r1, 0x1
ands r0, r1
@@ -1808,14 +1808,14 @@ _0808157A:
bl PlayMapChosenOrBattleBGM
b _080815A0
.align 2, 0
_08081590: .4byte gUnknown_202273C
_08081590: .4byte gLinkPlayers
_08081594: .4byte 0x00000109
_08081598:
movs r0, 0x85
lsls r0, 1
bl PlayMapChosenOrBattleBGM
_080815A0:
ldr r0, _080815B8 @ =gUnknown_202273C
ldr r0, _080815B8 @ =gLinkPlayers
ldr r1, _080815BC @ =0x00002211
str r1, [r0, 0x14]
ldr r0, _080815C0 @ =gUnknown_20370C0
@@ -1828,7 +1828,7 @@ _080815A0:
beq _080815CA
b _080815EA
.align 2, 0
_080815B8: .4byte gUnknown_202273C
_080815B8: .4byte gLinkPlayers
_080815BC: .4byte 0x00002211
_080815C0: .4byte gUnknown_20370C0
_080815C4:
@@ -1924,8 +1924,8 @@ sub_8081668: @ 8081668
ands r0, r1
str r0, [r2]
bl sub_8055DB8
bl sub_804C230
bl sub_804C440
bl LoadPlayerParty
bl SavePlayerBag
bl sub_81134B8
ldr r0, _080816B8 @ =gUnknown_20370C0
ldrh r0, [r0]
@@ -1955,7 +1955,7 @@ _080816BC: .4byte gUnknown_300502C
_080816C0: .4byte gUnknown_3003F3C
_080816C4: .4byte gUnknown_2023E8A
_080816C8:
ldr r4, _080816E8 @ =gUnknown_202273C
ldr r4, _080816E8 @ =gLinkPlayers
bl GetMultiplayerId
eors r0, r5
lsls r0, 24
@@ -1970,9 +1970,9 @@ _080816C8:
bl sub_8144714
b _0808170A
.align 2, 0
_080816E8: .4byte gUnknown_202273C
_080816E8: .4byte gLinkPlayers
_080816EC:
ldr r4, _08081718 @ =gUnknown_202273C
ldr r4, _08081718 @ =gLinkPlayers
bl GetMultiplayerId
eors r0, r5
lsls r0, 24
@@ -1993,7 +1993,7 @@ _0808170A:
ldr r0, _08081720 @ =sub_8081624
b _08081728
.align 2, 0
_08081718: .4byte gUnknown_202273C
_08081718: .4byte gLinkPlayers
_0808171C: .4byte gMain
_08081720: .4byte sub_8081624
_08081724:
@@ -2025,8 +2025,8 @@ sub_8081744: @ 8081744
cmp r1, 0x5
bne _08081760
_08081758:
bl sub_804C230
bl sub_804C440
bl LoadPlayerParty
bl SavePlayerBag
_08081760:
movs r0, 0x7F
bl copy_saved_warp2_bank_and_enter_x_to_warp1
asm/calculate_base_damage.s
-1123
View File
File diff suppressed because it is too large Load Diff
asm/daycare.s
+25 -25
View File
@@ -331,7 +331,7 @@ _08045628:
movs r6, 0
cmp r0, r7
bne _08045638
ldr r0, _08045658 @ =gUnknown_2024022
ldr r0, _08045658 @ =gMoveToLearn
ldrh r1, [r0]
adds r0, r4, 0
bl DeleteFirstMoveAndGiveMoveToMon
@@ -352,7 +352,7 @@ _0804564C:
pop {r0}
bx r0
.align 2, 0
_08045658: .4byte gUnknown_2024022
_08045658: .4byte gMoveToLearn
thumb_func_end ApplyDaycareExperience
thumb_func_start TakeSelectedPokemonFromDaycare
@@ -386,7 +386,7 @@ TakeSelectedPokemonFromDaycare: @ 804565C
add r2, sp, 0x64
mov r0, sp
movs r1, 0x19
bl sub_804037C
bl SetMonData
mov r0, sp
bl ApplyDaycareExperience
_080456AA:
@@ -488,7 +488,7 @@ GetLevelAfterDaycareSteps: @ 804574C
add r2, sp, 0x50
mov r0, sp
movs r1, 0x19
bl sub_80404D0
bl SetBoxMonData
mov r0, sp
bl GetLevelFromBoxMonExp
lsls r0, 24
@@ -766,7 +766,7 @@ sub_8045970: @ 8045970
lsrs r2, r0, 16
movs r0, 0
mov r8, r0
ldr r0, _0804599C @ =gUnknown_8259754
ldr r0, _0804599C @ =gEvolutionTable
mov r12, r0
_08045982:
movs r7, 0
@@ -784,7 +784,7 @@ _08045990:
lsrs r2, r4, 16
b _080459CC
.align 2, 0
_0804599C: .4byte gUnknown_8259754
_0804599C: .4byte gEvolutionTable
_080459A0:
adds r1, 0x1
cmp r1, 0x4
@@ -1039,7 +1039,7 @@ _08045B64:
strb r0, [r2]
mov r0, r9
movs r1, 0x27
bl sub_804037C
bl SetMonData
b _08045C0E
_08045B82:
add r4, sp, 0x10
@@ -1094,7 +1094,7 @@ _08045BD0:
movs r1, 0x2B
_08045BE8:
adds r2, r4, 0
bl sub_804037C
bl SetMonData
b _08045C0E
_08045BF0:
add r4, sp, 0x10
@@ -1109,7 +1109,7 @@ _08045BF0:
mov r0, r9
movs r1, 0x2C
adds r2, r4, 0
bl sub_804037C
bl SetMonData
_08045C0E:
adds r0, r5, 0x1
lsls r0, 24
@@ -1783,7 +1783,7 @@ sub_80460D4: @ 80460D4
strb r0, [r2]
mov r0, sp
movs r1, 0x2D
bl sub_804037C
bl SetMonData
ldr r0, _0804614C @ =gPlayerParty
movs r1, 0xFA
lsls r1, 1
@@ -1842,11 +1842,11 @@ CreateEgg: @ 8046150
adds r0, r7, 0
movs r1, 0x26
add r2, sp, 0x10
bl sub_804037C
bl SetMonData
ldr r2, _08046200 @ =gUnknown_825F83E
adds r0, r7, 0
movs r1, 0x2
bl sub_804037C
bl SetMonData
lsls r2, r5, 3
subs r2, r5
lsls r2, 2
@@ -1854,15 +1854,15 @@ CreateEgg: @ 8046150
adds r2, r0
adds r0, r7, 0
movs r1, 0x20
bl sub_804037C
bl SetMonData
adds r0, r7, 0
movs r1, 0x24
mov r2, r8
bl sub_804037C
bl SetMonData
adds r0, r7, 0
movs r1, 0x3
adds r2, r4, 0
bl sub_804037C
bl SetMonData
cmp r6, 0
beq _080461E2
add r2, sp, 0x14
@@ -1870,7 +1870,7 @@ CreateEgg: @ 8046150
strb r0, [r2]
adds r0, r7, 0
movs r1, 0x23
bl sub_804037C
bl SetMonData
_080461E2:
mov r2, sp
adds r2, 0x15
@@ -1878,7 +1878,7 @@ _080461E2:
strb r0, [r2]
adds r0, r7, 0
movs r1, 0x2D
bl sub_804037C
bl SetMonData
add sp, 0x18
pop {r3,r4}
mov r8, r3
@@ -1936,11 +1936,11 @@ SetInitialEggData: @ 8046208
adds r0, r6, 0
movs r1, 0x26
add r2, sp, 0x10
bl sub_804037C
bl SetMonData
ldr r2, _080462A4 @ =gUnknown_825F83E
adds r0, r6, 0
movs r1, 0x2
bl sub_804037C
bl SetMonData
lsls r2, r5, 3
subs r2, r5
lsls r2, 2
@@ -1948,15 +1948,15 @@ SetInitialEggData: @ 8046208
adds r2, r0
adds r0, r6, 0
movs r1, 0x20
bl sub_804037C
bl SetMonData
adds r0, r6, 0
movs r1, 0x24
mov r2, r9
bl sub_804037C
bl SetMonData
adds r0, r6, 0
movs r1, 0x3
adds r2, r4, 0
bl sub_804037C
bl SetMonData
add sp, 0x14
pop {r3,r4}
mov r8, r3
@@ -2089,11 +2089,11 @@ _08046390:
adds r0, r4, 0
movs r1, 0x20
mov r2, sp
bl sub_804037C
bl SetMonData
_0804639E:
adds r5, 0x1
_080463A0:
ldr r0, _080463B4 @ =gUnknown_2024029
ldr r0, _080463B4 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r5, r0
bcc _08046350
@@ -2105,7 +2105,7 @@ _080463AA:
pop {r1}
bx r1
.align 2, 0
_080463B4: .4byte gUnknown_2024029
_080463B4: .4byte gPlayerPartyCount
thumb_func_end sub_80462C4
thumb_func_start sub_80463B8
asm/decompress.s
+4 -4
View File
@@ -27,7 +27,7 @@ LoadCompressedObjectPic: @ 800EBCC
sub sp, 0x8
adds r4, r0, 0
ldr r0, [r4]
ldr r5, _0800EBFC @ =gUnknown_201C000
ldr r5, _0800EBFC @ =gDecompressionBuffer
adds r1, r5, 0
bl LZ77UnCompWram
str r5, [sp]
@@ -45,7 +45,7 @@ LoadCompressedObjectPic: @ 800EBCC
pop {r1}
bx r1
.align 2, 0
_0800EBFC: .4byte gUnknown_201C000
_0800EBFC: .4byte gDecompressionBuffer
thumb_func_end LoadCompressedObjectPic
thumb_func_start LoadCompressedObjectPicOverrideBuffer
@@ -76,7 +76,7 @@ LoadCompressedObjectPalette: @ 800EC28
sub sp, 0x8
adds r5, r0, 0
ldr r0, [r5]
ldr r4, _0800EC54 @ =gUnknown_201C000
ldr r4, _0800EC54 @ =gDecompressionBuffer
adds r1, r4, 0
bl LZ77UnCompWram
str r4, [sp]
@@ -93,7 +93,7 @@ LoadCompressedObjectPalette: @ 800EC28
pop {r0}
bx r0
.align 2, 0
_0800EC54: .4byte gUnknown_201C000
_0800EC54: .4byte gDecompressionBuffer
_0800EC58: .4byte 0xffff0000
thumb_func_end LoadCompressedObjectPalette
asm/easy_chat.s
+2 -2
View File
@@ -158,11 +158,11 @@ _080BD810:
_080BD814:
movs r0, 0xB
muls r0, r2
ldr r1, _080BD820 @ =gUnknown_8245EE0
ldr r1, _080BD820 @ =gSpeciesNames
adds r0, r1
b _080BD846
.align 2, 0
_080BD820: .4byte gUnknown_8245EE0
_080BD820: .4byte gSpeciesNames
_080BD824:
movs r0, 0xD
muls r0, r2
asm/egg_hatch.s
+18 -18
View File
@@ -110,7 +110,7 @@ _08046CC8:
adds r2, r0
adds r2, 0x10
adds r0, r5, 0
bl sub_804037C
bl SetMonData
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -123,7 +123,7 @@ _08046CE6:
lsls r2, r4, 2
adds r2, r7, r2
adds r0, r5, 0
bl sub_804037C
bl SetMonData
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -135,30 +135,30 @@ _08046CE6:
adds r0, r5, 0
movs r1, 0x3
mov r2, r9
bl sub_804037C
bl SetMonData
adds r0, r5, 0
movs r1, 0x25
mov r2, r10
bl sub_804037C
bl SetMonData
adds r0, r5, 0
movs r1, 0x8
ldr r2, [sp, 0x40]
bl sub_804037C
bl SetMonData
movs r0, 0x78
ldr r1, [sp, 0x44]
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x20
ldr r2, [sp, 0x44]
bl sub_804037C
bl SetMonData
adds r0, r5, 0
movs r1, 0x22
ldr r2, [sp, 0x4C]
bl sub_804037C
bl SetMonData
adds r0, r5, 0
movs r1, 0x50
ldr r2, [sp, 0x48]
bl sub_804037C
bl SetMonData
adds r0, r6, 0
adds r1, r5, 0
movs r2, 0x64
@@ -193,7 +193,7 @@ AddHatchedMonToParty: @ 8046D60
adds r0, r5, 0
movs r1, 0x2D
adds r2, r4, 0
bl sub_804037C
bl SetMonData
adds r0, r5, 0
movs r1, 0xB
bl GetMonData
@@ -206,7 +206,7 @@ AddHatchedMonToParty: @ 8046D60
adds r0, r5, 0
movs r1, 0x2
mov r2, sp
bl sub_804037C
bl SetMonData
adds r0, r4, 0
bl SpeciesToNationalPokedexNum
adds r4, r0, 0
@@ -227,20 +227,20 @@ AddHatchedMonToParty: @ 8046D60
strh r0, [r2]
adds r0, r5, 0
movs r1, 0x26
bl sub_804037C
bl SetMonData
add r2, sp, 0x10
movs r0, 0
strh r0, [r2]
adds r0, r5, 0
movs r1, 0x24
bl sub_804037C
bl SetMonData
bl sav1_map_get_name
mov r2, sp
adds r2, 0x12
strb r0, [r2]
adds r0, r5, 0
movs r1, 0x23
bl sub_804037C
bl SetMonData
adds r0, r5, 0
bl MonRestorePP
adds r0, r5, 0
@@ -400,7 +400,7 @@ _08046F1C:
lsls r0, r4, 3
ldr r1, _08046F64 @ =gUnknown_82350AC
adds r0, r1
ldr r1, _08046F68 @ =gUnknown_202401C
ldr r1, _08046F68 @ =gMonSpritesGfxPtr
ldr r2, [r1]
mov r6, r8
lsls r1, r6, 1
@@ -419,14 +419,14 @@ _08046F1C:
b _08046FA6
.align 2, 0
_08046F64: .4byte gUnknown_82350AC
_08046F68: .4byte gUnknown_202401C
_08046F68: .4byte gMonSpritesGfxPtr
_08046F6C:
adds r0, r5, 0
bl GetMonSpritePalStruct
ldrh r0, [r0, 0x4]
adds r1, r4, 0
bl sub_803F7D4
ldr r0, _08046FB4 @ =gUnknown_20244DC
ldr r0, _08046FB4 @ =gMultiuseSpriteTemplate
movs r1, 0x78
movs r2, 0x46
movs r3, 0x6
@@ -456,7 +456,7 @@ _08046FA6:
pop {r1}
bx r1
.align 2, 0
_08046FB4: .4byte gUnknown_20244DC
_08046FB4: .4byte gMultiuseSpriteTemplate
_08046FB8: .4byte gSprites
_08046FBC: .4byte SpriteCallbackDummy
thumb_func_end sub_8046ED0
@@ -778,7 +778,7 @@ EggHatchSetMonNickname: @ 80472A0
adds r0, r1
ldr r2, _080472D8 @ =gStringVar3
movs r1, 0x2
bl sub_804037C
bl SetMonData
bl FreeMonSpritesGfx
ldr r0, _080472DC @ =gUnknown_3000E74
ldr r0, [r0]
asm/event_data.s
+4 -4
View File
@@ -829,9 +829,9 @@ sub_806E6FC: @ 806E6FC
strh r0, [r1]
ldr r1, _0806E790 @ =gUnknown_20370D2
strh r0, [r1]
ldr r1, _0806E794 @ =gUnknown_20370D6
ldr r1, _0806E794 @ =gSpecialVar_MonBoxId
strh r0, [r1]
ldr r1, _0806E798 @ =gUnknown_20370D8
ldr r1, _0806E798 @ =gSpecialVar_MonBoxPos
strh r0, [r1]
ldr r1, _0806E79C @ =gUnknown_20370DA
strh r0, [r1]
@@ -857,8 +857,8 @@ _0806E784: .4byte gUnknown_20370D4
_0806E788: .4byte gUnknown_20370D0
_0806E78C: .4byte gUnknown_203AD30
_0806E790: .4byte gUnknown_20370D2
_0806E794: .4byte gUnknown_20370D6
_0806E798: .4byte gUnknown_20370D8
_0806E794: .4byte gSpecialVar_MonBoxId
_0806E798: .4byte gSpecialVar_MonBoxPos
_0806E79C: .4byte gUnknown_20370DA
_0806E7A0: .4byte gUnknown_20370DC
_0806E7A4: .4byte gUnknown_20370DE
asm/evolution_scene.s
+107 -107
View File
@@ -221,7 +221,7 @@ EvolutionScene: @ 80CDDF4
mov r2, r10
muls r2, r1
adds r1, r2, 0
ldr r2, _080CE0B4 @ =gUnknown_8245EE0
ldr r2, _080CE0B4 @ =gSpeciesNames
adds r1, r2
bl StringCopy
adds r0, r4, 0
@@ -241,7 +241,7 @@ EvolutionScene: @ 80CDDF4
lsls r0, r5, 3
ldr r1, _080CE0B8 @ =gUnknown_82350AC
adds r0, r1
ldr r2, _080CE0BC @ =gUnknown_202401C
ldr r2, _080CE0BC @ =gMonSpritesGfxPtr
ldr r1, [r2]
ldr r1, [r1, 0x8]
adds r2, r5, 0
@@ -258,7 +258,7 @@ EvolutionScene: @ 80CDDF4
adds r0, r5, 0
movs r1, 0x1
bl sub_803F7D4
ldr r0, _080CE0C0 @ =gUnknown_20244DC
ldr r0, _080CE0C0 @ =gMultiuseSpriteTemplate
mov r8, r0
ldr r1, _080CE0C4 @ =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
@@ -297,7 +297,7 @@ EvolutionScene: @ 80CDDF4
lsls r0, r1, 3
ldr r2, _080CE0B8 @ =gUnknown_82350AC
adds r0, r2
ldr r2, _080CE0BC @ =gUnknown_202401C
ldr r2, _080CE0BC @ =gMonSpritesGfxPtr
ldr r1, [r2]
ldr r1, [r1, 0x10]
mov r2, r10
@@ -414,10 +414,10 @@ _080CE0A4: .4byte gReservedSpritePaletteCount
_080CE0A8: .4byte gUnknown_2039A20
_080CE0AC: .4byte gStringVar1
_080CE0B0: .4byte gStringVar2
_080CE0B4: .4byte gUnknown_8245EE0
_080CE0B4: .4byte gSpeciesNames
_080CE0B8: .4byte gUnknown_82350AC
_080CE0BC: .4byte gUnknown_202401C
_080CE0C0: .4byte gUnknown_20244DC
_080CE0BC: .4byte gMonSpritesGfxPtr
_080CE0C0: .4byte gMultiuseSpriteTemplate
_080CE0C4: .4byte gDummySpriteAffineAnimTable
_080CE0C8: .4byte gSprites
_080CE0CC: .4byte nullsub_10
@@ -526,7 +526,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
lsls r0, r5, 3
ldr r1, _080CE2B8 @ =gUnknown_82350AC
adds r0, r1
ldr r1, _080CE2BC @ =gUnknown_202401C
ldr r1, _080CE2BC @ =gMonSpritesGfxPtr
ldr r1, [r1]
ldr r1, [r1, 0x10]
adds r2, r5, 0
@@ -543,7 +543,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
adds r0, r5, 0
movs r1, 0x3
bl sub_803F7D4
ldr r0, _080CE2C0 @ =gUnknown_20244DC
ldr r0, _080CE2C0 @ =gMultiuseSpriteTemplate
ldr r1, _080CE2C4 @ =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
movs r1, 0x78
@@ -619,8 +619,8 @@ _080CE2AC: .4byte gUnknown_2022982
_080CE2B0: .4byte gUnknown_2022B50
_080CE2B4: .4byte gReservedSpritePaletteCount
_080CE2B8: .4byte gUnknown_82350AC
_080CE2BC: .4byte gUnknown_202401C
_080CE2C0: .4byte gUnknown_20244DC
_080CE2BC: .4byte gMonSpritesGfxPtr
_080CE2C0: .4byte gMultiuseSpriteTemplate
_080CE2C4: .4byte gDummySpriteAffineAnimTable
_080CE2C8: .4byte gSprites
_080CE2CC: .4byte nullsub_10
@@ -772,7 +772,7 @@ _080CE414:
lsls r0, r6, 3
ldr r1, _080CE454 @ =gUnknown_82350AC
adds r0, r1
ldr r1, _080CE458 @ =gUnknown_202401C
ldr r1, _080CE458 @ =gMonSpritesGfxPtr
ldr r1, [r1]
ldr r1, [r1, 0x10]
adds r2, r6, 0
@@ -789,12 +789,12 @@ _080CE414:
b _080CE4EC
.align 2, 0
_080CE454: .4byte gUnknown_82350AC
_080CE458: .4byte gUnknown_202401C
_080CE458: .4byte gMonSpritesGfxPtr
_080CE45C:
adds r0, r6, 0
movs r1, 0x1
bl sub_803F7D4
ldr r0, _080CE4B4 @ =gUnknown_20244DC
ldr r0, _080CE4B4 @ =gMultiuseSpriteTemplate
ldr r1, _080CE4B8 @ =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
movs r1, 0x78
@@ -832,7 +832,7 @@ _080CE45C:
bl sub_80504B0
b _080CE534
.align 2, 0
_080CE4B4: .4byte gUnknown_20244DC
_080CE4B4: .4byte gMultiuseSpriteTemplate
_080CE4B8: .4byte gDummySpriteAffineAnimTable
_080CE4BC: .4byte gUnknown_2039A20
_080CE4C0: .4byte gSprites
@@ -921,7 +921,7 @@ TradeEvolutionScene: @ 80CE540
ldr r0, _080CE6B4 @ =gStringVar2
movs r1, 0xB
muls r1, r5
ldr r2, _080CE6B8 @ =gUnknown_8245EE0
ldr r2, _080CE6B8 @ =gSpeciesNames
adds r1, r2
bl StringCopy
ldr r1, _080CE6BC @ =gAffineAnimsDisabled
@@ -953,7 +953,7 @@ TradeEvolutionScene: @ 80CE540
lsls r0, r5, 3
ldr r1, _080CE6C4 @ =gUnknown_82350AC
adds r0, r1
ldr r1, _080CE6C8 @ =gUnknown_202401C
ldr r1, _080CE6C8 @ =gMonSpritesGfxPtr
ldr r1, [r1]
ldr r1, [r1, 0x8]
adds r2, r5, 0
@@ -970,7 +970,7 @@ TradeEvolutionScene: @ 80CE540
adds r0, r5, 0
movs r1, 0x1
bl sub_803F7D4
ldr r0, _080CE6CC @ =gUnknown_20244DC
ldr r0, _080CE6CC @ =gMultiuseSpriteTemplate
ldr r1, _080CE6D0 @ =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
movs r1, 0x78
@@ -1066,12 +1066,12 @@ TradeEvolutionScene: @ 80CE540
.align 2, 0
_080CE6B0: .4byte gStringVar1
_080CE6B4: .4byte gStringVar2
_080CE6B8: .4byte gUnknown_8245EE0
_080CE6B8: .4byte gSpeciesNames
_080CE6BC: .4byte gAffineAnimsDisabled
_080CE6C0: .4byte gUnknown_2039A20
_080CE6C4: .4byte gUnknown_82350AC
_080CE6C8: .4byte gUnknown_202401C
_080CE6CC: .4byte gUnknown_20244DC
_080CE6C8: .4byte gMonSpritesGfxPtr
_080CE6CC: .4byte gMultiuseSpriteTemplate
_080CE6D0: .4byte gDummySpriteAffineAnimTable
_080CE6D4: .4byte gSprites
_080CE6D8: .4byte nullsub_10
@@ -1133,7 +1133,7 @@ CreateShedinja: @ 80CE748
str r0, [sp, 0x8]
add r0, r10
lsls r7, r0, 3
ldr r1, _080CE8C4 @ =gUnknown_8259754
ldr r1, _080CE8C4 @ =gEvolutionTable
adds r1, r7
mov r8, r1
ldrh r0, [r1]
@@ -1141,7 +1141,7 @@ CreateShedinja: @ 80CE748
beq _080CE778
b _080CE8B2
_080CE778:
ldr r6, _080CE8C8 @ =gUnknown_2024029
ldr r6, _080CE8C8 @ =gPlayerPartyCount
ldrb r0, [r6]
cmp r0, 0x5
bls _080CE782
@@ -1158,11 +1158,11 @@ _080CE782:
ldrb r0, [r6]
muls r0, r5
adds r0, r4
ldr r1, _080CE8C4 @ =gUnknown_8259754
ldr r1, _080CE8C4 @ =gEvolutionTable
adds r2, r1, r7
adds r2, 0xC
movs r1, 0xB
bl sub_804037C
bl SetMonData
ldrb r0, [r6]
muls r0, r5
adds r0, r4
@@ -1170,28 +1170,28 @@ _080CE782:
ldrh r2, [r1, 0xC]
movs r1, 0xB
muls r2, r1
ldr r1, _080CE8D0 @ =gUnknown_8245EE0
ldr r1, _080CE8D0 @ =gSpeciesNames
adds r2, r1
movs r1, 0x2
bl sub_804037C
bl SetMonData
ldrb r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
ldrb r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0x8
mov r2, sp
bl sub_804037C
bl SetMonData
ldrb r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0xA
mov r2, sp
bl sub_804037C
bl SetMonData
movs r4, 0x32
ldr r0, [sp, 0x8]
mov r8, r0
@@ -1204,12 +1204,12 @@ _080CE7F0:
adds r0, r1
adds r1, r4, 0
mov r2, sp
bl sub_804037C
bl SetMonData
adds r4, 0x1
cmp r4, 0x36
ble _080CE7F0
movs r4, 0x43
ldr r7, _080CE8C8 @ =gUnknown_2024029
ldr r7, _080CE8C8 @ =gPlayerPartyCount
_080CE80C:
ldrb r0, [r7]
movs r6, 0x64
@@ -1218,17 +1218,17 @@ _080CE80C:
adds r0, r5
adds r1, r4, 0
mov r2, sp
bl sub_804037C
bl SetMonData
adds r4, 0x1
cmp r4, 0x4F
ble _080CE80C
ldr r4, _080CE8C8 @ =gUnknown_2024029
ldr r4, _080CE8C8 @ =gPlayerPartyCount
ldrb r0, [r4]
muls r0, r6
adds r0, r5
movs r1, 0x37
mov r2, sp
bl sub_804037C
bl SetMonData
movs r0, 0xFF
str r0, [sp]
ldrb r0, [r4]
@@ -1236,13 +1236,13 @@ _080CE80C:
adds r0, r5
movs r1, 0x40
mov r2, sp
bl sub_804037C
bl SetMonData
ldrb r0, [r4]
muls r0, r6
adds r0, r5
bl CalculateMonStats
bl CalculatePlayerPartyCount
ldr r0, _080CE8C4 @ =gUnknown_8259754
ldr r0, _080CE8C4 @ =gEvolutionTable
mov r4, r8
add r4, r10
lsls r4, 3
@@ -1280,7 +1280,7 @@ _080CE80C:
ldr r2, _080CE8D8 @ =gUnknown_83F8440
mov r0, r9
movs r1, 0x2
bl sub_804037C
bl SetMonData
_080CE8B2:
add sp, 0xC
pop {r3-r5}
@@ -1291,10 +1291,10 @@ _080CE8B2:
pop {r0}
bx r0
.align 2, 0
_080CE8C4: .4byte gUnknown_8259754
_080CE8C8: .4byte gUnknown_2024029
_080CE8C4: .4byte gEvolutionTable
_080CE8C8: .4byte gPlayerPartyCount
_080CE8CC: .4byte gPlayerParty
_080CE8D0: .4byte gUnknown_8245EE0
_080CE8D0: .4byte gSpeciesNames
_080CE8D4: .4byte 0x0000012f
_080CE8D8: .4byte gUnknown_83F8440
thumb_func_end CreateShedinja
@@ -1817,7 +1817,7 @@ _080CED3A:
adds r2, 0xC
mov r0, r9
movs r1, 0xB
bl sub_804037C
bl SetMonData
mov r0, r9
bl CalculateMonStats
ldrh r1, [r4, 0xA]
@@ -1881,7 +1881,7 @@ _080CEDC6:
movs r1, 0x2
add r2, sp, 0x4
bl GetMonData
ldr r0, _080CEE24 @ =gUnknown_2022AB8
ldr r0, _080CEE24 @ =gBattleTextBuff1
add r1, sp, 0x4
bl StringCopy10
ldr r0, _080CEE28 @ =0x0000ffff
@@ -1892,7 +1892,7 @@ _080CEDC6:
b _080CF528
.align 2, 0
_080CEE20: .4byte gTasks
_080CEE24: .4byte gUnknown_2022AB8
_080CEE24: .4byte gBattleTextBuff1
_080CEE28: .4byte 0x0000ffff
_080CEE2C:
ldr r0, _080CEE3C @ =0x0000fffe
@@ -2088,7 +2088,7 @@ _080CEFB6:
ldr r0, _080CEFEC @ =gUnknown_83FDF3C
ldr r0, [r0, 0xC]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CEFF0 @ =gUnknown_202298C
ldr r0, _080CEFF0 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CEFF4 @ =gTasks
@@ -2106,7 +2106,7 @@ _080CEFDE:
.align 2, 0
_080CEFE8: .4byte 0x00000101
_080CEFEC: .4byte gUnknown_83FDF3C
_080CEFF0: .4byte gUnknown_202298C
_080CEFF0: .4byte gDisplayedStringBattle
_080CEFF4: .4byte gTasks
_080CEFF8:
movs r0, 0
@@ -2191,7 +2191,7 @@ _080CF0A2:
ldr r0, _080CF0C8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x10]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF0CC @ =gUnknown_202298C
ldr r0, _080CF0CC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CF0D0 @ =gTasks
@@ -2204,7 +2204,7 @@ _080CF0A2:
b _080CF526
.align 2, 0
_080CF0C8: .4byte gUnknown_83FDF3C
_080CF0CC: .4byte gUnknown_202298C
_080CF0CC: .4byte gDisplayedStringBattle
_080CF0D0: .4byte gTasks
_080CF0D4:
movs r0, 0
@@ -2223,7 +2223,7 @@ _080CF0EE:
ldr r0, _080CF110 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x14]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF114 @ =gUnknown_202298C
ldr r0, _080CF114 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CF118 @ =gTasks
@@ -2236,7 +2236,7 @@ _080CF0EE:
b _080CF526
.align 2, 0
_080CF110: .4byte gUnknown_83FDF3C
_080CF114: .4byte gUnknown_202298C
_080CF114: .4byte gDisplayedStringBattle
_080CF118: .4byte gTasks
_080CF11C:
movs r0, 0
@@ -2251,7 +2251,7 @@ _080CF11C:
ldr r0, _080CF1A8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x18]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF1AC @ =gUnknown_202298C
ldr r0, _080CF1AC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CF1B0 @ =gTasks
@@ -2305,7 +2305,7 @@ _080CF176:
b _080CF528
.align 2, 0
_080CF1A8: .4byte gUnknown_83FDF3C
_080CF1AC: .4byte gUnknown_202298C
_080CF1AC: .4byte gDisplayedStringBattle
_080CF1B0: .4byte gTasks
_080CF1B4: .4byte gUnknown_83FE791
_080CF1B8: .4byte gUnknown_2023E82
@@ -2440,13 +2440,13 @@ _080CF2C2:
lsls r5, 3
adds r5, r1
ldrb r1, [r5, 0x1C]
ldr r2, _080CF300 @ =gUnknown_2024029
ldr r2, _080CF300 @ =gPlayerPartyCount
ldrb r2, [r2]
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
ldr r3, _080CF304 @ =CB2_EvolutionSceneLoadGraphics
ldr r4, _080CF308 @ =gUnknown_2024022
ldr r4, _080CF308 @ =gMoveToLearn
ldrh r4, [r4]
str r4, [sp]
bl sub_8134738
@@ -2458,9 +2458,9 @@ _080CF2C2:
_080CF2F4: .4byte gUnknown_2037AB8
_080CF2F8: .4byte gPlayerParty
_080CF2FC: .4byte gTasks
_080CF300: .4byte gUnknown_2024029
_080CF300: .4byte gPlayerPartyCount
_080CF304: .4byte CB2_EvolutionSceneLoadGraphics
_080CF308: .4byte gUnknown_2024022
_080CF308: .4byte gMoveToLearn
_080CF30C:
ldr r0, _080CF340 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
@@ -2508,7 +2508,7 @@ _080CF34C:
adds r0, r3
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF390 @ =gUnknown_202298C
ldr r0, _080CF390 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r1, _080CF394 @ =gTasks
@@ -2522,10 +2522,10 @@ _080CF34C:
.align 2, 0
_080CF388: .4byte gUnknown_83FDF3C
_080CF38C: .4byte 0x000004cc
_080CF390: .4byte gUnknown_202298C
_080CF390: .4byte gDisplayedStringBattle
_080CF394: .4byte gTasks
_080CF398:
ldr r1, _080CF3D4 @ =gUnknown_2022AC8
ldr r1, _080CF3D4 @ =gBattleTextBuff2
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -2540,7 +2540,7 @@ _080CF398:
mov r0, r9
adds r1, r4, 0
bl RemoveMonPPBonus
ldr r0, _080CF3D8 @ =gUnknown_2024022
ldr r0, _080CF3D8 @ =gMoveToLearn
ldrh r1, [r0]
mov r0, r9
adds r2, r4, 0
@@ -2554,8 +2554,8 @@ _080CF398:
adds r0, 0x1
b _080CF526
.align 2, 0
_080CF3D4: .4byte gUnknown_2022AC8
_080CF3D8: .4byte gUnknown_2024022
_080CF3D4: .4byte gBattleTextBuff2
_080CF3D8: .4byte gMoveToLearn
_080CF3DC: .4byte gTasks
_080CF3E0:
ldr r0, _080CF408 @ =gUnknown_83FDF3C
@@ -2564,7 +2564,7 @@ _080CF3E0:
adds r0, r1
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF40C @ =gUnknown_202298C
ldr r0, _080CF40C @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CF410 @ =gTasks
@@ -2577,7 +2577,7 @@ _080CF3E0:
b _080CF526
.align 2, 0
_080CF408: .4byte gUnknown_83FDF3C
_080CF40C: .4byte gUnknown_202298C
_080CF40C: .4byte gDisplayedStringBattle
_080CF410: .4byte gTasks
_080CF414:
movs r0, 0
@@ -2596,7 +2596,7 @@ _080CF42E:
ldr r0, _080CF450 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x1C]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF454 @ =gUnknown_202298C
ldr r0, _080CF454 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CF458 @ =gTasks
@@ -2609,7 +2609,7 @@ _080CF42E:
b _080CF526
.align 2, 0
_080CF450: .4byte gUnknown_83FDF3C
_080CF454: .4byte gUnknown_202298C
_080CF454: .4byte gDisplayedStringBattle
_080CF458: .4byte gTasks
_080CF45C:
movs r0, 0
@@ -2627,7 +2627,7 @@ _080CF45C:
adds r0, r1
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF49C @ =gUnknown_202298C
ldr r0, _080CF49C @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r1, _080CF4A0 @ =gTasks
@@ -2640,13 +2640,13 @@ _080CF45C:
b _080CF528
.align 2, 0
_080CF498: .4byte gUnknown_83FDF3C
_080CF49C: .4byte gUnknown_202298C
_080CF49C: .4byte gDisplayedStringBattle
_080CF4A0: .4byte gTasks
_080CF4A4:
ldr r0, _080CF4CC @ =gUnknown_83FDF3C
ldr r0, [r0, 0x20]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF4D0 @ =gUnknown_202298C
ldr r0, _080CF4D0 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r1, _080CF4D4 @ =gTasks
@@ -2663,13 +2663,13 @@ _080CF4A4:
b _080CF528
.align 2, 0
_080CF4CC: .4byte gUnknown_83FDF3C
_080CF4D0: .4byte gUnknown_202298C
_080CF4D0: .4byte gDisplayedStringBattle
_080CF4D4: .4byte gTasks
_080CF4D8:
ldr r0, _080CF4F8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x24]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF4FC @ =gUnknown_202298C
ldr r0, _080CF4FC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r1, _080CF500 @ =gTasks
@@ -2683,7 +2683,7 @@ _080CF4F2:
b _080CF528
.align 2, 0
_080CF4F8: .4byte gUnknown_83FDF3C
_080CF4FC: .4byte gUnknown_202298C
_080CF4FC: .4byte gDisplayedStringBattle
_080CF500: .4byte gTasks
_080CF504:
movs r0, 0
@@ -3124,7 +3124,7 @@ _080CF8A8:
adds r2, 0xC
mov r0, r8
movs r1, 0xB
bl sub_804037C
bl SetMonData
mov r0, r8
bl CalculateMonStats
ldrh r1, [r4, 0xA]
@@ -3191,7 +3191,7 @@ _080CF940:
movs r1, 0x2
add r2, sp, 0xC
bl GetMonData
ldr r0, _080CF990 @ =gUnknown_2022AB8
ldr r0, _080CF990 @ =gBattleTextBuff1
add r1, sp, 0xC
bl StringCopy10
ldr r0, _080CF994 @ =0x0000ffff
@@ -3202,7 +3202,7 @@ _080CF940:
b _080D003A
.align 2, 0
_080CF98C: .4byte gTasks
_080CF990: .4byte gUnknown_2022AB8
_080CF990: .4byte gBattleTextBuff1
_080CF994: .4byte 0x0000ffff
_080CF998:
ldr r0, _080CF9A8 @ =0x0000fffe
@@ -3373,7 +3373,7 @@ _080CFAF2:
ldr r0, _080CFB28 @ =gUnknown_83FDF3C
ldr r0, [r0, 0xC]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFB2C @ =gUnknown_202298C
ldr r1, _080CFB2C @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3391,7 +3391,7 @@ _080CFB1A:
.align 2, 0
_080CFB24: .4byte 0x00000101
_080CFB28: .4byte gUnknown_83FDF3C
_080CFB2C: .4byte gUnknown_202298C
_080CFB2C: .4byte gDisplayedStringBattle
_080CFB30: .4byte gTasks
_080CFB34:
movs r0, 0
@@ -3474,7 +3474,7 @@ _080CFBDA:
ldr r0, _080CFC00 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x10]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFC04 @ =gUnknown_202298C
ldr r1, _080CFC04 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3487,7 +3487,7 @@ _080CFBDA:
b _080D0038
.align 2, 0
_080CFC00: .4byte gUnknown_83FDF3C
_080CFC04: .4byte gUnknown_202298C
_080CFC04: .4byte gDisplayedStringBattle
_080CFC08: .4byte gTasks
_080CFC0C:
movs r0, 0
@@ -3506,7 +3506,7 @@ _080CFC26:
ldr r0, _080CFC48 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x14]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFC4C @ =gUnknown_202298C
ldr r1, _080CFC4C @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3519,7 +3519,7 @@ _080CFC26:
b _080D0038
.align 2, 0
_080CFC48: .4byte gUnknown_83FDF3C
_080CFC4C: .4byte gUnknown_202298C
_080CFC4C: .4byte gDisplayedStringBattle
_080CFC50: .4byte gTasks
_080CFC54:
movs r0, 0
@@ -3534,7 +3534,7 @@ _080CFC54:
ldr r0, _080CFCE8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x18]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFCEC @ =gUnknown_202298C
ldr r1, _080CFCEC @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3592,7 +3592,7 @@ _080CFCAE:
b _080D003A
.align 2, 0
_080CFCE8: .4byte gUnknown_83FDF3C
_080CFCEC: .4byte gUnknown_202298C
_080CFCEC: .4byte gDisplayedStringBattle
_080CFCF0: .4byte gTasks
_080CFCF4: .4byte gUnknown_826D1CC
_080CFCF8: .4byte gUnknown_2023E82
@@ -3622,7 +3622,7 @@ _080CFD1C:
adds r0, r3
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFD68 @ =gUnknown_202298C
ldr r1, _080CFD68 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3650,7 +3650,7 @@ _080CFD56:
.align 2, 0
_080CFD60: .4byte gUnknown_2023E82
_080CFD64: .4byte gUnknown_83FDF3C
_080CFD68: .4byte gUnknown_202298C
_080CFD68: .4byte gDisplayedStringBattle
_080CFD6C: .4byte gTasks
_080CFD70:
ldr r1, _080CFD9C @ =gUnknown_2023E82
@@ -3662,7 +3662,7 @@ _080CFD70:
adds r0, r1
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFDA4 @ =gUnknown_202298C
ldr r1, _080CFDA4 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3676,7 +3676,7 @@ _080CFD70:
.align 2, 0
_080CFD9C: .4byte gUnknown_2023E82
_080CFDA0: .4byte gUnknown_83FDF3C
_080CFDA4: .4byte gUnknown_202298C
_080CFDA4: .4byte gDisplayedStringBattle
_080CFDA8: .4byte gTasks
_080CFDAC:
ldr r0, _080CFE14 @ =gUnknown_2037AB8
@@ -3709,13 +3709,13 @@ _080CFDC6:
lsls r5, 3
adds r5, r1
ldrb r1, [r5, 0x1C]
ldr r2, _080CFE24 @ =gUnknown_2024029
ldr r2, _080CFE24 @ =gPlayerPartyCount
ldrb r2, [r2]
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
ldr r3, _080CFE28 @ =CB2_TradeEvolutionSceneLoadGraphics
ldr r4, _080CFE2C @ =gUnknown_2024022
ldr r4, _080CFE2C @ =gMoveToLearn
ldrh r4, [r4]
str r4, [sp]
bl sub_8134738
@@ -3728,9 +3728,9 @@ _080CFE14: .4byte gUnknown_2037AB8
_080CFE18: .4byte gUnknown_3003F3C
_080CFE1C: .4byte gPlayerParty
_080CFE20: .4byte gTasks
_080CFE24: .4byte gUnknown_2024029
_080CFE24: .4byte gPlayerPartyCount
_080CFE28: .4byte CB2_TradeEvolutionSceneLoadGraphics
_080CFE2C: .4byte gUnknown_2024022
_080CFE2C: .4byte gMoveToLearn
_080CFE30:
ldr r0, _080CFE64 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
@@ -3779,7 +3779,7 @@ _080CFE74:
adds r0, r3
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFEB8 @ =gUnknown_202298C
ldr r1, _080CFEB8 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3793,10 +3793,10 @@ _080CFE74:
.align 2, 0
_080CFEB0: .4byte gUnknown_83FDF3C
_080CFEB4: .4byte 0x000004cc
_080CFEB8: .4byte gUnknown_202298C
_080CFEB8: .4byte gDisplayedStringBattle
_080CFEBC: .4byte gTasks
_080CFEC0:
ldr r1, _080CFF14 @ =gUnknown_2022AC8
ldr r1, _080CFF14 @ =gBattleTextBuff2
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -3811,7 +3811,7 @@ _080CFEC0:
mov r0, r8
adds r1, r4, 0
bl RemoveMonPPBonus
ldr r0, _080CFF18 @ =gUnknown_2024022
ldr r0, _080CFF18 @ =gMoveToLearn
ldrh r1, [r0]
mov r0, r8
adds r2, r4, 0
@@ -3822,7 +3822,7 @@ _080CFEC0:
adds r0, r1
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFF20 @ =gUnknown_202298C
ldr r1, _080CFF20 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3834,10 +3834,10 @@ _080CFEC0:
adds r0, 0x1
b _080D0038
.align 2, 0
_080CFF14: .4byte gUnknown_2022AC8
_080CFF18: .4byte gUnknown_2024022
_080CFF14: .4byte gBattleTextBuff2
_080CFF18: .4byte gMoveToLearn
_080CFF1C: .4byte gUnknown_83FDF3C
_080CFF20: .4byte gUnknown_202298C
_080CFF20: .4byte gDisplayedStringBattle
_080CFF24: .4byte gTasks
_080CFF28:
movs r0, 0
@@ -3856,7 +3856,7 @@ _080CFF42:
ldr r0, _080CFF64 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x1C]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFF68 @ =gUnknown_202298C
ldr r1, _080CFF68 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3869,7 +3869,7 @@ _080CFF42:
b _080D0038
.align 2, 0
_080CFF64: .4byte gUnknown_83FDF3C
_080CFF68: .4byte gUnknown_202298C
_080CFF68: .4byte gDisplayedStringBattle
_080CFF6C: .4byte gTasks
_080CFF70:
movs r0, 0
@@ -3887,7 +3887,7 @@ _080CFF70:
adds r0, r3
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFFB0 @ =gUnknown_202298C
ldr r1, _080CFFB0 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3900,13 +3900,13 @@ _080CFF70:
b _080D003A
.align 2, 0
_080CFFAC: .4byte gUnknown_83FDF3C
_080CFFB0: .4byte gUnknown_202298C
_080CFFB0: .4byte gDisplayedStringBattle
_080CFFB4: .4byte gTasks
_080CFFB8:
ldr r0, _080CFFE0 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x20]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080CFFE4 @ =gUnknown_202298C
ldr r1, _080CFFE4 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3923,13 +3923,13 @@ _080CFFB8:
b _080D003A
.align 2, 0
_080CFFE0: .4byte gUnknown_83FDF3C
_080CFFE4: .4byte gUnknown_202298C
_080CFFE4: .4byte gDisplayedStringBattle
_080CFFE8: .4byte gTasks
_080CFFEC:
ldr r0, _080D000C @ =gUnknown_83FDF3C
ldr r0, [r0, 0x24]
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, _080D0010 @ =gUnknown_202298C
ldr r1, _080D0010 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3943,7 +3943,7 @@ _080D0006:
b _080D003A
.align 2, 0
_080D000C: .4byte gUnknown_83FDF3C
_080D0010: .4byte gUnknown_202298C
_080D0010: .4byte gDisplayedStringBattle
_080D0014: .4byte gTasks
_080D0018:
movs r0, 0
asm/field_control_avatar.s
+9 -9
View File
@@ -906,7 +906,7 @@ _0806CF7E:
lsrs r3, r0, 24
cmp r3, 0x10
beq _0806CF9E
ldr r1, _0806CFA8 @ =gUnknown_2036E38
ldr r1, _0806CFA8 @ =gMapObjects
lsls r2, r3, 3
adds r0, r2, r3
lsls r0, 2
@@ -920,7 +920,7 @@ _0806CF9E:
b _0806CFDE
.align 2, 0
_0806CFA4: .4byte gUnknown_826D2D8
_0806CFA8: .4byte gUnknown_2036E38
_0806CFA8: .4byte gMapObjects
_0806CFAC:
movs r4, 0
ldr r1, _0806CFE4 @ =gUnknown_2031DEC
@@ -978,7 +978,7 @@ sub_806CFF4: @ 806CFF4
lsrs r5, r0, 24
cmp r5, 0x10
beq _0806D02A
ldr r2, _0806D098 @ =gUnknown_2036E38
ldr r2, _0806D098 @ =gMapObjects
lsls r1, r5, 3
adds r0, r1, r5
lsls r0, 2
@@ -1016,7 +1016,7 @@ _0806D02A:
lsrs r5, r0, 24
cmp r5, 0x10
beq _0806D092
ldr r2, _0806D098 @ =gUnknown_2036E38
ldr r2, _0806D098 @ =gMapObjects
lsls r1, r5, 3
adds r0, r1, r5
lsls r0, 2
@@ -1031,7 +1031,7 @@ _0806D078:
bne _0806D0A0
adds r0, r6, r5
lsls r0, 2
ldr r1, _0806D098 @ =gUnknown_2036E38
ldr r1, _0806D098 @ =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@@ -1041,13 +1041,13 @@ _0806D092:
movs r0, 0
b _0806D0C8
.align 2, 0
_0806D098: .4byte gUnknown_2036E38
_0806D098: .4byte gMapObjects
_0806D09C: .4byte gUnknown_826D2D8
_0806D0A0:
ldr r0, _0806D0D4 @ =gUnknown_3005074
strb r5, [r0]
ldr r4, _0806D0D8 @ =gUnknown_20370D2
ldr r1, _0806D0DC @ =gUnknown_2036E38
ldr r1, _0806D0DC @ =gMapObjects
adds r0, r6, r5
lsls r0, 2
adds r0, r1
@@ -1071,7 +1071,7 @@ _0806D0C8:
.align 2, 0
_0806D0D4: .4byte gUnknown_3005074
_0806D0D8: .4byte gUnknown_20370D2
_0806D0DC: .4byte gUnknown_2036E38
_0806D0DC: .4byte gMapObjects
_0806D0E0: .4byte gUnknown_20370D4
thumb_func_end sub_806CFF4
@@ -1887,7 +1887,7 @@ AdjustFriendship_step: @ 806D74C
_0806D76A:
adds r0, r5, 0
movs r1, 0x5
bl sub_80436F8
bl AdjustFriendship
adds r5, 0x64
subs r4, 0x1
cmp r4, 0
asm/field_effect.s
+90 -90
View File
@@ -734,7 +734,7 @@ sub_8083970: @ 8083970
str r2, [sp, 0x4]
movs r1, 0
str r1, [sp, 0x8]
ldr r1, _080839C0 @ =gUnknown_823730C
ldr r1, _080839C0 @ =gMonPaletteTable
lsls r4, r0, 3
adds r4, r1
ldrh r1, [r4, 0x4]
@@ -758,7 +758,7 @@ sub_8083970: @ 8083970
lsrs r0, 24
b _080839CA
.align 2, 0
_080839C0: .4byte gUnknown_823730C
_080839C0: .4byte gMonPaletteTable
_080839C4: .4byte 0x0000ffff
_080839C8:
movs r0, 0x40
@@ -2067,7 +2067,7 @@ mapldr_08084390: @ 8084390
ldr r0, _080843E8 @ =c3_080843F8
movs r1, 0
bl CreateTask
ldr r4, _080843EC @ =gUnknown_2036E38
ldr r4, _080843EC @ =gMapObjects
ldr r3, _080843F0 @ =gUnknown_2037078
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@@ -2101,7 +2101,7 @@ _080843D2:
bx r0
.align 2, 0
_080843E8: .4byte c3_080843F8
_080843EC: .4byte gUnknown_2036E38
_080843EC: .4byte gMapObjects
_080843F0: .4byte gUnknown_2037078
_080843F4: .4byte gUnknown_3005020
thumb_func_end mapldr_08084390
@@ -2214,7 +2214,7 @@ sub_80844BC: @ 80844BC
lsls r5, r0, 3
adds r5, r0
lsls r5, 2
ldr r0, _0808455C @ =gUnknown_2036E38
ldr r0, _0808455C @ =gMapObjects
mov r8, r0
add r5, r8
ldrb r0, [r6, 0x4]
@@ -2279,7 +2279,7 @@ sub_80844BC: @ 80844BC
bx r1
.align 2, 0
_08084558: .4byte gUnknown_2037078
_0808455C: .4byte gUnknown_2036E38
_0808455C: .4byte gMapObjects
_08084560: .4byte gSprites
thumb_func_end sub_80844BC
@@ -2331,7 +2331,7 @@ sub_8084580: @ 8084580
movs r0, 0x1
strh r0, [r5, 0xA]
strh r1, [r5, 0xC]
ldr r2, _080845F0 @ =gUnknown_2036E38
ldr r2, _080845F0 @ =gMapObjects
ldrb r0, [r6, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -2355,7 +2355,7 @@ sub_8084580: @ 8084580
_080845E4: .4byte gUnknown_2037078
_080845E8: .4byte gSprites
_080845EC: .4byte gSpriteCoordOffsetY
_080845F0: .4byte gUnknown_2036E38
_080845F0: .4byte gMapObjects
thumb_func_end sub_8084580
thumb_func_start sub_80845F4
@@ -2367,7 +2367,7 @@ sub_80845F4: @ 80845F4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080846A4 @ =gUnknown_2036E38
ldr r1, _080846A4 @ =gMapObjects
adds r6, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -2450,7 +2450,7 @@ _08084698:
bx r1
.align 2, 0
_080846A0: .4byte gUnknown_2037078
_080846A4: .4byte gUnknown_2036E38
_080846A4: .4byte gMapObjects
_080846A8: .4byte gSprites
thumb_func_end sub_80845F4
@@ -2650,7 +2650,7 @@ sub_8084820: @ 8084820
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0808488C @ =gUnknown_2036E38
ldr r1, _0808488C @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -2693,7 +2693,7 @@ _0808487E:
bx r1
.align 2, 0
_08084888: .4byte gUnknown_2037078
_0808488C: .4byte gUnknown_2036E38
_0808488C: .4byte gMapObjects
thumb_func_end sub_8084820
thumb_func_start sub_8084890
@@ -2944,7 +2944,7 @@ sub_8084A5C: @ 8084A5C
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08084AC0 @ =gUnknown_2036E38
ldr r0, _08084AC0 @ =gMapObjects
adds r4, r0
movs r0, 0x4
bl sub_8063EB8
@@ -2979,7 +2979,7 @@ sub_8084A5C: @ 8084A5C
b _08084AC6
.align 2, 0
_08084ABC: .4byte gUnknown_2037078
_08084AC0: .4byte gUnknown_2036E38
_08084AC0: .4byte gMapObjects
_08084AC4:
movs r1, 0
_08084AC6:
@@ -3189,7 +3189,7 @@ sub_8084C3C: @ 8084C3C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08084C98 @ =gUnknown_2036E38
ldr r1, _08084C98 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@@ -3220,7 +3220,7 @@ _08084C8A:
bx r1
.align 2, 0
_08084C94: .4byte gUnknown_2037078
_08084C98: .4byte gUnknown_2036E38
_08084C98: .4byte gMapObjects
_08084C9C: .4byte sub_8084A24
thumb_func_end sub_8084C3C
@@ -3273,7 +3273,7 @@ _08084CEA:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _08084D20 @ =gUnknown_2036E38
ldr r0, _08084D20 @ =gMapObjects
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@@ -3288,7 +3288,7 @@ _08084CEA:
_08084D14: .4byte gUnknown_83CC084
_08084D18: .4byte gTasks
_08084D1C: .4byte gUnknown_2037078
_08084D20: .4byte gUnknown_2036E38
_08084D20: .4byte gMapObjects
thumb_func_end sub_8084CD8
thumb_func_start sub_8084D24
@@ -3537,7 +3537,7 @@ dive_3_unknown: @ 8084ED4
lsls r0, 24
cmp r0, 0
bne _08084F18
ldr r2, _08084F20 @ =gUnknown_2036E38
ldr r2, _08084F20 @ =gMapObjects
ldr r0, _08084F24 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -3560,7 +3560,7 @@ _08084F18:
pop {r1}
bx r1
.align 2, 0
_08084F20: .4byte gUnknown_2036E38
_08084F20: .4byte gMapObjects
_08084F24: .4byte gUnknown_2037078
_08084F28: .4byte sub_8084E60
thumb_func_end dive_3_unknown
@@ -3600,7 +3600,7 @@ _08084F58:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _08084F98 @ =gUnknown_2036E38
ldr r0, _08084F98 @ =gMapObjects
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@@ -3621,7 +3621,7 @@ _08084F58:
_08084F8C: .4byte gUnknown_83CC0A4
_08084F90: .4byte gTasks
_08084F94: .4byte gUnknown_2037078
_08084F98: .4byte gUnknown_2036E38
_08084F98: .4byte gMapObjects
_08084F9C: .4byte gSprites
thumb_func_end sub_8084F44
@@ -3946,7 +3946,7 @@ _080851FC:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _0808523C @ =gUnknown_2036E38
ldr r0, _0808523C @ =gMapObjects
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@@ -3967,7 +3967,7 @@ _080851FC:
_08085230: .4byte gUnknown_83CC0BC
_08085234: .4byte gTasks
_08085238: .4byte gUnknown_2037078
_0808523C: .4byte gUnknown_2036E38
_0808523C: .4byte gMapObjects
_08085240: .4byte gSprites
thumb_func_end sub_80851E8
@@ -4209,7 +4209,7 @@ _080853F8:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _08085438 @ =gUnknown_2036E38
ldr r0, _08085438 @ =gMapObjects
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@@ -4230,7 +4230,7 @@ _080853F8:
_0808542C: .4byte gUnknown_83CC0CC
_08085430: .4byte gTasks
_08085434: .4byte gUnknown_2037078
_08085438: .4byte gUnknown_2036E38
_08085438: .4byte gMapObjects
_0808543C: .4byte gSprites
thumb_func_end sub_80853E4
@@ -4546,7 +4546,7 @@ sub_8085690: @ 8085690
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080856D8 @ =gUnknown_2036E38
ldr r1, _080856D8 @ =gMapObjects
adds r6, r0, r1
adds r4, r5, 0
adds r4, 0x8
@@ -4572,7 +4572,7 @@ sub_8085690: @ 8085690
b _08085702
.align 2, 0
_080856D4: .4byte gUnknown_2037078
_080856D8: .4byte gUnknown_2036E38
_080856D8: .4byte gMapObjects
_080856DC:
movs r1, 0x8
ldrsh r0, [r4, r1]
@@ -4973,7 +4973,7 @@ sub_80859D4: @ 80859D4
ldr r1, _08085A14 @ =gUnknown_3005020
movs r0, 0
str r0, [r1]
ldr r2, _08085A18 @ =gUnknown_2036E38
ldr r2, _08085A18 @ =gMapObjects
ldr r0, _08085A1C @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -4991,7 +4991,7 @@ sub_80859D4: @ 80859D4
bx r0
.align 2, 0
_08085A14: .4byte gUnknown_3005020
_08085A18: .4byte gUnknown_2036E38
_08085A18: .4byte gMapObjects
_08085A1C: .4byte gUnknown_2037078
_08085A20: .4byte sub_8085A24
thumb_func_end sub_80859D4
@@ -5056,7 +5056,7 @@ sub_8085A80: @ 8085A80
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08085AD8 @ =gUnknown_2036E38
ldr r1, _08085AD8 @ =gMapObjects
adds r6, r0, r1
adds r1, r4, 0
adds r1, 0xA
@@ -5088,7 +5088,7 @@ sub_8085A80: @ 8085A80
b _08085B10
.align 2, 0
_08085AD4: .4byte gUnknown_2037078
_08085AD8: .4byte gUnknown_2036E38
_08085AD8: .4byte gMapObjects
_08085ADC:
movs r2, 0xE
ldrsh r0, [r5, r2]
@@ -5226,7 +5226,7 @@ sub_8085BD0: @ 8085BD0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08085C5C @ =gUnknown_2036E38
ldr r1, _08085C5C @ =gMapObjects
adds r5, r0, r1
ldrh r1, [r4, 0xA]
movs r2, 0xA
@@ -5282,7 +5282,7 @@ _08085C4A:
.align 2, 0
_08085C54: .4byte gUnknown_83CC108
_08085C58: .4byte gUnknown_2037078
_08085C5C: .4byte gUnknown_2036E38
_08085C5C: .4byte gMapObjects
thumb_func_end sub_8085BD0
thumb_func_start sub_8085C60
@@ -5299,7 +5299,7 @@ sub_8085C60: @ 8085C60
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08085D2C @ =gUnknown_2036E38
ldr r1, _08085D2C @ =gMapObjects
adds r3, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -5387,7 +5387,7 @@ _08085D1A:
.align 2, 0
_08085D24: .4byte gUnknown_83CC108
_08085D28: .4byte gUnknown_2037078
_08085D2C: .4byte gUnknown_2036E38
_08085D2C: .4byte gMapObjects
_08085D30: .4byte gSprites
thumb_func_end sub_8085C60
@@ -5439,7 +5439,7 @@ mapldr_08085D88: @ 8085D88
ldr r1, _08085DCC @ =gUnknown_3005020
movs r0, 0
str r0, [r1]
ldr r2, _08085DD0 @ =gUnknown_2036E38
ldr r2, _08085DD0 @ =gMapObjects
ldr r0, _08085DD4 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -5458,7 +5458,7 @@ mapldr_08085D88: @ 8085D88
bx r0
.align 2, 0
_08085DCC: .4byte gUnknown_3005020
_08085DD0: .4byte gUnknown_2036E38
_08085DD0: .4byte gMapObjects
_08085DD4: .4byte gUnknown_2037078
_08085DD8: .4byte sub_8085DDC
thumb_func_end mapldr_08085D88
@@ -5518,7 +5518,7 @@ sub_8085E0C: @ 8085E0C
adds r0, r1
negs r0, r0
strh r0, [r2, 0x26]
ldr r3, _08085E94 @ =gUnknown_2036E38
ldr r3, _08085E94 @ =gMapObjects
ldrb r0, [r5, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -5554,7 +5554,7 @@ _08085E82:
_08085E88: .4byte gUnknown_2037078
_08085E8C: .4byte gSprites
_08085E90: .4byte gSpriteCoordOffsetY
_08085E94: .4byte gUnknown_2036E38
_08085E94: .4byte gMapObjects
thumb_func_end sub_8085E0C
thumb_func_start sub_8085E98
@@ -5571,7 +5571,7 @@ sub_8085E98: @ 8085E98
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08085F08 @ =gUnknown_2036E38
ldr r1, _08085F08 @ =gMapObjects
adds r6, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -5613,7 +5613,7 @@ sub_8085E98: @ 8085E98
.align 2, 0
_08085F00: .4byte gUnknown_83CC108
_08085F04: .4byte gUnknown_2037078
_08085F08: .4byte gUnknown_2036E38
_08085F08: .4byte gMapObjects
_08085F0C: .4byte gSprites
_08085F10:
ldrb r1, [r5, 0x5]
@@ -5704,7 +5704,7 @@ sub_8085F9C: @ 8085F9C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086020 @ =gUnknown_2036E38
ldr r1, _08086020 @ =gMapObjects
adds r5, r0, r1
ldrh r0, [r4, 0xA]
subs r0, 0x1
@@ -5751,7 +5751,7 @@ _08086010:
.align 2, 0
_08086018: .4byte gUnknown_83CC108
_0808601C: .4byte gUnknown_2037078
_08086020: .4byte gUnknown_2036E38
_08086020: .4byte gMapObjects
_08086024: .4byte sub_8085DDC
thumb_func_end sub_8085F9C
@@ -7014,7 +7014,7 @@ sub_80869C0: @ 80869C0
adds r0, r6, 0
mov r1, r8
bl PlayerGetDestCoords
ldr r2, _08086A1C @ =gUnknown_2036E38
ldr r2, _08086A1C @ =gMapObjects
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7035,7 +7035,7 @@ sub_80869C0: @ 80869C0
bx r0
.align 2, 0
_08086A18: .4byte gUnknown_2037078
_08086A1C: .4byte gUnknown_2036E38
_08086A1C: .4byte gMapObjects
thumb_func_end sub_80869C0
thumb_func_start sub_8086A20
@@ -7047,7 +7047,7 @@ sub_8086A20: @ 8086A20
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086A68 @ =gUnknown_2036E38
ldr r1, _08086A68 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -7073,7 +7073,7 @@ _08086A5C:
bx r0
.align 2, 0
_08086A64: .4byte gUnknown_2037078
_08086A68: .4byte gUnknown_2036E38
_08086A68: .4byte gMapObjects
thumb_func_end sub_8086A20
thumb_func_start sub_8086A6C
@@ -7085,7 +7085,7 @@ sub_8086A6C: @ 8086A6C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086AAC @ =gUnknown_2036E38
ldr r1, _08086AAC @ =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@@ -7109,7 +7109,7 @@ _08086AA2:
bx r0
.align 2, 0
_08086AA8: .4byte gUnknown_2037078
_08086AAC: .4byte gUnknown_2036E38
_08086AAC: .4byte gMapObjects
_08086AB0: .4byte gUnknown_20386E0
thumb_func_end sub_8086A6C
@@ -7127,7 +7127,7 @@ sub_8086AB4: @ 8086AB4
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08086B28 @ =gUnknown_2036E38
ldr r0, _08086B28 @ =gMapObjects
adds r4, r0
movs r0, 0x2
bl sub_805C808
@@ -7167,7 +7167,7 @@ _08086B1E:
bx r0
.align 2, 0
_08086B24: .4byte gUnknown_2037078
_08086B28: .4byte gUnknown_2036E38
_08086B28: .4byte gMapObjects
_08086B2C: .4byte gUnknown_20386E0
thumb_func_end sub_8086AB4
@@ -7179,7 +7179,7 @@ sub_8086B30: @ 8086B30
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086BA0 @ =gUnknown_2036E38
ldr r1, _08086BA0 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@@ -7220,7 +7220,7 @@ _08086B96:
bx r0
.align 2, 0
_08086B9C: .4byte gUnknown_2037078
_08086BA0: .4byte gUnknown_2036E38
_08086BA0: .4byte gMapObjects
_08086BA4: .4byte sub_8086990
thumb_func_end sub_8086B30
@@ -7299,7 +7299,7 @@ sub_8086C24: @ 8086C24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086C6C @ =gUnknown_2036E38
ldr r1, _08086C6C @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -7325,7 +7325,7 @@ _08086C60:
bx r0
.align 2, 0
_08086C68: .4byte gUnknown_2037078
_08086C6C: .4byte gUnknown_2036E38
_08086C6C: .4byte gMapObjects
thumb_func_end sub_8086C24
thumb_func_start sub_8086C70
@@ -7337,7 +7337,7 @@ sub_8086C70: @ 8086C70
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086CA0 @ =gUnknown_2036E38
ldr r1, _08086CA0 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@@ -7353,7 +7353,7 @@ sub_8086C70: @ 8086C70
b _08086CAE
.align 2, 0
_08086C9C: .4byte gUnknown_2037078
_08086CA0: .4byte gUnknown_2036E38
_08086CA0: .4byte gMapObjects
_08086CA4:
movs r0, 0x8
ands r0, r1
@@ -7403,7 +7403,7 @@ sub_8086CF4: @ 8086CF4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086D30 @ =gUnknown_2036E38
ldr r1, _08086D30 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
@@ -7424,7 +7424,7 @@ _08086D26:
bx r0
.align 2, 0
_08086D2C: .4byte gUnknown_2037078
_08086D30: .4byte gUnknown_2036E38
_08086D30: .4byte gMapObjects
_08086D34: .4byte sub_8086BD0
thumb_func_end sub_8086CF4
@@ -7596,7 +7596,7 @@ sub_8086E70: @ 8086E70
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086EC4 @ =gUnknown_2036E38
ldr r1, _08086EC4 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -7627,7 +7627,7 @@ _08086EB8:
bx r0
.align 2, 0
_08086EC0: .4byte gUnknown_2037078
_08086EC4: .4byte gUnknown_2036E38
_08086EC4: .4byte gMapObjects
thumb_func_end sub_8086E70
thumb_func_start sub_8086EC8
@@ -7639,7 +7639,7 @@ sub_8086EC8: @ 8086EC8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086F04 @ =gUnknown_2036E38
ldr r1, _08086F04 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
@@ -7660,7 +7660,7 @@ _08086EF8:
bx r0
.align 2, 0
_08086F00: .4byte gUnknown_2037078
_08086F04: .4byte gUnknown_2036E38
_08086F04: .4byte gMapObjects
_08086F08: .4byte gUnknown_20386E0
thumb_func_end sub_8086EC8
@@ -7678,7 +7678,7 @@ sub_8086F0C: @ 8086F0C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086F60 @ =gUnknown_2036E38
ldr r1, _08086F60 @ =gMapObjects
adds r5, r0, r1
ldrh r1, [r4, 0x26]
movs r0, 0x8
@@ -7705,7 +7705,7 @@ _08086F54:
bx r0
.align 2, 0
_08086F5C: .4byte gUnknown_2037078
_08086F60: .4byte gUnknown_2036E38
_08086F60: .4byte gMapObjects
thumb_func_end sub_8086F0C
thumb_func_start sub_8086F64
@@ -7729,7 +7729,7 @@ sub_8086F64: @ 8086F64
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086FA4 @ =gUnknown_2036E38
ldr r1, _08086FA4 @ =gMapObjects
adds r0, r1
movs r1, 0x2
bl sub_8063CA4
@@ -7739,7 +7739,7 @@ _08086F98:
bx r0
.align 2, 0
_08086FA0: .4byte gUnknown_2037078
_08086FA4: .4byte gUnknown_2036E38
_08086FA4: .4byte gMapObjects
thumb_func_end sub_8086F64
thumb_func_start sub_8086FA8
@@ -7751,7 +7751,7 @@ sub_8086FA8: @ 8086FA8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086FF8 @ =gUnknown_2036E38
ldr r1, _08086FF8 @ =gMapObjects
adds r2, r0, r1
ldrh r1, [r4, 0xC]
movs r3, 0xC
@@ -7782,7 +7782,7 @@ _08086FEC:
bx r0
.align 2, 0
_08086FF4: .4byte gUnknown_2037078
_08086FF8: .4byte gUnknown_2036E38
_08086FF8: .4byte gMapObjects
thumb_func_end sub_8086FA8
thumb_func_start sub_8086FFC
@@ -7801,7 +7801,7 @@ sub_8086FFC: @ 8086FFC
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08087064 @ =gUnknown_2036E38
ldr r0, _08087064 @ =gMapObjects
adds r4, r0
movs r0, 0x2
bl sub_805C808
@@ -7836,7 +7836,7 @@ _0808705A:
bx r0
.align 2, 0
_08087060: .4byte gUnknown_2037078
_08087064: .4byte gUnknown_2036E38
_08087064: .4byte gMapObjects
_08087068: .4byte gSprites
thumb_func_end sub_8086FFC
@@ -7856,7 +7856,7 @@ sub_808706C: @ 808706C
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08087108 @ =gUnknown_2036E38
ldr r0, _08087108 @ =gMapObjects
adds r4, r0
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimActive
@@ -7915,7 +7915,7 @@ _080870FC:
bx r0
.align 2, 0
_08087104: .4byte gUnknown_2037078
_08087108: .4byte gUnknown_2036E38
_08087108: .4byte gMapObjects
_0808710C: .4byte gSprites
_08087110: .4byte gSaveBlock2Ptr
_08087114: .4byte sub_8087828
@@ -8430,7 +8430,7 @@ sub_80874C8: @ 80874C8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080875B8 @ =gUnknown_2036E38
ldr r1, _080875B8 @ =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -8532,7 +8532,7 @@ _080875AE:
bx r0
.align 2, 0
_080875B4: .4byte gUnknown_2037078
_080875B8: .4byte gUnknown_2036E38
_080875B8: .4byte gMapObjects
_080875BC: .4byte gSprites
_080875C0: .4byte gSaveBlock2Ptr
_080875C4: .4byte sub_8087828
@@ -8566,7 +8566,7 @@ _080875F2:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08087640 @ =gUnknown_2036E38
ldr r1, _08087640 @ =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
@@ -8598,7 +8598,7 @@ _08087630:
.align 2, 0
_08087638: .4byte gSprites
_0808763C: .4byte gUnknown_2037078
_08087640: .4byte gUnknown_2036E38
_08087640: .4byte gMapObjects
thumb_func_end sub_80875C8
thumb_func_start sub_8087644
@@ -8658,7 +8658,7 @@ sub_8087698: @ 8087698
lsls r5, r0, 3
adds r5, r0
lsls r5, 2
ldr r0, _08087708 @ =gUnknown_2036E38
ldr r0, _08087708 @ =gMapObjects
adds r5, r0
ldrb r0, [r5, 0x4]
lsls r4, r0, 4
@@ -8698,7 +8698,7 @@ _080876FC:
bx r0
.align 2, 0
_08087704: .4byte gUnknown_2037078
_08087708: .4byte gUnknown_2036E38
_08087708: .4byte gMapObjects
_0808770C: .4byte gSprites
thumb_func_end sub_8087698
@@ -8711,7 +8711,7 @@ sub_8087710: @ 8087710
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08087744 @ =gUnknown_2036E38
ldr r1, _08087744 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
@@ -8728,7 +8728,7 @@ _08087738:
bx r0
.align 2, 0
_08087740: .4byte gUnknown_2037078
_08087744: .4byte gUnknown_2036E38
_08087744: .4byte gMapObjects
thumb_func_end sub_8087710
thumb_func_start sub_8087748
@@ -8776,7 +8776,7 @@ fishE: @ 8087780
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080877F4 @ =gUnknown_2036E38
ldr r1, _080877F4 @ =gMapObjects
adds r4, r0, r1
movs r7, 0
ldrh r1, [r5, 0x26]
@@ -8816,7 +8816,7 @@ _080877EA:
bx r0
.align 2, 0
_080877F0: .4byte gUnknown_2037078
_080877F4: .4byte gUnknown_2036E38
_080877F4: .4byte gMapObjects
_080877F8: .4byte sub_8087498
thumb_func_end fishE
@@ -8991,7 +8991,7 @@ sub_8087924: @ 8087924
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080879C8 @ =gUnknown_2036E38
ldr r0, _080879C8 @ =gMapObjects
adds r4, r0
movs r0, 0x10
ldrsh r5, [r4, r0]
@@ -9055,7 +9055,7 @@ _080879BA:
bx r1
.align 2, 0
_080879C4: .4byte gUnknown_20386E0
_080879C8: .4byte gUnknown_2036E38
_080879C8: .4byte gMapObjects
_080879CC: .4byte sub_80879D8
_080879D0: .4byte gTasks
_080879D4: .4byte gSprites
@@ -9148,7 +9148,7 @@ _08087A78:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08087AB0 @ =gUnknown_2036E38
ldr r0, _08087AB0 @ =gMapObjects
adds r4, r0
ldrh r0, [r5, 0x4]
strh r0, [r6, 0x20]
@@ -9169,7 +9169,7 @@ _08087AA8:
pop {r0}
bx r0
.align 2, 0
_08087AB0: .4byte gUnknown_2036E38
_08087AB0: .4byte gMapObjects
thumb_func_end sub_80879D8
thumb_func_start sub_8087AB4
@@ -9381,7 +9381,7 @@ sub_8087C2C: @ 8087C2C
asrs r0, 16
cmp r0, 0x78
ble _08087C9A
ldr r2, _08087CA4 @ =gUnknown_2036E38
ldr r2, _08087CA4 @ =gMapObjects
movs r1, 0x4
ldrsh r0, [r7, r1]
lsls r1, r0, 3
@@ -9427,7 +9427,7 @@ _08087C9A:
pop {r0}
bx r0
.align 2, 0
_08087CA4: .4byte gUnknown_2036E38
_08087CA4: .4byte gMapObjects
_08087CA8: .4byte gSprites
_08087CAC: .4byte 0x0000ffff
_08087CB0: .4byte 0x00007fff
asm/field_effect_helpers.s
+40 -40
View File
@@ -253,7 +253,7 @@ sub_80DAF50: @ 80DAF50
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080DAF98 @ =gUnknown_2036E38
ldr r1, _080DAF98 @ =gMapObjects
adds r7, r0, r1
ldrb r1, [r7, 0x4]
lsls r0, r1, 4
@@ -281,7 +281,7 @@ _080DAF88:
strb r0, [r2]
b _080DB0AE
.align 2, 0
_080DAF98: .4byte gUnknown_2036E38
_080DAF98: .4byte gMapObjects
_080DAF9C: .4byte gSprites
_080DAFA0: .4byte 0x00020001
_080DAFA4:
@@ -587,7 +587,7 @@ oei_shadow: @ 80DB1DC
bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
ldr r2, _080DB26C @ =gUnknown_2036E38
ldr r2, _080DB26C @ =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -649,7 +649,7 @@ _080DB260:
bx r1
.align 2, 0
_080DB268: .4byte gUnknown_20386E0
_080DB26C: .4byte gUnknown_2036E38
_080DB26C: .4byte gMapObjects
_080DB270: .4byte gUnknown_83A0010
_080DB274: .4byte gUnknown_83FECD2
_080DB278: .4byte gSprites
@@ -685,7 +685,7 @@ _080DB2AE:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080DB33C @ =gUnknown_2036E38
ldr r1, _080DB33C @ =gMapObjects
adds r4, r0, r1
ldrb r0, [r4, 0x4]
lsls r1, r0, 4
@@ -748,7 +748,7 @@ _080DB334:
pop {r0}
bx r0
.align 2, 0
_080DB33C: .4byte gUnknown_2036E38
_080DB33C: .4byte gMapObjects
_080DB340: .4byte gSprites
_080DB344: .4byte 0x00400001
thumb_func_end oamc_shadow
@@ -929,7 +929,7 @@ _080DB4A0:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080DB4F0 @ =gUnknown_2036E38
ldr r1, _080DB4F0 @ =gMapObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -966,7 +966,7 @@ _080DB4E4:
pop {r0}
bx r0
.align 2, 0
_080DB4F0: .4byte gUnknown_2036E38
_080DB4F0: .4byte gMapObjects
thumb_func_end unc_grass_normal
thumb_func_start FldEff_JumpTallGrass
@@ -1280,7 +1280,7 @@ _080DB750:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080DB794 @ =gUnknown_2036E38
ldr r1, _080DB794 @ =gMapObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -1309,7 +1309,7 @@ _080DB786:
pop {r0}
bx r0
.align 2, 0
_080DB794: .4byte gUnknown_2036E38
_080DB794: .4byte gMapObjects
thumb_func_end unc_grass_tall
thumb_func_start FldEff_JumpLongGrass
@@ -1382,7 +1382,7 @@ sub_80DB808: @ 80DB808
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080DB8A0 @ =gUnknown_2036E38
ldr r0, _080DB8A0 @ =gMapObjects
adds r5, r1, r0
ldr r0, _080DB8A4 @ =gUnknown_83A0010
ldr r0, [r0, 0x78]
@@ -1446,7 +1446,7 @@ _080DB894:
bx r1
.align 2, 0
_080DB89C: .4byte gUnknown_20386E0
_080DB8A0: .4byte gUnknown_2036E38
_080DB8A0: .4byte gMapObjects
_080DB8A4: .4byte gUnknown_83A0010
_080DB8A8: .4byte gSprites
thumb_func_end sub_80DB808
@@ -1472,7 +1472,7 @@ sub_80DB8AC: @ 80DB8AC
lsls r0, 24
cmp r0, 0
bne _080DB8EA
ldr r5, _080DB8F4 @ =gUnknown_2036E38
ldr r5, _080DB8F4 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1489,7 +1489,7 @@ _080DB8EA:
bl FieldEffectStop
b _080DB98E
.align 2, 0
_080DB8F4: .4byte gUnknown_2036E38
_080DB8F4: .4byte gMapObjects
_080DB8F8:
ldrb r0, [r1, 0x5]
bl GetFieldObjectGraphicsInfo
@@ -1839,7 +1839,7 @@ FldEff_Splash: @ 80DBB88
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080DBC20 @ =gUnknown_2036E38
ldr r0, _080DBC20 @ =gMapObjects
adds r5, r1, r0
ldr r0, _080DBC24 @ =gUnknown_83A0010
ldr r0, [r0, 0x34]
@@ -1900,7 +1900,7 @@ _080DBC12:
bx r1
.align 2, 0
_080DBC1C: .4byte gUnknown_20386E0
_080DBC20: .4byte gUnknown_2036E38
_080DBC20: .4byte gMapObjects
_080DBC24: .4byte gUnknown_83A0010
_080DBC28: .4byte gSprites
thumb_func_end FldEff_Splash
@@ -1937,7 +1937,7 @@ _080DBC5C:
b _080DBCA6
_080DBC66:
ldr r3, _080DBCB0 @ =gSprites
ldr r2, _080DBCB4 @ =gUnknown_2036E38
ldr r2, _080DBCB4 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1974,7 +1974,7 @@ _080DBCA6:
bx r0
.align 2, 0
_080DBCB0: .4byte gSprites
_080DBCB4: .4byte gUnknown_2036E38
_080DBCB4: .4byte gMapObjects
thumb_func_end sub_80DBC2C
thumb_func_start FldEff_JumpSmallSplash
@@ -2104,7 +2104,7 @@ FldEff_FeetInFlowingWater: @ 80DBD98
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080DBE3C @ =gUnknown_2036E38
ldr r0, _080DBE3C @ =gMapObjects
adds r6, r1, r0
ldr r0, _080DBE40 @ =gUnknown_83A0010
ldr r0, [r0, 0x34]
@@ -2171,7 +2171,7 @@ _080DBE2E:
bx r1
.align 2, 0
_080DBE38: .4byte gUnknown_20386E0
_080DBE3C: .4byte gUnknown_2036E38
_080DBE3C: .4byte gMapObjects
_080DBE40: .4byte gUnknown_83A0010
_080DBE44: .4byte gSprites
_080DBE48: .4byte sub_80DBE50
@@ -2197,7 +2197,7 @@ sub_80DBE50: @ 80DBE50
lsls r0, 24
cmp r0, 0
bne _080DBE8A
ldr r2, _080DBE94 @ =gUnknown_2036E38
ldr r2, _080DBE94 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2214,7 +2214,7 @@ _080DBE8A:
bl FieldEffectStop
b _080DBEE2
.align 2, 0
_080DBE94: .4byte gUnknown_2036E38
_080DBE94: .4byte gMapObjects
_080DBE98:
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
@@ -2323,7 +2323,7 @@ sub_80DBF50: @ 80DBF50
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080DBFE8 @ =gUnknown_2036E38
ldr r0, _080DBFE8 @ =gMapObjects
adds r5, r1, r0
ldr r0, _080DBFEC @ =gUnknown_83A0010
ldr r0, [r0, 0x7C]
@@ -2387,7 +2387,7 @@ _080DBFDC:
bx r1
.align 2, 0
_080DBFE4: .4byte gUnknown_20386E0
_080DBFE8: .4byte gUnknown_2036E38
_080DBFE8: .4byte gMapObjects
_080DBFEC: .4byte gUnknown_83A0010
_080DBFF0: .4byte gSprites
thumb_func_end sub_80DBF50
@@ -2411,7 +2411,7 @@ sub_80DBFF4: @ 80DBFF4
lsls r0, 24
cmp r0, 0
bne _080DC02E
ldr r5, _080DC038 @ =gUnknown_2036E38
ldr r5, _080DC038 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2428,7 +2428,7 @@ _080DC02E:
bl FieldEffectStop
b _080DC080
.align 2, 0
_080DC038: .4byte gUnknown_2036E38
_080DC038: .4byte gMapObjects
_080DC03C:
ldrb r0, [r1, 0x5]
bl GetFieldObjectGraphicsInfo
@@ -2863,7 +2863,7 @@ sub_80DC348: @ 80DC348
movs r2, 0x32
ldrsh r1, [r4, r2]
bl CurrentMapDrawMetatileAt
ldr r2, _080DC3A0 @ =gUnknown_2036E38
ldr r2, _080DC3A0 @ =gMapObjects
ldr r0, _080DC3A4 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2880,7 +2880,7 @@ sub_80DC348: @ 80DC348
pop {r0}
bx r0
.align 2, 0
_080DC3A0: .4byte gUnknown_2036E38
_080DC3A0: .4byte gMapObjects
_080DC3A4: .4byte gUnknown_2037078
thumb_func_end sub_80DC348
@@ -3081,7 +3081,7 @@ sub_80DC4F8: @ 80DC4F8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080DC548 @ =gUnknown_2036E38
ldr r0, _080DC548 @ =gMapObjects
adds r4, r0
ldrb r0, [r4, 0x4]
lsls r5, r0, 4
@@ -3112,7 +3112,7 @@ sub_80DC4F8: @ 80DC4F8
pop {r0}
bx r0
.align 2, 0
_080DC548: .4byte gUnknown_2036E38
_080DC548: .4byte gMapObjects
_080DC54C: .4byte gSprites
thumb_func_end sub_80DC4F8
@@ -3454,7 +3454,7 @@ FldEff_SandPile: @ 80DC7B0
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080DC860 @ =gUnknown_2036E38
ldr r0, _080DC860 @ =gMapObjects
adds r6, r1, r0
ldr r0, _080DC864 @ =gUnknown_83A0010
ldr r0, [r0, 0x74]
@@ -3528,7 +3528,7 @@ _080DC854:
bx r1
.align 2, 0
_080DC85C: .4byte gUnknown_20386E0
_080DC860: .4byte gUnknown_2036E38
_080DC860: .4byte gMapObjects
_080DC864: .4byte gUnknown_83A0010
_080DC868: .4byte gSprites
thumb_func_end FldEff_SandPile
@@ -3552,7 +3552,7 @@ sub_80DC86C: @ 80DC86C
lsls r0, 24
cmp r0, 0
bne _080DC8A6
ldr r2, _080DC8B0 @ =gUnknown_2036E38
ldr r2, _080DC8B0 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3569,7 +3569,7 @@ _080DC8A6:
bl FieldEffectStop
b _080DC926
.align 2, 0
_080DC8B0: .4byte gUnknown_2036E38
_080DC8B0: .4byte gMapObjects
_080DC8B4:
ldr r2, _080DC930 @ =gSprites
ldrb r1, [r1, 0x4]
@@ -3608,7 +3608,7 @@ _080DC8F6:
strh r6, [r4, 0x20]
strh r5, [r4, 0x22]
ldr r3, _080DC930 @ =gSprites
ldr r2, _080DC934 @ =gUnknown_2036E38
ldr r2, _080DC934 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3635,7 +3635,7 @@ _080DC926:
bx r0
.align 2, 0
_080DC930: .4byte gSprites
_080DC934: .4byte gUnknown_2036E38
_080DC934: .4byte gMapObjects
thumb_func_end sub_80DC86C
thumb_func_start FldEff_Bubbles
@@ -3882,7 +3882,7 @@ sub_80DCAC8: @ 80DCAC8
adds r0, r5, 0
bl FieldEffectStop
_080DCAF8:
ldr r4, _080DCBB0 @ =gUnknown_2036E38
ldr r4, _080DCBB0 @ =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3975,7 +3975,7 @@ _080DCBA8:
pop {r0}
bx r0
.align 2, 0
_080DCBB0: .4byte gUnknown_2036E38
_080DCBB0: .4byte gMapObjects
_080DCBB4: .4byte gSprites
thumb_func_end sub_80DCAC8
@@ -4217,7 +4217,7 @@ _080DCD5E:
lsls r0, r7, 3
adds r0, r7
lsls r0, 2
ldr r1, _080DCDF8 @ =gUnknown_2036E38
ldr r1, _080DCDF8 @ =gMapObjects
adds r4, r0, r1
ldrb r0, [r4]
lsls r0, 31
@@ -4291,7 +4291,7 @@ _080DCDD8:
strb r0, [r2]
b _080DCE0A
.align 2, 0
_080DCDF8: .4byte gUnknown_2036E38
_080DCDF8: .4byte gMapObjects
_080DCDFC: .4byte gSprites
_080DCE00:
adds r0, r7, 0x1
asm/field_fadetransition.s
+22 -22
View File
@@ -727,7 +727,7 @@ _0807E0AE:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E0E8 @ =gUnknown_2036E38
ldr r1, _0807E0E8 @ =gMapObjects
adds r0, r1
movs r1, 0x10
bl sub_8063CA4
@@ -735,7 +735,7 @@ _0807E0AE:
strh r0, [r4, 0x8]
b _0807E206
.align 2, 0
_0807E0E8: .4byte gUnknown_2036E38
_0807E0E8: .4byte gMapObjects
_0807E0EC:
ldrh r0, [r4, 0x24]
adds r0, 0x1
@@ -781,13 +781,13 @@ _0807E10E:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E15C @ =gUnknown_2036E38
ldr r1, _0807E15C @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
b _0807E1F2
.align 2, 0
_0807E158: .4byte sub_807F204
_0807E15C: .4byte gUnknown_2036E38
_0807E15C: .4byte gMapObjects
_0807E160:
bl sub_807E418
cmp r0, 0
@@ -804,7 +804,7 @@ _0807E160:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E194 @ =gUnknown_2036E38
ldr r1, _0807E194 @ =gMapObjects
adds r0, r1
movs r1, 0x10
bl sub_8063CA4
@@ -812,7 +812,7 @@ _0807E160:
strh r0, [r4, 0x8]
b _0807E206
.align 2, 0
_0807E194: .4byte gUnknown_2036E38
_0807E194: .4byte gMapObjects
_0807E198:
bl walkrun_is_standing_still
lsls r0, 24
@@ -836,14 +836,14 @@ _0807E198:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E1D8 @ =gUnknown_2036E38
ldr r1, _0807E1D8 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
movs r0, 0x3
strh r0, [r4, 0x8]
b _0807E206
.align 2, 0
_0807E1D8: .4byte gUnknown_2036E38
_0807E1D8: .4byte gMapObjects
_0807E1DC:
movs r1, 0xA
ldrsh r0, [r4, r1]
@@ -927,7 +927,7 @@ _0807E25E:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0807E2A4 @ =gUnknown_2036E38
ldr r0, _0807E2A4 @ =gMapObjects
adds r4, r0
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -942,7 +942,7 @@ _0807E25E:
strh r0, [r5, 0x8]
b _0807E2C6
.align 2, 0
_0807E2A4: .4byte gUnknown_2036E38
_0807E2A4: .4byte gMapObjects
_0807E2A8:
bl walkrun_is_standing_still
lsls r0, 24
@@ -1729,7 +1729,7 @@ _0807E8AE:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r4, _0807E8F0 @ =gUnknown_2036E38
ldr r4, _0807E8F0 @ =gMapObjects
adds r0, r4
bl FieldObjectClearAnimIfSpecialAnimActive
movs r0, 0xFF
@@ -1749,7 +1749,7 @@ _0807E8AE:
strh r0, [r5, 0x8]
b _0807E976
.align 2, 0
_0807E8F0: .4byte gUnknown_2036E38
_0807E8F0: .4byte gMapObjects
_0807E8F4:
bl walkrun_is_standing_still
lsls r0, 24
@@ -1774,7 +1774,7 @@ _0807E8F4:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E93C @ =gUnknown_2036E38
ldr r1, _0807E93C @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
movs r0, 0
@@ -1783,7 +1783,7 @@ _0807E8F4:
strh r0, [r5, 0x8]
b _0807E976
.align 2, 0
_0807E93C: .4byte gUnknown_2036E38
_0807E93C: .4byte gMapObjects
_0807E940:
movs r1, 0xA
ldrsh r0, [r5, r1]
@@ -1836,7 +1836,7 @@ sub_807E980: @ 807E980
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807E9C8 @ =gUnknown_2036E38
ldr r1, _0807E9C8 @ =gMapObjects
adds r6, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -1856,7 +1856,7 @@ sub_807E980: @ 807E980
.align 2, 0
_0807E9C0: .4byte gTasks+0x8
_0807E9C4: .4byte gUnknown_2037078
_0807E9C8: .4byte gUnknown_2036E38
_0807E9C8: .4byte gMapObjects
_0807E9CC: .4byte gSprites
_0807E9D0:
cmp r0, 0x2
@@ -1995,7 +1995,7 @@ sub_807EAC4: @ 807EAC4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, _0807EB60 @ =gUnknown_2036E38
ldr r2, _0807EB60 @ =gMapObjects
adds r0, r2
mov r8, r0
lsls r1, 16
@@ -2051,7 +2051,7 @@ _0807EB4C:
.align 2, 0
_0807EB58: .4byte gUnknown_2037078
_0807EB5C: .4byte gSprites
_0807EB60: .4byte gUnknown_2036E38
_0807EB60: .4byte gMapObjects
thumb_func_end sub_807EAC4
thumb_func_start sub_807EB64
@@ -2069,7 +2069,7 @@ sub_807EB64: @ 807EB64
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0807EBB8 @ =gUnknown_2036E38
ldr r0, _0807EBB8 @ =gMapObjects
adds r4, r0
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -2093,7 +2093,7 @@ sub_807EB64: @ 807EB64
bx r0
.align 2, 0
_0807EBB4: .4byte gUnknown_2037078
_0807EBB8: .4byte gUnknown_2036E38
_0807EBB8: .4byte gMapObjects
thumb_func_end sub_807EB64
thumb_func_start sub_807EBBC
@@ -2272,7 +2272,7 @@ _0807ED0C:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0807ED98 @ =gUnknown_2036E38
ldr r0, _0807ED98 @ =gMapObjects
adds r4, r0
adds r0, r1, 0
bl sub_8064270
@@ -2333,7 +2333,7 @@ _0807ED0C:
bx r0
.align 2, 0
_0807ED94: .4byte gUnknown_2037078
_0807ED98: .4byte gUnknown_2036E38
_0807ED98: .4byte gMapObjects
_0807ED9C: .4byte gSprites
thumb_func_end sub_807ECBC
asm/field_map_obj.s
+198 -198
View File
File diff suppressed because it is too large Load Diff
asm/field_player_avatar.s
+92 -92
View File
@@ -14,14 +14,14 @@ sub_805B3B8: @ 805B3B8
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, _0805B3D4 @ =gUnknown_2036E38
ldr r2, _0805B3D4 @ =gMapObjects
adds r0, r2
ldr r2, _0805B3D8 @ =sub_805B3DC
bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
_0805B3D4: .4byte gUnknown_2036E38
_0805B3D4: .4byte gMapObjects
_0805B3D8: .4byte sub_805B3DC
thumb_func_end sub_805B3B8
@@ -48,7 +48,7 @@ sub_805B3E0: @ 805B3E0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805B458 @ =gUnknown_2036E38
ldr r1, _0805B458 @ =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl sub_805CC40
@@ -85,7 +85,7 @@ _0805B448:
bx r0
.align 2, 0
_0805B454: .4byte gUnknown_2037078
_0805B458: .4byte gUnknown_2036E38
_0805B458: .4byte gMapObjects
thumb_func_end sub_805B3E0
thumb_func_start sub_805B45C
@@ -222,7 +222,7 @@ sub_805B528: @ 805B528
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805B594 @ =gUnknown_2036E38
ldr r1, _0805B594 @ =gMapObjects
adds r1, r0, r1
str r1, [r4]
ldrb r0, [r1]
@@ -254,7 +254,7 @@ _0805B586:
.align 2, 0
_0805B58C: .4byte gUnknown_2037078
_0805B590: .4byte gUnknown_2036E30
_0805B594: .4byte gUnknown_2036E38
_0805B594: .4byte gMapObjects
_0805B598:
movs r0, 0
_0805B59A:
@@ -273,7 +273,7 @@ sub_805B5A0: @ 805B5A0
ands r0, r1
cmp r0, 0
bne _0805B610
ldr r2, _0805B5F8 @ =gUnknown_2036E38
ldr r2, _0805B5F8 @ =gMapObjects
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -308,7 +308,7 @@ _0805B5CC:
b _0805B628
.align 2, 0
_0805B5F4: .4byte gUnknown_2037078
_0805B5F8: .4byte gUnknown_2036E38
_0805B5F8: .4byte gMapObjects
_0805B5FC: .4byte gUnknown_835B764
_0805B600:
ldr r0, _0805B60C @ =gUnknown_2037078
@@ -362,7 +362,7 @@ ForcedMovement_None: @ 805B644
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805B68C @ =gUnknown_2036E38
ldr r1, _0805B68C @ =gMapObjects
adds r0, r1
ldrb r2, [r0, 0x1]
movs r1, 0x3
@@ -386,7 +386,7 @@ _0805B67E:
bx r1
.align 2, 0
_0805B688: .4byte gUnknown_2037078
_0805B68C: .4byte gUnknown_2036E38
_0805B68C: .4byte gMapObjects
thumb_func_end ForcedMovement_None
thumb_func_start DoForcedMovement
@@ -461,7 +461,7 @@ DoForcedMovementInCurrentDirection: @ 805B708
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, _0805B738 @ =gUnknown_2036E38
ldr r2, _0805B738 @ =gMapObjects
adds r0, r2
ldrb r2, [r0, 0x1]
movs r3, 0x4
@@ -476,7 +476,7 @@ DoForcedMovementInCurrentDirection: @ 805B708
bx r1
.align 2, 0
_0805B734: .4byte gUnknown_2037078
_0805B738: .4byte gUnknown_2036E38
_0805B738: .4byte gMapObjects
thumb_func_end DoForcedMovementInCurrentDirection
thumb_func_start ForcedMovement_Slip
@@ -683,7 +683,7 @@ ForcedMovement_Slide: @ 805B88C
lsls r2, r3, 3
adds r2, r3
lsls r2, 2
ldr r3, _0805B8C0 @ =gUnknown_2036E38
ldr r3, _0805B8C0 @ =gMapObjects
adds r2, r3
ldrb r3, [r2, 0x1]
movs r4, 0x4
@@ -699,7 +699,7 @@ ForcedMovement_Slide: @ 805B88C
bx r1
.align 2, 0
_0805B8BC: .4byte gUnknown_2037078
_0805B8C0: .4byte gUnknown_2036E38
_0805B8C0: .4byte gMapObjects
thumb_func_end ForcedMovement_Slide
thumb_func_start ForcedMovement_SlideSouth
@@ -919,7 +919,7 @@ _0805BA30:
lsls r0, 24
cmp r0, 0
beq _0805BA8C
ldr r2, _0805BA70 @ =gUnknown_2036E38
ldr r2, _0805BA70 @ =gMapObjects
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -938,7 +938,7 @@ _0805BA30:
b _0805BA7A
.align 2, 0
_0805BA6C: .4byte 0x0000082f
_0805BA70: .4byte gUnknown_2036E38
_0805BA70: .4byte gMapObjects
_0805BA74:
adds r0, r4, 0
bl sub_805C17C
@@ -979,7 +979,7 @@ sub_805BAAC: @ 805BAAC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805BAE8 @ =gUnknown_2036E38
ldr r1, _0805BAE8 @ =gMapObjects
adds r0, r1
ldrh r2, [r0, 0x10]
mov r1, sp
@@ -1000,7 +1000,7 @@ sub_805BAAC: @ 805BAAC
b _0805BB00
.align 2, 0
_0805BAE4: .4byte gUnknown_2037078
_0805BAE8: .4byte gUnknown_2036E38
_0805BAE8: .4byte gMapObjects
_0805BAEC:
movs r0, 0x1
mov r1, sp
@@ -1039,7 +1039,7 @@ sub_805BB1C: @ 805BB1C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805BB98 @ =gUnknown_2036E38
ldr r1, _0805BB98 @ =gMapObjects
adds r5, r0, r1
ldrh r1, [r5, 0x10]
add r0, sp, 0x4
@@ -1086,7 +1086,7 @@ sub_805BB1C: @ 805BB1C
b _0805BB9E
.align 2, 0
_0805BB94: .4byte gUnknown_2037078
_0805BB98: .4byte gUnknown_2036E38
_0805BB98: .4byte gMapObjects
_0805BB9C:
movs r0, 0x8
_0805BB9E:
@@ -1291,7 +1291,7 @@ sub_805BCEC: @ 805BCEC
lsrs r6, r0, 24
cmp r6, 0x10
beq _0805BDA0
ldr r0, _0805BD9C @ =gUnknown_2036E38
ldr r0, _0805BD9C @ =gMapObjects
lsls r1, r6, 3
adds r1, r6
lsls r1, 2
@@ -1347,7 +1347,7 @@ _0805BD8A:
b _0805BDA2
.align 2, 0
_0805BD98: .4byte 0x00000805
_0805BD9C: .4byte gUnknown_2036E38
_0805BD9C: .4byte gMapObjects
_0805BDA0:
movs r0, 0
_0805BDA2:
@@ -1431,7 +1431,7 @@ _0805BE14:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805BE58 @ =gUnknown_2036E38
ldr r1, _0805BE58 @ =gMapObjects
adds r0, r1
ldr r1, [r2]
bl _call_via_r1
@@ -1452,7 +1452,7 @@ _0805BE48:
.align 2, 0
_0805BE50: .4byte gUnknown_2037078
_0805BE54: .4byte gUnknown_835B844
_0805BE58: .4byte gUnknown_2036E38
_0805BE58: .4byte gMapObjects
thumb_func_end DoPlayerAvatarTransition
thumb_func_start nullsub_22
@@ -1552,7 +1552,7 @@ _0805BEF6:
thumb_func_start player_is_anim_in_certain_ranges
player_is_anim_in_certain_ranges: @ 805BEFC
push {lr}
ldr r2, _0805BF48 @ =gUnknown_2036E38
ldr r2, _0805BF48 @ =gMapObjects
ldr r0, _0805BF4C @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -1590,7 +1590,7 @@ _0805BF42:
movs r0, 0x1
b _0805BF52
.align 2, 0
_0805BF48: .4byte gUnknown_2036E38
_0805BF48: .4byte gMapObjects
_0805BF4C: .4byte gUnknown_2037078
_0805BF50:
movs r0, 0
@@ -1629,7 +1629,7 @@ PlayerIsAnimActive: @ 805BF7C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805BF9C @ =gUnknown_2036E38
ldr r1, _0805BF9C @ =gMapObjects
adds r0, r1
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
@@ -1638,7 +1638,7 @@ PlayerIsAnimActive: @ 805BF7C
bx r1
.align 2, 0
_0805BF98: .4byte gUnknown_2037078
_0805BF9C: .4byte gUnknown_2036E38
_0805BF9C: .4byte gMapObjects
thumb_func_end PlayerIsAnimActive
thumb_func_start PlayerCheckIfAnimFinishedOrInactive
@@ -1649,7 +1649,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805BFC0 @ =gUnknown_2036E38
ldr r1, _0805BFC0 @ =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@@ -1658,12 +1658,12 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0
bx r1
.align 2, 0
_0805BFBC: .4byte gUnknown_2037078
_0805BFC0: .4byte gUnknown_2036E38
_0805BFC0: .4byte gMapObjects
thumb_func_end PlayerCheckIfAnimFinishedOrInactive
thumb_func_start player_set_x22
player_set_x22: @ 805BFC4
ldr r3, _0805BFD8 @ =gUnknown_2036E38
ldr r3, _0805BFD8 @ =gMapObjects
ldr r1, _0805BFDC @ =gUnknown_2037078
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
@@ -1674,13 +1674,13 @@ player_set_x22: @ 805BFC4
strb r0, [r1]
bx lr
.align 2, 0
_0805BFD8: .4byte gUnknown_2036E38
_0805BFD8: .4byte gMapObjects
_0805BFDC: .4byte gUnknown_2037078
thumb_func_end player_set_x22
thumb_func_start player_get_x22
player_get_x22: @ 805BFE0
ldr r2, _0805BFF4 @ =gUnknown_2036E38
ldr r2, _0805BFF4 @ =gMapObjects
ldr r0, _0805BFF8 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -1691,7 +1691,7 @@ player_get_x22: @ 805BFE0
ldrb r0, [r0]
bx lr
.align 2, 0
_0805BFF4: .4byte gUnknown_2036E38
_0805BFF4: .4byte gMapObjects
_0805BFF8: .4byte gUnknown_2037078
thumb_func_end player_get_x22
@@ -1706,14 +1706,14 @@ sub_805BFFC: @ 805BFFC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, _0805C020 @ =gUnknown_2036E38
ldr r2, _0805C020 @ =gMapObjects
adds r0, r2
bl FieldObjectForceSetSpecialAnim
pop {r0}
bx r0
.align 2, 0
_0805C01C: .4byte gUnknown_2037078
_0805C020: .4byte gUnknown_2036E38
_0805C020: .4byte gMapObjects
thumb_func_end sub_805BFFC
thumb_func_start sub_805C024
@@ -1734,7 +1734,7 @@ sub_805C024: @ 805C024
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805C068 @ =gUnknown_2036E38
ldr r1, _0805C068 @ =gMapObjects
adds r0, r1
adds r1, r5, 0
bl sub_8063CA4
@@ -1749,7 +1749,7 @@ _0805C05E:
bx r0
.align 2, 0
_0805C064: .4byte gUnknown_2037078
_0805C068: .4byte gUnknown_2036E38
_0805C068: .4byte gMapObjects
thumb_func_end sub_805C024
thumb_func_start sub_805C06C
@@ -1762,7 +1762,7 @@ sub_805C06C: @ 805C06C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805C0A0 @ =gUnknown_2036E38
ldr r1, _0805C0A0 @ =gMapObjects
adds r0, r1
adds r1, r4, 0
bl sub_8063CA4
@@ -1778,7 +1778,7 @@ _0805C094:
bx r0
.align 2, 0
_0805C09C: .4byte gUnknown_2037078
_0805C0A0: .4byte gUnknown_2036E38
_0805C0A0: .4byte gMapObjects
thumb_func_end sub_805C06C
thumb_func_start sub_805C0A4
@@ -2056,7 +2056,7 @@ _0805C27E:
lsls r0, 24
cmp r0, 0
beq _0805C2A6
ldr r2, _0805C2B0 @ =gUnknown_2036E38
ldr r2, _0805C2B0 @ =gMapObjects
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2075,7 +2075,7 @@ _0805C2A6:
bx r0
.align 2, 0
_0805C2AC: .4byte gUnknown_2037078
_0805C2B0: .4byte gUnknown_2036E38
_0805C2B0: .4byte gMapObjects
thumb_func_end sub_805C270
thumb_func_start sub_805C2B4
@@ -2301,7 +2301,7 @@ sub_805C438: @ 805C438
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
ldr r2, _0805C4E8 @ =gUnknown_2036E38
ldr r2, _0805C4E8 @ =gMapObjects
ldr r0, _0805C4EC @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2378,7 +2378,7 @@ _0805C4DE:
pop {r0}
bx r0
.align 2, 0
_0805C4E8: .4byte gUnknown_2036E38
_0805C4E8: .4byte gMapObjects
_0805C4EC: .4byte gUnknown_2037078
_0805C4F0: .4byte gUnknown_835B864
thumb_func_end sub_805C438
@@ -2388,7 +2388,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r3, _0805C530 @ =gUnknown_2036E38
ldr r3, _0805C530 @ =gMapObjects
ldr r2, _0805C534 @ =gUnknown_2037078
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@@ -2414,14 +2414,14 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4
pop {r0}
bx r0
.align 2, 0
_0805C530: .4byte gUnknown_2036E38
_0805C530: .4byte gMapObjects
_0805C534: .4byte gUnknown_2037078
thumb_func_end GetXYCoordsOneStepInFrontOfPlayer
thumb_func_start PlayerGetDestCoords
PlayerGetDestCoords: @ 805C538
push {r4,r5,lr}
ldr r5, _0805C560 @ =gUnknown_2036E38
ldr r5, _0805C560 @ =gMapObjects
ldr r4, _0805C564 @ =gUnknown_2037078
ldrb r3, [r4, 0x5]
lsls r2, r3, 3
@@ -2441,7 +2441,7 @@ PlayerGetDestCoords: @ 805C538
pop {r0}
bx r0
.align 2, 0
_0805C560: .4byte gUnknown_2036E38
_0805C560: .4byte gMapObjects
_0805C564: .4byte gUnknown_2037078
thumb_func_end PlayerGetDestCoords
@@ -2455,7 +2455,7 @@ plaer_get_pos_including_state_based_drift: @ 805C568
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805C5C0 @ =gUnknown_2036E38
ldr r1, _0805C5C0 @ =gMapObjects
adds r3, r0, r1
ldrb r1, [r3]
movs r0, 0xC0
@@ -2493,7 +2493,7 @@ _0805C5B0:
mov pc, r0
.align 2, 0
_0805C5BC: .4byte gUnknown_2037078
_0805C5C0: .4byte gUnknown_2036E38
_0805C5C0: .4byte gMapObjects
_0805C5C4: .4byte gSprites
_0805C5C8: .4byte _0805C5CC
.align 2, 0
@@ -2584,7 +2584,7 @@ _0805C6BC:
thumb_func_start player_get_direction_lower_nybble
player_get_direction_lower_nybble: @ 805C6C4
ldr r2, _0805C6DC @ =gUnknown_2036E38
ldr r2, _0805C6DC @ =gMapObjects
ldr r0, _0805C6E0 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2596,13 +2596,13 @@ player_get_direction_lower_nybble: @ 805C6C4
lsrs r0, 28
bx lr
.align 2, 0
_0805C6DC: .4byte gUnknown_2036E38
_0805C6DC: .4byte gMapObjects
_0805C6E0: .4byte gUnknown_2037078
thumb_func_end player_get_direction_lower_nybble
thumb_func_start player_get_direction_upper_nybble
player_get_direction_upper_nybble: @ 805C6E4
ldr r2, _0805C6F8 @ =gUnknown_2036E38
ldr r2, _0805C6F8 @ =gMapObjects
ldr r0, _0805C6FC @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2613,13 +2613,13 @@ player_get_direction_upper_nybble: @ 805C6E4
lsrs r0, 4
bx lr
.align 2, 0
_0805C6F8: .4byte gUnknown_2036E38
_0805C6F8: .4byte gMapObjects
_0805C6FC: .4byte gUnknown_2037078
thumb_func_end player_get_direction_upper_nybble
thumb_func_start PlayerGetZCoord
PlayerGetZCoord: @ 805C700
ldr r2, _0805C714 @ =gUnknown_2036E38
ldr r2, _0805C714 @ =gMapObjects
ldr r0, _0805C718 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2630,7 +2630,7 @@ PlayerGetZCoord: @ 805C700
lsrs r0, 4
bx lr
.align 2, 0
_0805C714: .4byte gUnknown_2036E38
_0805C714: .4byte gMapObjects
_0805C718: .4byte gUnknown_2037078
thumb_func_end PlayerGetZCoord
@@ -2644,7 +2644,7 @@ sub_805C71C: @ 805C71C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805C748 @ =gUnknown_2036E38
ldr r1, _0805C748 @ =gMapObjects
adds r0, r1
lsls r3, 16
asrs r3, 16
@@ -2656,7 +2656,7 @@ sub_805C71C: @ 805C71C
bx r0
.align 2, 0
_0805C744: .4byte gUnknown_2037078
_0805C748: .4byte gUnknown_2036E38
_0805C748: .4byte gMapObjects
thumb_func_end sub_805C71C
thumb_func_start TestPlayerAvatarFlags
@@ -2704,7 +2704,7 @@ sub_805C780: @ 805C780
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805C7C4 @ =gUnknown_2036E38
ldr r0, _0805C7C4 @ =gMapObjects
adds r4, r0
adds r0, r4, 0
bl npc_clear_strange_bits
@@ -2727,7 +2727,7 @@ _0805C7B8:
bx r0
.align 2, 0
_0805C7C0: .4byte gUnknown_2037078
_0805C7C4: .4byte gUnknown_2036E38
_0805C7C4: .4byte gMapObjects
thumb_func_end sub_805C780
thumb_func_start sub_805C7C8
@@ -2882,7 +2882,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805C928 @ =gUnknown_2036E38
ldr r0, _0805C928 @ =gMapObjects
adds r4, r0
ldrh r1, [r4, 0x10]
mov r0, sp
@@ -2930,7 +2930,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0
b _0805C92E
.align 2, 0
_0805C924: .4byte gUnknown_2037078
_0805C928: .4byte gUnknown_2036E38
_0805C928: .4byte gMapObjects
_0805C92C:
movs r0, 0
_0805C92E:
@@ -3152,7 +3152,7 @@ InitPlayerAvatar: @ 805CA3C
lsls r4, r5, 3
adds r4, r5
lsls r4, 2
ldr r0, _0805CAFC @ =gUnknown_2036E38
ldr r0, _0805CAFC @ =gMapObjects
adds r4, r0
ldrb r0, [r4, 0x2]
movs r1, 0x1
@@ -3182,7 +3182,7 @@ InitPlayerAvatar: @ 805CA3C
pop {r0}
bx r0
.align 2, 0
_0805CAFC: .4byte gUnknown_2036E38
_0805CAFC: .4byte gMapObjects
_0805CB00: .4byte gUnknown_2037078
thumb_func_end InitPlayerAvatar
@@ -3191,7 +3191,7 @@ sub_805CB04: @ 805CB04
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r6, _0805CB64 @ =gUnknown_2036E38
ldr r6, _0805CB64 @ =gMapObjects
ldr r5, _0805CB68 @ =gUnknown_2037078
ldrb r0, [r5, 0x5]
lsls r1, r0, 3
@@ -3236,7 +3236,7 @@ _0805CB5C:
pop {r0}
bx r0
.align 2, 0
_0805CB64: .4byte gUnknown_2036E38
_0805CB64: .4byte gMapObjects
_0805CB68: .4byte gUnknown_2037078
_0805CB6C: .4byte gSprites
thumb_func_end sub_805CB04
@@ -3249,7 +3249,7 @@ sub_805CB70: @ 805CB70
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805CBB0 @ =gUnknown_2036E38
ldr r0, _0805CBB0 @ =gMapObjects
adds r4, r0
movs r0, 0x3
bl sub_805C808
@@ -3271,7 +3271,7 @@ sub_805CB70: @ 805CB70
bx r0
.align 2, 0
_0805CBAC: .4byte gUnknown_2037078
_0805CBB0: .4byte gUnknown_2036E38
_0805CBB0: .4byte gMapObjects
_0805CBB4: .4byte gSprites
thumb_func_end sub_805CB70
@@ -3311,7 +3311,7 @@ sub_805CBE8: @ 805CBE8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805CC24 @ =gUnknown_2036E38
ldr r0, _0805CC24 @ =gMapObjects
adds r4, r0
bl sub_805CBB8
adds r1, r0, 0
@@ -3332,7 +3332,7 @@ sub_805CBE8: @ 805CBE8
bx r0
.align 2, 0
_0805CC20: .4byte gUnknown_2037078
_0805CC24: .4byte gUnknown_2036E38
_0805CC24: .4byte gMapObjects
_0805CC28: .4byte gSprites
thumb_func_end sub_805CBE8
@@ -3468,7 +3468,7 @@ taskFF_bump_boulder: @ 805CD0C
lsrs r0, 24
ldr r6, _0805CD54 @ =gUnknown_835B8A0
ldr r2, _0805CD58 @ =gTasks
ldr r5, _0805CD5C @ =gUnknown_2036E38
ldr r5, _0805CD5C @ =gMapObjects
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -3502,7 +3502,7 @@ _0805CD20:
.align 2, 0
_0805CD54: .4byte gUnknown_835B8A0
_0805CD58: .4byte gTasks
_0805CD5C: .4byte gUnknown_2036E38
_0805CD5C: .4byte gMapObjects
_0805CD60: .4byte gUnknown_2037078
thumb_func_end taskFF_bump_boulder
@@ -3677,7 +3677,7 @@ _0805CEB2:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _0805CEE8 @ =gUnknown_2036E38
ldr r0, _0805CEE8 @ =gMapObjects
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@@ -3692,7 +3692,7 @@ _0805CEB2:
_0805CEDC: .4byte gUnknown_835B8AC
_0805CEE0: .4byte gTasks
_0805CEE4: .4byte gUnknown_2037078
_0805CEE8: .4byte gUnknown_2036E38
_0805CEE8: .4byte gMapObjects
thumb_func_end sub_805CEA0
thumb_func_start PlayerAvatar_DoSecretBaseMatJump
@@ -3785,7 +3785,7 @@ _0805CF8A:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _0805CFC0 @ =gUnknown_2036E38
ldr r0, _0805CFC0 @ =gMapObjects
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@@ -3800,7 +3800,7 @@ _0805CF8A:
_0805CFB4: .4byte gUnknown_835B8B0
_0805CFB8: .4byte gTasks
_0805CFBC: .4byte gUnknown_2037078
_0805CFC0: .4byte gUnknown_2036E38
_0805CFC0: .4byte gMapObjects
thumb_func_end sub_805CF78
thumb_func_start sub_805CFC4
@@ -4070,7 +4070,7 @@ taskFF_0805D1D4: @ 805D1D4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805D234 @ =gUnknown_2036E38
ldr r1, _0805D234 @ =gMapObjects
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -4106,7 +4106,7 @@ _0805D228:
bx r0
.align 2, 0
_0805D230: .4byte gUnknown_2037078
_0805D234: .4byte gUnknown_2036E38
_0805D234: .4byte gMapObjects
_0805D238: .4byte gTasks
_0805D23C: .4byte sub_805D240
thumb_func_end taskFF_0805D1D4
@@ -4121,7 +4121,7 @@ sub_805D240: @ 805D240
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805D2B8 @ =gUnknown_2036E38
ldr r1, _0805D2B8 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@@ -4164,7 +4164,7 @@ _0805D2AE:
bx r0
.align 2, 0
_0805D2B4: .4byte gUnknown_2037078
_0805D2B8: .4byte gUnknown_2036E38
_0805D2B8: .4byte gMapObjects
_0805D2BC: .4byte gSprites
thumb_func_end sub_805D240
@@ -4281,7 +4281,7 @@ fish1: @ 805D35C
ldrh r1, [r6]
adds r1, r0
strh r1, [r5, 0x22]
ldr r3, _0805D3EC @ =gUnknown_2036E38
ldr r3, _0805D3EC @ =gMapObjects
ldr r2, _0805D3F0 @ =gUnknown_2037078
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@@ -4316,7 +4316,7 @@ fish1: @ 805D35C
.align 2, 0
_0805D3E4: .4byte gUnknown_835B90C
_0805D3E8: .4byte gUnknown_835B912
_0805D3EC: .4byte gUnknown_2036E38
_0805D3EC: .4byte gMapObjects
_0805D3F0: .4byte gUnknown_2037078
thumb_func_end fish1
@@ -4727,7 +4727,7 @@ _0805D6EA:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805D77C @ =gUnknown_2036E38
ldr r0, _0805D77C @ =gMapObjects
mov r8, r0
add r4, r8
ldrh r1, [r5, 0x24]
@@ -4777,7 +4777,7 @@ _0805D748:
.align 2, 0
_0805D774: .4byte gUnknown_2037078
_0805D778: .4byte gSprites
_0805D77C: .4byte gUnknown_2036E38
_0805D77C: .4byte gMapObjects
_0805D780:
movs r1, 0xA
ldrsh r0, [r5, r1]
@@ -4971,7 +4971,7 @@ sub_805D8D8: @ 805D8D8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0805D97C @ =gUnknown_2036E38
ldr r0, _0805D97C @ =gMapObjects
mov r8, r0
add r4, r8
ldrh r1, [r6, 0x24]
@@ -5024,7 +5024,7 @@ _0805D968:
.align 2, 0
_0805D974: .4byte gUnknown_2037078
_0805D978: .4byte gSprites
_0805D97C: .4byte gUnknown_2036E38
_0805D97C: .4byte gMapObjects
thumb_func_end sub_805D8D8
thumb_func_start sub_805D980
@@ -5159,7 +5159,7 @@ _0805DA78:
ands r0, r1
cmp r0, 0
beq _0805DA9C
ldr r2, _0805DAAC @ =gUnknown_2036E38
ldr r2, _0805DAAC @ =gMapObjects
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5177,7 +5177,7 @@ _0805DA9C:
.align 2, 0
_0805DAA4: .4byte 0x0000fff8
_0805DAA8: .4byte gUnknown_2037078
_0805DAAC: .4byte gUnknown_2036E38
_0805DAAC: .4byte gMapObjects
thumb_func_end sub_805D9C4
thumb_func_start sub_805DAB0
@@ -5247,7 +5247,7 @@ sub_805DB04: @ 805DB04
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805DB4C @ =gUnknown_2036E38
ldr r1, _0805DB4C @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
@@ -5271,7 +5271,7 @@ sub_805DB04: @ 805DB04
b _0805DBFA
.align 2, 0
_0805DB48: .4byte gUnknown_2037078
_0805DB4C: .4byte gUnknown_2036E38
_0805DB4C: .4byte gMapObjects
_0805DB50: .4byte gSprites
_0805DB54: .4byte gTasks+0x8
_0805DB58:
@@ -5406,7 +5406,7 @@ sub_805DC38: @ 805DC38
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805DC84 @ =gUnknown_2036E38
ldr r1, _0805DC84 @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
@@ -5431,7 +5431,7 @@ sub_805DC38: @ 805DC38
b _0805DDBA
.align 2, 0
_0805DC80: .4byte gUnknown_2037078
_0805DC84: .4byte gUnknown_2036E38
_0805DC84: .4byte gMapObjects
_0805DC88: .4byte gSprites
_0805DC8C: .4byte gTasks+0x8
_0805DC90:
asm/field_poison.s
+3 -3
View File
@@ -74,11 +74,11 @@ MonFaintFromPoisonOnField: @ 80A04B8
str r0, [sp]
adds r0, r4, 0
movs r1, 0x8
bl sub_80436F8
bl AdjustFriendship
adds r0, r4, 0
movs r1, 0x37
mov r2, sp
bl sub_804037C
bl SetMonData
ldr r5, _080A0500 @ =gStringVar1
adds r0, r4, 0
movs r1, 0x2
@@ -279,7 +279,7 @@ _080A065C:
adds r0, r4, 0
movs r1, 0x39
mov r2, sp
bl sub_804037C
bl SetMonData
adds r7, 0x1
_080A0668:
adds r4, 0x64
asm/field_screen_effect.s
+2 -2
View File
@@ -942,7 +942,7 @@ _0807F542:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0807F580 @ =gUnknown_2036E38
ldr r1, _0807F580 @ =gMapObjects
adds r0, r1
movs r1, 0x2
bl FieldObjectTurn
@@ -958,7 +958,7 @@ _0807F542:
.align 2, 0
_0807F578: .4byte gUnknown_841B5B6
_0807F57C: .4byte gUnknown_2037078
_0807F580: .4byte gUnknown_2036E38
_0807F580: .4byte gMapObjects
_0807F584: .4byte gTasks
_0807F588:
lsls r4, r6, 2
asm/field_specials.s
+19 -19
View File
@@ -604,7 +604,7 @@ SpawnScriptFieldObject: @ 80CAA34
bl SpawnSpecialFieldObjectParametrized
lsls r0, 24
lsrs r0, 24
ldr r2, _080CAA84 @ =gUnknown_2036E38
ldr r2, _080CAA84 @ =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -620,7 +620,7 @@ SpawnScriptFieldObject: @ 80CAA34
bx r0
.align 2, 0
_080CAA80: .4byte gSaveBlock1Ptr
_080CAA84: .4byte gUnknown_2036E38
_080CAA84: .4byte gMapObjects
thumb_func_end SpawnScriptFieldObject
thumb_func_start RemoveScriptFieldObject
@@ -713,7 +713,7 @@ GivLeadMonEffortRibbon: @ 80CAB08
adds r0, r1
movs r1, 0x47
mov r2, sp
bl sub_804037C
bl SetMonData
add sp, 0x4
pop {r0}
bx r0
@@ -1457,7 +1457,7 @@ _080CB0EA:
lsrs r0, 16
movs r1, 0xB
muls r1, r0
ldr r0, _080CB120 @ =gUnknown_8245EE0
ldr r0, _080CB120 @ =gSpeciesNames
adds r1, r0
adds r0, r4, 0
bl StringCopy
@@ -1470,7 +1470,7 @@ _080CB110: .4byte 0x0000ffff
_080CB114: .4byte 0x0000403b
_080CB118: .4byte 0x00004035
_080CB11C: .4byte gStringVar1
_080CB120: .4byte gUnknown_8245EE0
_080CB120: .4byte gSpeciesNames
thumb_func_end sub_80CB0A8
thumb_func_start sub_80CB124
@@ -3167,7 +3167,7 @@ sub_80CBE00: @ 80CBE00
_080CBE18: .4byte gUnknown_20370DA
_080CBE1C: .4byte gUnknown_3005074
_080CBE20:
ldr r2, _080CBE4C @ =gUnknown_2036E38
ldr r2, _080CBE4C @ =gMapObjects
ldrb r1, [r1]
lsls r0, r1, 3
adds r0, r1
@@ -3191,7 +3191,7 @@ _080CBE48:
pop {r1}
bx r1
.align 2, 0
_080CBE4C: .4byte gUnknown_2036E38
_080CBE4C: .4byte gMapObjects
thumb_func_end sub_80CBE00
thumb_func_start sub_80CBE50
@@ -3225,7 +3225,7 @@ sub_80CBE50: @ 80CBE50
bl GetMonData
movs r1, 0xB
muls r0, r1
ldr r1, _080CBEAC @ =gUnknown_8245EE0
ldr r1, _080CBEAC @ =gSpeciesNames
adds r0, r1
adds r1, r6, 0
bl StringCompare
@@ -3236,7 +3236,7 @@ sub_80CBE50: @ 80CBE50
.align 2, 0
_080CBEA4: .4byte gPlayerParty
_080CBEA8: .4byte gStringVar1
_080CBEAC: .4byte gUnknown_8245EE0
_080CBEAC: .4byte gSpeciesNames
_080CBEB0:
movs r0, 0x1
_080CBEB2:
@@ -3407,9 +3407,9 @@ ChangeBoxPokemonNickname: @ 80CBFE0
mov r6, r8
push {r6}
sub sp, 0x8
ldr r0, _080CC050 @ =gUnknown_20370D6
ldr r0, _080CC050 @ =gSpecialVar_MonBoxId
ldrb r0, [r0]
ldr r1, _080CC054 @ =gUnknown_20370D8
ldr r1, _080CC054 @ =gSpecialVar_MonBoxPos
ldrb r1, [r1]
bl GetBoxedMonPtr
adds r6, r0, 0
@@ -3453,8 +3453,8 @@ ChangeBoxPokemonNickname: @ 80CBFE0
pop {r0}
bx r0
.align 2, 0
_080CC050: .4byte gUnknown_20370D6
_080CC054: .4byte gUnknown_20370D8
_080CC050: .4byte gSpecialVar_MonBoxId
_080CC054: .4byte gSpecialVar_MonBoxPos
_080CC058: .4byte gStringVar3
_080CC05C: .4byte gStringVar2
_080CC060: .4byte ChangeBoxPokemonNickname_CB
@@ -3463,9 +3463,9 @@ _080CC060: .4byte ChangeBoxPokemonNickname_CB
thumb_func_start ChangeBoxPokemonNickname_CB
ChangeBoxPokemonNickname_CB: @ 80CC064
push {lr}
ldr r0, _080CC07C @ =gUnknown_20370D6
ldr r0, _080CC07C @ =gSpecialVar_MonBoxId
ldrb r0, [r0]
ldr r1, _080CC080 @ =gUnknown_20370D8
ldr r1, _080CC080 @ =gSpecialVar_MonBoxPos
ldrb r1, [r1]
ldr r2, _080CC084 @ =gStringVar2
bl SetBoxMonNickFromAnyBox
@@ -3473,8 +3473,8 @@ ChangeBoxPokemonNickname_CB: @ 80CC064
pop {r0}
bx r0
.align 2, 0
_080CC07C: .4byte gUnknown_20370D6
_080CC080: .4byte gUnknown_20370D8
_080CC07C: .4byte gSpecialVar_MonBoxId
_080CC080: .4byte gSpecialVar_MonBoxPos
_080CC084: .4byte gStringVar2
thumb_func_end ChangeBoxPokemonNickname_CB
@@ -3576,7 +3576,7 @@ ChangePokemonNickname_CB: @ 80CC144
adds r0, r1
ldr r2, _080CC16C @ =gStringVar2
movs r1, 0x2
bl sub_804037C
bl SetMonData
bl c2_exit_to_overworld_1_continue_scripts_restart_music
pop {r0}
bx r0
@@ -4619,7 +4619,7 @@ sub_80CC948: @ 80CC948
ldr r1, _080CC96C @ =gPlayerParty
adds r0, r1
movs r1, 0x6
bl sub_80436F8
bl AdjustFriendship
ldr r0, _080CC970 @ =0x00004025
movs r1, 0
bl VarSet
asm/hall_of_fame.s
+12 -12
View File
@@ -429,7 +429,7 @@ Task_Hof_InitTeamSaveData: @ 80F2114
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r7, _080F2140 @ =gUnknown_201C000
ldr r7, _080F2140 @ =gDecompressionBuffer
bl sub_8112450
ldr r0, _080F2144 @ =gUnknown_203AB44
ldrb r0, [r0]
@@ -442,11 +442,11 @@ Task_Hof_InitTeamSaveData: @ 80F2114
bl memset
b _080F2162
.align 2, 0
_080F2140: .4byte gUnknown_201C000
_080F2140: .4byte gDecompressionBuffer
_080F2144: .4byte gUnknown_203AB44
_080F2148:
movs r0, 0x3
bl sub_80DA4FC
bl Save_LoadGameData
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -483,7 +483,7 @@ _080F218C:
cmp r5, 0x31
bls _080F21B2
_080F2190:
ldr r4, _080F220C @ =gUnknown_201C000
ldr r4, _080F220C @ =gDecompressionBuffer
adds r6, r4, 0
adds r4, 0x78
movs r5, 0
@@ -541,7 +541,7 @@ _080F21B2:
bx r0
.align 2, 0
_080F2208: .4byte 0x000001ff
_080F220C: .4byte gUnknown_201C000
_080F220C: .4byte gDecompressionBuffer
_080F2210: .4byte gUnknown_203AB38
_080F2214: .4byte gUnknown_8419F54
_080F2218: .4byte gTasks
@@ -554,7 +554,7 @@ sub_80F2220: @ 80F2220
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, _080F2254 @ =gUnknown_30053A4
ldr r1, _080F2254 @ =gGameContinueCallback
ldr r0, _080F2258 @ =CB2_DoHallOfFameScreenDontSaveData
str r0, [r1]
movs r0, 0x3
@@ -574,7 +574,7 @@ sub_80F2220: @ 80F2220
pop {r0}
bx r0
.align 2, 0
_080F2254: .4byte gUnknown_30053A4
_080F2254: .4byte gGameContinueCallback
_080F2258: .4byte CB2_DoHallOfFameScreenDontSaveData
_080F225C: .4byte gTasks
_080F2260: .4byte sub_80F2264
@@ -1609,7 +1609,7 @@ sub_80F2AA4: @ 80F2AA4
movs r3, 0xC
bl sub_810F558
movs r0, 0x3
bl sub_80DA4FC
bl Save_LoadGameData
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1626,7 +1626,7 @@ _080F2AD8: .4byte 0x00000226
_080F2ADC: .4byte gTasks
_080F2AE0: .4byte sub_80F30A4
_080F2AE4:
ldr r0, _080F2B2C @ =gUnknown_201C000
ldr r0, _080F2B2C @ =gDecompressionBuffer
ldr r4, _080F2B30 @ =gUnknown_203AB38
ldr r1, [r4]
movs r2, 0x80
@@ -1663,7 +1663,7 @@ _080F2B1A:
subs r0, r2, 0x1
b _080F2B46
.align 2, 0
_080F2B2C: .4byte gUnknown_201C000
_080F2B2C: .4byte gDecompressionBuffer
_080F2B30: .4byte gUnknown_203AB38
_080F2B34: .4byte 0x000001ff
_080F2B38: .4byte gTasks
@@ -2624,7 +2624,7 @@ _080F32C4:
lsrs r1, 23
movs r2, 0xB
muls r1, r2
ldr r2, _080F3324 @ =gUnknown_8245EE0
ldr r2, _080F3324 @ =gSpeciesNames
adds r1, r2
bl StringCopy
adds r6, r0, 0
@@ -2641,7 +2641,7 @@ _080F3318:
.align 2, 0
_080F331C: .4byte gUnknown_840C23C
_080F3320: .4byte 0x000001ff
_080F3324: .4byte gUnknown_8245EE0
_080F3324: .4byte gSpeciesNames
_080F3328:
lsls r0, r1, 23
lsrs r0, 23
asm/help_system.s
+8 -8
View File
@@ -463,7 +463,7 @@ _0813BC58: .4byte gUnknown_203F18A
thumb_func_start sub_813BC5C
sub_813BC5C: @ 813BC5C
push {lr}
ldr r0, _0813BC70 @ =gUnknown_201C000
ldr r0, _0813BC70 @ =gDecompressionBuffer
ldr r1, _0813BC74 @ =0x0600c000
movs r2, 0x80
lsls r2, 7
@@ -472,7 +472,7 @@ sub_813BC5C: @ 813BC5C
pop {r0}
bx r0
.align 2, 0
_0813BC70: .4byte gUnknown_201C000
_0813BC70: .4byte gDecompressionBuffer
_0813BC74: .4byte 0x0600c000
thumb_func_end sub_813BC5C
@@ -1586,7 +1586,7 @@ sub_813C4CC: @ 813C4CC
movs r1, 0xF
movs r2, 0x2
bl GenerateFontHalfRowLookupTable
ldr r1, _0813C508 @ =gUnknown_201C000
ldr r1, _0813C508 @ =gDecompressionBuffer
str r4, [sp]
movs r0, 0x1A
str r0, [sp, 0x4]
@@ -1601,7 +1601,7 @@ sub_813C4CC: @ 813C4CC
pop {r0}
bx r0
.align 2, 0
_0813C508: .4byte gUnknown_201C000
_0813C508: .4byte gDecompressionBuffer
thumb_func_end sub_813C4CC
thumb_func_start sub_813C50C
@@ -1617,7 +1617,7 @@ sub_813C50C: @ 813C50C
ldr r2, _0813C578 @ =0x0000eeee
adds r0, r2, 0
strh r0, [r1]
ldr r4, _0813C57C @ =gUnknown_201C000
ldr r4, _0813C57C @ =gDecompressionBuffer
ldr r2, _0813C580 @ =0x01001a00
adds r0, r1, 0
adds r1, r4, 0
@@ -1658,7 +1658,7 @@ sub_813C50C: @ 813C50C
bx r0
.align 2, 0
_0813C578: .4byte 0x0000eeee
_0813C57C: .4byte gUnknown_201C000
_0813C57C: .4byte gDecompressionBuffer
_0813C580: .4byte 0x01001a00
thumb_func_end sub_813C50C
@@ -1751,7 +1751,7 @@ sub_813C624: @ 813C624
ldr r2, _0813C640 @ =0x0000ffff
adds r0, r2, 0
strh r0, [r1]
ldr r1, _0813C644 @ =gUnknown_201C000
ldr r1, _0813C644 @ =gDecompressionBuffer
ldr r2, _0813C648 @ =0x01001a00
mov r0, sp
bl CpuSet
@@ -1760,7 +1760,7 @@ sub_813C624: @ 813C624
bx r0
.align 2, 0
_0813C640: .4byte 0x0000ffff
_0813C644: .4byte gUnknown_201C000
_0813C644: .4byte gDecompressionBuffer
_0813C648: .4byte 0x01001a00
thumb_func_end sub_813C624
asm/help_system_812B1E0.s
+2 -2
View File
@@ -321,7 +321,7 @@ sub_812B40C: @ 812B40C
ldrb r0, [r0]
cmp r0, 0x1
beq _0812B42E
ldr r0, _0812B438 @ =gUnknown_30053A0
ldr r0, _0812B438 @ =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0
beq _0812B440
@@ -337,7 +337,7 @@ _0812B42E:
b _0812B44E
.align 2, 0
_0812B434: .4byte gUnknown_203B0EE
_0812B438: .4byte gUnknown_30053A0
_0812B438: .4byte gSaveFileStatus
_0812B43C: .4byte 0x0000083c
_0812B440:
ldr r0, _0812B454 @ =0x0000083c
asm/intro.s
+4 -4
View File
@@ -306,10 +306,10 @@ c2_copyright_1: @ 80EC820
cmp r0, 0
bne _080EC858
bl sub_8054A28
bl ResetSaveCounters
bl Save_ResetSaveCounters
movs r0, 0
bl sub_80DA4FC
ldr r0, _080EC85C @ =gUnknown_30053A0
bl Save_LoadGameData
ldr r0, _080EC85C @ =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0
beq _080EC846
@@ -328,7 +328,7 @@ _080EC858:
pop {r0}
bx r0
.align 2, 0
_080EC85C: .4byte gUnknown_30053A0
_080EC85C: .4byte gSaveFileStatus
_080EC860: .4byte gSaveBlock2Ptr
thumb_func_end c2_copyright_1
asm/item.s
+1 -1
View File
@@ -81,7 +81,7 @@ _08099E04:
adds r0, 0x2
mov r1, r8
str r2, [sp]
bl sub_804C56C
bl ApplyNewEncryptionKeyToHword
adds r6, 0x1
ldr r2, [sp]
ldrb r4, [r4, 0x4]
asm/item_menu.s
+2 -2
View File
@@ -6629,7 +6629,7 @@ _0810B396:
cmp r0, 0x1
bne _0810B3B8
bl FreeRestoreBattleData
bl sub_804C230
bl LoadPlayerParty
b _0810B4B6
.align 2, 0
_0810B3B0: .4byte gTasks+0x8
@@ -6791,7 +6791,7 @@ sub_810B4BC: @ 810B4BC
cmp r0, 0x1
bne _0810B50C
bl FreeRestoreBattleData
bl sub_804C230
bl LoadPlayerParty
b _0810B5C6
.align 2, 0
_0810B504: .4byte gTasks+0x8
asm/item_use.s
+4 -4
View File
@@ -743,7 +743,7 @@ _080A1578:
movs r1, 0x11
adds r2, r4, 0
movs r3, 0
bl ExecuteTableBasedItemEffect_
bl ExecuteTableBasedItemEffect
lsls r0, 24
cmp r0, 0
bne _080A1592
@@ -1886,7 +1886,7 @@ sub_80A1E7C: @ 80A1E7C
lsls r0, 24
lsrs r4, r0, 24
ldr r1, _080A1EBC @ =gBattlerPartyIndexes
ldr r0, _080A1EC0 @ =gUnknown_2024004
ldr r0, _080A1EC0 @ =gBattlerInMenuId
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1900,7 +1900,7 @@ sub_80A1E7C: @ 80A1E7C
lsls r2, 24
lsrs r2, 24
movs r3, 0
bl ExecuteTableBasedItemEffect_
bl ExecuteTableBasedItemEffect
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -1913,7 +1913,7 @@ sub_80A1E7C: @ 80A1E7C
b _080A1EE4
.align 2, 0
_080A1EBC: .4byte gBattlerPartyIndexes
_080A1EC0: .4byte gUnknown_2024004
_080A1EC0: .4byte gBattlerInMenuId
_080A1EC4: .4byte gPlayerParty
_080A1EC8: .4byte gUnknown_203AD30
_080A1ECC: .4byte gUnknown_84169DC
asm/learn_move.s
+2 -2
View File
@@ -744,7 +744,7 @@ _080E4C7E:
lsls r2, 2
adds r1, r5, r2
ldrb r1, [r1]
ldr r2, _080E4CDC @ =gUnknown_2024029
ldr r2, _080E4CDC @ =gPlayerPartyCount
ldrb r2, [r2]
subs r2, 0x1
lsls r2, 24
@@ -768,7 +768,7 @@ _080E4CCC: .4byte 0x00000263
_080E4CD0: .4byte 0x00000a68
_080E4CD4: .4byte 0x00000a6a
_080E4CD8: .4byte gPlayerParty
_080E4CDC: .4byte gUnknown_2024029
_080E4CDC: .4byte gPlayerPartyCount
_080E4CE0: .4byte sub_80E4800
_080E4CE4:
ldr r1, [r7]
asm/link.s
+22 -22
View File
@@ -1033,7 +1033,7 @@ _08009CC0:
mov r10, r7
cmp r1, r0
bls _08009D10
ldr r0, _08009D08 @ =gUnknown_201C000
ldr r0, _08009D08 @ =gDecompressionBuffer
mov r8, r0
movs r2, 0
adds r5, r3, 0
@@ -1058,7 +1058,7 @@ _08009CE4:
b _08009D40
.align 2, 0
_08009D04: .4byte gUnknown_3000E18
_08009D08: .4byte gUnknown_201C000
_08009D08: .4byte gDecompressionBuffer
_08009D0C: .4byte gUnknown_3003ED0
_08009D10:
movs r2, 0
@@ -1112,7 +1112,7 @@ _08009D40:
lsls r0, r6, 3
subs r0, r6
lsls r0, 2
ldr r1, _08009DD0 @ =gUnknown_202273C
ldr r1, _08009DD0 @ =gLinkPlayers
adds r2, r0, r1
adds r1, r2, 0
mov r0, r8
@@ -1155,7 +1155,7 @@ _08009DBC:
_08009DC4: .4byte gUnknown_2022118
_08009DC8: .4byte gUnknown_3003ED0
_08009DCC: .4byte gUnknown_3003EB8
_08009DD0: .4byte gUnknown_202273C
_08009DD0: .4byte gLinkPlayers
_08009DD4: .4byte gUnknown_82345C0
_08009DD8: .4byte c2_800ACD4
_08009DDC:
@@ -1599,12 +1599,12 @@ _0800A100:
bl sub_80098B8
_0800A112:
movs r6, 0
ldr r4, _0800A120 @ =gUnknown_202273C
ldr r4, _0800A120 @ =gLinkPlayers
movs r5, 0
b _0800A138
.align 2, 0
_0800A11C: .4byte gUnknown_3003EAC
_0800A120: .4byte gUnknown_202273C
_0800A120: .4byte gLinkPlayers
_0800A124:
adds r0, r4, 0
adds r0, 0x14
@@ -1628,7 +1628,7 @@ _0800A138:
lsrs r0, 24
cmp r7, r0
bne _0800A1B8
ldr r0, _0800A170 @ =gUnknown_202273C
ldr r0, _0800A170 @ =gLinkPlayers
ldr r1, [r0, 0x14]
ldr r0, _0800A174 @ =0x00001133
cmp r1, r0
@@ -1643,7 +1643,7 @@ _0800A138:
ldr r2, _0800A178 @ =gUnknown_3000E54
b _0800A1E0
.align 2, 0
_0800A170: .4byte gUnknown_202273C
_0800A170: .4byte gLinkPlayers
_0800A174: .4byte 0x00001133
_0800A178: .4byte gUnknown_3000E54
_0800A17C:
@@ -1715,10 +1715,10 @@ IsLinkPlayerDataExchangeComplete: @ 800A1F0
push {r4-r6,lr}
movs r6, 0
movs r4, 0
ldr r5, _0800A1FC @ =gUnknown_202273C
ldr r5, _0800A1FC @ =gLinkPlayers
b _0800A220
.align 2, 0
_0800A1FC: .4byte gUnknown_202273C
_0800A1FC: .4byte gLinkPlayers
_0800A200:
lsls r0, r4, 3
subs r0, r4
@@ -1772,7 +1772,7 @@ _0800A254: .4byte gUnknown_3000E54
GetLinkPlayerTrainerId: @ 800A258
lsls r0, 24
lsrs r0, 24
ldr r2, _0800A26C @ =gUnknown_202273C
ldr r2, _0800A26C @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -1781,13 +1781,13 @@ GetLinkPlayerTrainerId: @ 800A258
ldr r0, [r1]
bx lr
.align 2, 0
_0800A26C: .4byte gUnknown_202273C
_0800A26C: .4byte gLinkPlayers
thumb_func_end GetLinkPlayerTrainerId
thumb_func_start sub_800A270
sub_800A270: @ 800A270
push {r4,r5,lr}
ldr r5, _0800A290 @ =gUnknown_202273C
ldr r5, _0800A290 @ =gLinkPlayers
movs r4, 0x4
_0800A276:
adds r0, r5, 0
@@ -1802,7 +1802,7 @@ _0800A276:
pop {r0}
bx r0
.align 2, 0
_0800A290: .4byte gUnknown_202273C
_0800A290: .4byte gLinkPlayers
thumb_func_end sub_800A270
thumb_func_start ResetBlockSend
@@ -2706,7 +2706,7 @@ sub_800A900: @ 800A900
bl GetMultiplayerId
ldr r1, _0800A938 @ =gUnknown_3003F60
strb r0, [r1]
ldr r4, _0800A93C @ =gUnknown_202273C
ldr r4, _0800A93C @ =gLinkPlayers
ldr r3, _0800A940 @ =gUnknown_20227C8
movs r2, 0x4
_0800A914:
@@ -2729,7 +2729,7 @@ _0800A914:
.align 2, 0
_0800A934: .4byte gUnknown_3003F40
_0800A938: .4byte gUnknown_3003F60
_0800A93C: .4byte gUnknown_202273C
_0800A93C: .4byte gLinkPlayers
_0800A940: .4byte gUnknown_20227C8
thumb_func_end sub_800A900
@@ -2760,7 +2760,7 @@ sub_800A95C: @ 800A95C
adds r6, r0, 0
cmp r5, r2
bge _0800A986
ldr r1, _0800A994 @ =gUnknown_202273C
ldr r1, _0800A994 @ =gLinkPlayers
ldr r0, _0800A998 @ =gUnknown_20227C8
adds r4, r0, 0x4
adds r3, r1, 0x4
@@ -2784,7 +2784,7 @@ _0800A986:
b _0800A99E
.align 2, 0
_0800A990: .4byte gUnknown_3003F40
_0800A994: .4byte gUnknown_202273C
_0800A994: .4byte gLinkPlayers
_0800A998: .4byte gUnknown_20227C8
_0800A99C:
movs r0, 0x1
@@ -2805,7 +2805,7 @@ sub_800A9A4: @ 800A9A4
cmp r4, r0
bcs _0800AA04
ldr r6, _0800AA14 @ =gUnknown_20227C8
ldr r5, _0800AA18 @ =gUnknown_202273C
ldr r5, _0800AA18 @ =gLinkPlayers
movs r0, 0x8
adds r0, r6
mov r8, r0
@@ -2853,7 +2853,7 @@ _0800AA04:
.align 2, 0
_0800AA10: .4byte gUnknown_3003F40
_0800AA14: .4byte gUnknown_20227C8
_0800AA18: .4byte gUnknown_202273C
_0800AA18: .4byte gLinkPlayers
_0800AA1C: .4byte gUnknown_3003EAC
_0800AA20: .4byte c2_800ACD4
thumb_func_end sub_800A9A4
@@ -3731,7 +3731,7 @@ sub_800B110: @ 800B110
lsls r2, r0, 3
subs r2, r0
lsls r2, 2
ldr r0, _0800B16C @ =gUnknown_202273C
ldr r0, _0800B16C @ =gLinkPlayers
adds r2, r0
adds r1, r2, 0
adds r0, r4, 0
@@ -3765,7 +3765,7 @@ _0800B160:
bx r0
.align 2, 0
_0800B168: .4byte gUnknown_2022118
_0800B16C: .4byte gUnknown_202273C
_0800B16C: .4byte gLinkPlayers
_0800B170: .4byte gUnknown_82345C0
_0800B174: .4byte c2_800ACD4
thumb_func_end sub_800B110
asm/link_rfu_2.s
+13 -13
View File
@@ -82,7 +82,7 @@ _080F863E:
bl CpuSet
mov r0, r9
strh r5, [r0]
ldr r1, _080F86BC @ =gUnknown_202273C
ldr r1, _080F86BC @ =gLinkPlayers
ldr r2, _080F86C0 @ =0x01000046
bl CpuSet
add sp, 0x8
@@ -101,7 +101,7 @@ _080F86AC: .4byte gUnknown_3003F50
_080F86B0: .4byte 0x01000008
_080F86B4: .4byte gUnknown_3003ED0
_080F86B8: .4byte 0x01000028
_080F86BC: .4byte gUnknown_202273C
_080F86BC: .4byte gLinkPlayers
_080F86C0: .4byte 0x01000046
thumb_func_end sub_80F85F8
@@ -4706,7 +4706,7 @@ _080FAA10:
cmp r4, 0x3
ble _080FAA10
adds r6, r2, 0
ldr r5, _080FAA54 @ =gUnknown_202273C
ldr r5, _080FAA54 @ =gLinkPlayers
movs r4, 0x4
_080FAA24:
adds r0, r5, 0
@@ -4731,7 +4731,7 @@ _080FAA24:
.align 2, 0
_080FAA4C: .4byte gUnknown_3005450
_080FAA50: .4byte 0x00000996
_080FAA54: .4byte gUnknown_202273C
_080FAA54: .4byte gLinkPlayers
thumb_func_end sub_80FA9FC
thumb_func_start sub_80FAA58
@@ -4874,7 +4874,7 @@ _080FAB70:
lsls r2, r4, 8
ldr r0, _080FAB9C @ =gUnknown_2022118
adds r2, r0
ldr r1, _080FABA0 @ =gUnknown_202273C
ldr r1, _080FABA0 @ =gLinkPlayers
lsls r0, r4, 3
subs r0, r4
lsls r0, 2
@@ -4891,7 +4891,7 @@ _080FAB70:
b _080FAC2E
.align 2, 0
_080FAB9C: .4byte gUnknown_2022118
_080FABA0: .4byte gUnknown_202273C
_080FABA0: .4byte gLinkPlayers
_080FABA4:
ldr r5, _080FAC40 @ =gUnknown_2022618
adds r1, r5, 0
@@ -4918,7 +4918,7 @@ _080FABC6:
adds r2, 0x1
cmp r2, 0x3
ble _080FABC6
ldr r1, _080FAC50 @ =gUnknown_202273C
ldr r1, _080FAC50 @ =gLinkPlayers
adds r0, r5, 0
adds r0, 0x14
movs r2, 0x8C
@@ -4936,7 +4936,7 @@ _080FABEE:
ldrb r0, [r1, 0xD]
strb r0, [r5, 0xF]
movs r2, 0
ldr r3, _080FAC50 @ =gUnknown_202273C
ldr r3, _080FAC50 @ =gLinkPlayers
mov r12, r3
adds r4, r5, 0
adds r4, 0x10
@@ -4977,7 +4977,7 @@ _080FAC40: .4byte gUnknown_2022618
_080FAC44: .4byte gUnknown_843EDE4
_080FAC48: .4byte gUnknown_3005450
_080FAC4C: .4byte 0x00000996
_080FAC50: .4byte gUnknown_202273C
_080FAC50: .4byte gLinkPlayers
_080FAC54: .4byte gTasks
_080FAC58:
adds r0, r3, 0
@@ -5512,7 +5512,7 @@ sub_80FB030: @ 80FB030
mov r8, r1
movs r4, 0
movs r6, 0x1
ldr r2, _080FB0E0 @ =gUnknown_202273C
ldr r2, _080FB0E0 @ =gLinkPlayers
mov r12, r2
ldr r0, _080FB0E4 @ =0x00000996
adds r0, r3
@@ -5573,7 +5573,7 @@ _080FB0C4:
_080FB0D4: .4byte gUnknown_3005450
_080FB0D8: .4byte 0x0000099a
_080FB0DC: .4byte 0x0000099b
_080FB0E0: .4byte gUnknown_202273C
_080FB0E0: .4byte gLinkPlayers
_080FB0E4: .4byte 0x00000996
thumb_func_end sub_80FB030
@@ -10016,7 +10016,7 @@ _080FD258:
lsrs r0, 24
cmp r4, r0
beq _080FD29E
ldr r2, _080FD328 @ =gUnknown_202273C
ldr r2, _080FD328 @ =gLinkPlayers
adds r0, r5, r2
ldrh r0, [r0, 0x1A]
cmp r0, 0x1
@@ -10115,7 +10115,7 @@ _080FD318:
pop {r0}
bx r0
.align 2, 0
_080FD328: .4byte gUnknown_202273C
_080FD328: .4byte gLinkPlayers
_080FD32C: .4byte 0x00003bac
_080FD330: .4byte gSaveBlock1Ptr
_080FD334: .4byte 0x00003ba8
asm/link_rfu_3.s
+47 -47
View File
@@ -3157,12 +3157,12 @@ _081172C0:
ldr r0, _081172E0 @ =gUnknown_2039624
adds r7, r0, 0
adds r7, 0x38
ldr r6, _081172E4 @ =gUnknown_202273C
ldr r6, _081172E4 @ =gLinkPlayers
adds r5, r0, 0
b _08117302
.align 2, 0
_081172E0: .4byte gUnknown_2039624
_081172E4: .4byte gUnknown_202273C
_081172E4: .4byte gLinkPlayers
_081172E8:
lsls r0, r4, 8
ldr r1, _08117338 @ =gUnknown_2022118
@@ -3273,9 +3273,9 @@ sub_81173C0: @ 81173C0
lsls r6, 16
lsrs r6, 16
bl sp000_heal_pokemon
bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks
ldr r5, _0811742C @ =gUnknown_202273C
bl SavePlayerParty
bl LoadPlayerBag
ldr r5, _0811742C @ =gLinkPlayers
ldr r0, _08117430 @ =0x00002211
str r0, [r5, 0x14]
bl GetMultiplayerId
@@ -3315,7 +3315,7 @@ sub_81173C0: @ 81173C0
pop {r0}
bx r0
.align 2, 0
_0811742C: .4byte gUnknown_202273C
_0811742C: .4byte gLinkPlayers
_08117430: .4byte 0x00002211
_08117434: .4byte gMain
_08117438: .4byte sub_8081668
@@ -3661,8 +3661,8 @@ _081177A0:
movs r1, 0x1
bl sub_8117594
bl sp000_heal_pokemon
bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks
bl SavePlayerParty
bl LoadPlayerBag
movs r0, 0x1
str r0, [sp]
movs r0, 0
@@ -3674,8 +3674,8 @@ _081177C4: .4byte gUnknown_2022618
_081177C8:
bl sub_80563F0
bl sp000_heal_pokemon
bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks
bl SavePlayerParty
bl LoadPlayerBag
ldr r0, _081177EC @ =gUnknown_2022618
movs r1, 0x1
bl sub_8117594
@@ -3690,8 +3690,8 @@ _081177EC: .4byte gUnknown_2022618
_081177F0:
bl sub_80563F0
bl sp000_heal_pokemon
bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks
bl SavePlayerParty
bl LoadPlayerBag
ldr r0, _08117814 @ =gUnknown_2022618
movs r1, 0x1
bl sub_8117594
@@ -6054,7 +6054,7 @@ _08118CB6:
bl sub_80F9E2C
ldr r0, _08118CDC @ =gStringVar4
ldr r2, _08118CE0 @ =gUnknown_845842C
ldr r1, _08118CE4 @ =gUnknown_202273C
ldr r1, _08118CE4 @ =gLinkPlayers
ldrb r1, [r1, 0x13]
lsls r1, 2
adds r1, r2
@@ -6065,7 +6065,7 @@ _08118CB6:
.align 2, 0
_08118CDC: .4byte gStringVar4
_08118CE0: .4byte gUnknown_845842C
_08118CE4: .4byte gUnknown_202273C
_08118CE4: .4byte gLinkPlayers
_08118CE8:
ldr r0, _08118D10 @ =gUnknown_203B058
strb r5, [r0]
@@ -6218,7 +6218,7 @@ _08118E36:
ldrb r2, [r4]
movs r1, 0x40
orrs r1, r2
ldr r2, _08118E5C @ =gUnknown_202273C
ldr r2, _08118E5C @ =gLinkPlayers
ldrb r2, [r2, 0x13]
bl sub_811AE68
strb r5, [r4]
@@ -6226,7 +6226,7 @@ _08118E36:
.align 2, 0
_08118E54: .4byte gStringVar4
_08118E58: .4byte gUnknown_203B058
_08118E5C: .4byte gUnknown_202273C
_08118E5C: .4byte gLinkPlayers
_08118E60:
movs r0, 0x2
ldrsh r1, [r7, r0]
@@ -6885,7 +6885,7 @@ _08119414:
lsrs r0, 22
movs r1, 0xB
muls r1, r0
ldr r0, _08119458 @ =gUnknown_8245EE0
ldr r0, _08119458 @ =gSpeciesNames
adds r1, r0
adds r0, r4, 0
bl StringCopy
@@ -6907,7 +6907,7 @@ _0811944A:
b _081198DC
.align 2, 0
_08119454: .4byte gStringVar1
_08119458: .4byte gUnknown_8245EE0
_08119458: .4byte gSpeciesNames
_0811945C: .4byte gStringVar2
_08119460: .4byte gStringVar4
_08119464: .4byte gUnknown_8458DBC
@@ -7519,7 +7519,7 @@ sub_8119944: @ 8119944
cmp r0, 0
beq _08119994
ldr r0, _08119978 @ =gStringVar4
ldr r1, _0811997C @ =gUnknown_202273C
ldr r1, _0811997C @ =gLinkPlayers
adds r1, 0x2F
ldrb r1, [r1]
adds r2, r5, 0
@@ -7538,7 +7538,7 @@ sub_8119944: @ 8119944
b _08119996
.align 2, 0
_08119978: .4byte gStringVar4
_0811997C: .4byte gUnknown_202273C
_0811997C: .4byte gLinkPlayers
_08119980: .4byte gUnknown_203B058
_08119984:
cmp r0, 0x2
@@ -10003,7 +10003,7 @@ _0811AC3C:
movs r0, 0xB
mov r2, r8
muls r2, r0
ldr r0, _0811ACA0 @ =gUnknown_8245EE0
ldr r0, _0811ACA0 @ =gSpeciesNames
adds r2, r0
str r5, [sp]
str r4, [sp, 0x4]
@@ -10041,7 +10041,7 @@ _0811AC90:
pop {r0}
bx r0
.align 2, 0
_0811ACA0: .4byte gUnknown_8245EE0
_0811ACA0: .4byte gSpeciesNames
thumb_func_end sub_811ABE4
thumb_func_start sub_811ACA4
@@ -10227,7 +10227,7 @@ _0811ADE0:
beq _0811AE40
adds r4, 0x1
_0811ADFA:
ldr r0, _0811AE0C @ =gUnknown_2024029
ldr r0, _0811AE0C @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r4, r0
blt _0811ADE0
@@ -10235,10 +10235,10 @@ _0811ADFA:
b _0811AE5C
.align 2, 0
_0811AE08: .4byte gPlayerParty
_0811AE0C: .4byte gUnknown_2024029
_0811AE0C: .4byte gPlayerPartyCount
_0811AE10:
movs r4, 0
ldr r0, _0811AE44 @ =gUnknown_2024029
ldr r0, _0811AE44 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r4, r0
bge _0811AE5A
@@ -10265,12 +10265,12 @@ _0811AE40:
movs r0, 0
b _0811AE5C
.align 2, 0
_0811AE44: .4byte gUnknown_2024029
_0811AE44: .4byte gPlayerPartyCount
_0811AE48: .4byte gBaseStats
_0811AE4C: .4byte gPlayerParty
_0811AE50:
adds r4, 0x1
ldr r0, _0811AE64 @ =gUnknown_2024029
ldr r0, _0811AE64 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r4, r0
blt _0811AE1C
@@ -10281,7 +10281,7 @@ _0811AE5C:
pop {r1}
bx r1
.align 2, 0
_0811AE64: .4byte gUnknown_2024029
_0811AE64: .4byte gPlayerPartyCount
thumb_func_end sub_811ADD0
thumb_func_start sub_811AE68
@@ -10349,7 +10349,7 @@ sub_811AECC: @ 811AECC
bl GetMultiplayerId
lsls r0, 24
lsrs r3, r0, 24
ldr r2, _0811AF00 @ =gUnknown_202273C
ldr r2, _0811AF00 @ =gLinkPlayers
movs r0, 0x1
adds r1, r3, 0
eors r1, r0
@@ -10366,7 +10366,7 @@ sub_811AECC: @ 811AECC
beq _0811AF0A
b _0811AF60
.align 2, 0
_0811AF00: .4byte gUnknown_202273C
_0811AF00: .4byte gLinkPlayers
_0811AF04:
cmp r6, 0x45
beq _0811AF44
@@ -10480,14 +10480,14 @@ _0811AFC8:
ldrh r2, [r4, 0xA]
movs r1, 0xB
muls r1, r2
ldr r2, _0811AFF4 @ =gUnknown_8245EE0
ldr r2, _0811AFF4 @ =gSpeciesNames
adds r1, r2
bl StringCopy
movs r4, 0
b _0811AFFA
.align 2, 0
_0811AFF0: .4byte gUnknown_203B06C
_0811AFF4: .4byte gUnknown_8245EE0
_0811AFF4: .4byte gSpeciesNames
_0811AFF8:
adds r4, 0x1
_0811AFFA:
@@ -10509,7 +10509,7 @@ _0811AFFA:
ldrh r1, [r5, 0x2]
movs r0, 0xB
muls r1, r0
ldr r0, _0811B048 @ =gUnknown_8245EE0
ldr r0, _0811B048 @ =gSpeciesNames
adds r1, r0
adds r0, r6, 0
adds r0, 0x79
@@ -10527,7 +10527,7 @@ _0811B030:
b _0811B080
.align 2, 0
_0811B044: .4byte gUnknown_3007460
_0811B048: .4byte gUnknown_8245EE0
_0811B048: .4byte gSpeciesNames
_0811B04C: .4byte gUnknown_8457DB8
_0811B050:
movs r4, 0
@@ -10626,7 +10626,7 @@ sub_811B0F0: @ 811B0F0
push {r4-r6,lr}
movs r6, 0
movs r5, 0
ldr r0, _0811B138 @ =gUnknown_2024029
ldr r0, _0811B138 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r6, r0
bge _0811B130
@@ -10651,7 +10651,7 @@ _0811B0FE:
adds r6, 0x1
_0811B126:
adds r5, 0x1
ldr r0, _0811B138 @ =gUnknown_2024029
ldr r0, _0811B138 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r5, r0
blt _0811B0FE
@@ -10661,7 +10661,7 @@ _0811B130:
movs r0, 0
b _0811B142
.align 2, 0
_0811B138: .4byte gUnknown_2024029
_0811B138: .4byte gPlayerPartyCount
_0811B13C: .4byte gPlayerParty
_0811B140:
movs r0, 0x1
@@ -10807,7 +10807,7 @@ _0811B212:
_0811B238:
adds r5, 0x1
_0811B23A:
ldr r0, _0811B254 @ =gUnknown_2024029
ldr r0, _0811B254 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r5, r0
blt _0811B212
@@ -10820,7 +10820,7 @@ _0811B242:
bx r1
.align 2, 0
_0811B250: .4byte gPlayerParty
_0811B254: .4byte gUnknown_2024029
_0811B254: .4byte gPlayerPartyCount
thumb_func_end sub_811B1EC
thumb_func_start sub_811B258
@@ -10866,7 +10866,7 @@ sub_811B298: @ 811B298
sub_811B2A8: @ 811B2A8
push {r4,lr}
movs r4, 0x80
ldr r3, _0811B2D4 @ =gUnknown_202273C
ldr r3, _0811B2D4 @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -10886,7 +10886,7 @@ sub_811B2A8: @ 811B2A8
pop {r1}
bx r1
.align 2, 0
_0811B2D4: .4byte gUnknown_202273C
_0811B2D4: .4byte gLinkPlayers
thumb_func_end sub_811B2A8
thumb_func_start sub_811B2D8
@@ -10960,7 +10960,7 @@ sub_811B31C: @ 811B31C
lsrs r0, 16
movs r1, 0xD
muls r1, r0
ldr r0, _0811B4B4 @ =gUnknown_823E558
ldr r0, _0811B4B4 @ =gTrainerClassNames
adds r1, r0
adds r0, r6, 0
bl StringCopy
@@ -11109,7 +11109,7 @@ _0811B45E:
b _0811B4F0
.align 2, 0
_0811B4B0: .4byte gUnknown_2039624
_0811B4B4: .4byte gUnknown_823E558
_0811B4B4: .4byte gTrainerClassNames
_0811B4B8: .4byte gUnknown_84594B0
_0811B4BC: .4byte gUnknown_84594C4
_0811B4C0: .4byte gStringVar4
@@ -11378,7 +11378,7 @@ sub_811B66C: @ 811B66C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0811B6C0 @ =gUnknown_2036E38
ldr r1, _0811B6C0 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -11396,7 +11396,7 @@ sub_811B66C: @ 811B66C
.align 2, 0
_0811B6B8: .4byte gUnknown_8457120
_0811B6BC: .4byte gSaveBlock1Ptr
_0811B6C0: .4byte gUnknown_2036E38
_0811B6C0: .4byte gMapObjects
_0811B6C4:
ldr r0, _0811B6DC @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
ldr r1, _0811B6E0 @ =0x00000183
@@ -11437,7 +11437,7 @@ sub_811B6E8: @ 811B6E8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0811B72C @ =gUnknown_2036E38
ldr r1, _0811B72C @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
@@ -11449,7 +11449,7 @@ sub_811B6E8: @ 811B6E8
.align 2, 0
_0811B724: .4byte gUnknown_8457120
_0811B728: .4byte gSaveBlock1Ptr
_0811B72C: .4byte gUnknown_2036E38
_0811B72C: .4byte gMapObjects
_0811B730:
bl ScriptContext2_IsEnabled
lsls r0, 24
asm/load_save.s
-814
View File
@@ -1,814 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start CheckForFlashMemory
CheckForFlashMemory: @ 804BFE4
push {lr}
bl IdentifyFlash
lsls r0, 16
cmp r0, 0
bne _0804C000
ldr r1, _0804BFFC @ =gUnknown_3005004
movs r0, 0x1
str r0, [r1]
bl InitFlashTimer
b _0804C006
.align 2, 0
_0804BFFC: .4byte gUnknown_3005004
_0804C000:
ldr r1, _0804C00C @ =gUnknown_3005004
movs r0, 0
str r0, [r1]
_0804C006:
pop {r0}
bx r0
.align 2, 0
_0804C00C: .4byte gUnknown_3005004
thumb_func_end CheckForFlashMemory
thumb_func_start ClearSav2
ClearSav2: @ 804C010
push {lr}
sub sp, 0x4
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, _0804C02C @ =gSaveBlock2
ldr r2, _0804C030 @ =0x010007d2
mov r0, sp
bl CpuSet
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_0804C02C: .4byte gSaveBlock2
_0804C030: .4byte 0x010007d2
thumb_func_end ClearSav2
thumb_func_start ClearSav1
ClearSav1: @ 804C034
push {lr}
sub sp, 0x4
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, _0804C050 @ =gSaveBlock1
ldr r2, _0804C054 @ =0x01001ef4
mov r0, sp
bl CpuSet
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_0804C050: .4byte gSaveBlock1
_0804C054: .4byte 0x01001ef4
thumb_func_end ClearSav1
thumb_func_start SetSaveBlocksPointers
SetSaveBlocksPointers: @ 804C058
push {r4,r5,lr}
ldr r4, _0804C08C @ =gSaveBlock1Ptr
ldr r5, [r4]
bl Random
movs r1, 0x7C
ands r1, r0
ldr r2, _0804C090 @ =gSaveBlock2Ptr
ldr r0, _0804C094 @ =gSaveBlock2
adds r0, r1, r0
str r0, [r2]
ldr r0, _0804C098 @ =gSaveBlock1
adds r0, r1, r0
str r0, [r4]
ldr r2, _0804C09C @ =gUnknown_3005010
ldr r0, _0804C0A0 @ =gPokemonStorage
adds r1, r0
str r1, [r2]
bl sub_8099E44
adds r0, r5, 0
bl sub_8110840
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0804C08C: .4byte gSaveBlock1Ptr
_0804C090: .4byte gSaveBlock2Ptr
_0804C094: .4byte gSaveBlock2
_0804C098: .4byte gSaveBlock1
_0804C09C: .4byte gUnknown_3005010
_0804C0A0: .4byte gPokemonStorage
thumb_func_end SetSaveBlocksPointers
thumb_func_start sub_804C0A4
sub_804C0A4: @ 804C0A4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r4, _0804C160 @ =gMain
ldr r0, [r4, 0xC]
str r0, [sp]
ldr r1, [r4, 0x10]
str r1, [sp, 0x4]
movs r0, 0
str r0, [r4, 0xC]
str r0, [r4, 0x10]
str r0, [r4, 0x20]
ldr r5, _0804C164 @ =gHeap
ldr r0, _0804C168 @ =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, _0804C16C @ =0x00000f24
mov r9, r0
adds r0, r5, 0
mov r2, r9
bl memcpy
ldr r1, _0804C170 @ =gSaveBlock1Ptr
mov r10, r1
ldr r1, [r1]
ldr r7, _0804C174 @ =0x00003d68
ldr r0, _0804C178 @ =gHeap + 0xf24
adds r2, r7, 0
bl memcpy
ldr r6, _0804C17C @ =gUnknown_3005010
ldr r1, [r6]
ldr r0, _0804C180 @ =0x000083d0
mov r8, r0
ldr r0, _0804C184 @ =gHeap + 0x4c8c
mov r2, r8
bl memcpy
bl SetSaveBlocksPointers
ldr r1, _0804C168 @ =gSaveBlock2Ptr
ldr r0, [r1]
adds r1, r5, 0
mov r2, r9
bl memcpy
mov r1, r10
ldr r0, [r1]
ldr r1, _0804C178 @ =gHeap + 0xf24
adds r2, r7, 0
bl memcpy
ldr r0, [r6]
ldr r1, _0804C184 @ =gHeap + 0x4c8c
mov r2, r8
bl memcpy
movs r1, 0xE0
lsls r1, 9
adds r0, r5, 0
bl InitHeap
ldr r0, [sp, 0x4]
str r0, [r4, 0x10]
ldr r1, [sp]
str r1, [r4, 0xC]
bl Random
adds r4, r0, 0
bl Random
lsls r4, 16
lsls r0, 16
lsrs r0, 16
adds r4, r0
adds r0, r4, 0
bl sub_804C5A4
ldr r1, _0804C168 @ =gSaveBlock2Ptr
ldr r0, [r1]
movs r1, 0xF2
lsls r1, 4
adds r0, r1
str r4, [r0]
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0804C160: .4byte gMain
_0804C164: .4byte gHeap
_0804C168: .4byte gSaveBlock2Ptr
_0804C16C: .4byte 0x00000f24
_0804C170: .4byte gSaveBlock1Ptr
_0804C174: .4byte 0x00003d68
_0804C178: .4byte gHeap + 0xf24
_0804C17C: .4byte gUnknown_3005010
_0804C180: .4byte 0x000083d0
_0804C184: .4byte gHeap + 0x4c8c
thumb_func_end sub_804C0A4
thumb_func_start sav2_x1_query_bit1
sav2_x1_query_bit1: @ 804C188
ldr r0, _0804C194 @ =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x9]
movs r0, 0x1
ands r0, r1
bx lr
.align 2, 0
_0804C194: .4byte gSaveBlock2Ptr
thumb_func_end sav2_x1_query_bit1
thumb_func_start sav2_x9_clear_bit1
sav2_x9_clear_bit1: @ 804C198
ldr r0, _0804C1A8 @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0xFE
ands r0, r1
strb r0, [r2, 0x9]
bx lr
.align 2, 0
_0804C1A8: .4byte gSaveBlock2Ptr
thumb_func_end sav2_x9_clear_bit1
thumb_func_start sub_804C1AC
sub_804C1AC: @ 804C1AC
ldr r0, _0804C1BC @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0x1
orrs r0, r1
strb r0, [r2, 0x9]
bx lr
.align 2, 0
_0804C1BC: .4byte gSaveBlock2Ptr
thumb_func_end sub_804C1AC
thumb_func_start sub_804C1C0
sub_804C1C0: @ 804C1C0
push {lr}
movs r0, 0
bl sub_8055778
ldr r0, _0804C1D8 @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0x1
orrs r0, r1
strb r0, [r2, 0x9]
pop {r0}
bx r0
.align 2, 0
_0804C1D8: .4byte gSaveBlock2Ptr
thumb_func_end sub_804C1C0
thumb_func_start sav2_gender2_inplace_and_xFE
sav2_gender2_inplace_and_xFE: @ 804C1DC
ldr r0, _0804C1EC @ =gSaveBlock2Ptr
ldr r2, [r0]
ldrb r1, [r2, 0x9]
movs r0, 0xFE
ands r0, r1
strb r0, [r2, 0x9]
bx lr
.align 2, 0
_0804C1EC: .4byte gSaveBlock2Ptr
thumb_func_end sav2_gender2_inplace_and_xFE
thumb_func_start copy_player_party_to_sav1
copy_player_party_to_sav1: @ 804C1F0
push {r4,lr}
ldr r0, _0804C224 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _0804C228 @ =gUnknown_2024029
ldrb r1, [r1]
adds r0, 0x34
strb r1, [r0]
movs r4, 0
_0804C200:
ldr r0, _0804C224 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x64
muls r1, r4
adds r0, r1
ldr r2, _0804C22C @ =gPlayerParty
adds r1, r2
adds r0, 0x38
movs r2, 0x64
bl memcpy
adds r4, 0x1
cmp r4, 0x5
ble _0804C200
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0804C224: .4byte gSaveBlock1Ptr
_0804C228: .4byte gUnknown_2024029
_0804C22C: .4byte gPlayerParty
thumb_func_end copy_player_party_to_sav1
thumb_func_start sub_804C230
sub_804C230: @ 804C230
push {r4,r5,lr}
ldr r1, _0804C264 @ =gUnknown_2024029
ldr r0, _0804C268 @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x34
ldrb r0, [r0]
strb r0, [r1]
movs r4, 0
ldr r5, _0804C26C @ =gPlayerParty
_0804C242:
movs r0, 0x64
adds r2, r4, 0
muls r2, r0
adds r0, r2, r5
ldr r1, _0804C268 @ =gSaveBlock1Ptr
ldr r1, [r1]
adds r1, r2
adds r1, 0x38
movs r2, 0x64
bl memcpy
adds r4, 0x1
cmp r4, 0x5
ble _0804C242
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0804C264: .4byte gUnknown_2024029
_0804C268: .4byte gSaveBlock1Ptr
_0804C26C: .4byte gPlayerParty
thumb_func_end sub_804C230
thumb_func_start save_serialize_npcs
save_serialize_npcs: @ 804C270
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r0, _0804C2B0 @ =gSaveBlock1Ptr
mov r12, r0
movs r5, 0xD4
lsls r5, 3
mov r8, r5
ldr r4, _0804C2B4 @ =gUnknown_2036E38
movs r3, 0
movs r2, 0xF
_0804C286:
mov r6, r12
ldr r1, [r6]
adds r1, r3
add r1, r8
adds r0, r4, 0
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
adds r4, 0x24
adds r3, 0x24
subs r2, 0x1
cmp r2, 0
bge _0804C286
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0804C2B0: .4byte gSaveBlock1Ptr
_0804C2B4: .4byte gUnknown_2036E38
thumb_func_end save_serialize_npcs
thumb_func_start sub_804C2B8
sub_804C2B8: @ 804C2B8
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r0, _0804C2F8 @ =gSaveBlock1Ptr
mov r12, r0
movs r5, 0xD4
lsls r5, 3
mov r8, r5
ldr r4, _0804C2FC @ =gUnknown_2036E38
movs r3, 0
movs r2, 0xF
_0804C2CE:
mov r6, r12
ldr r1, [r6]
adds r1, r3
adds r0, r4, 0
add r1, r8
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
adds r4, 0x24
adds r3, 0x24
subs r2, 0x1
cmp r2, 0
bge _0804C2CE
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0804C2F8: .4byte gSaveBlock1Ptr
_0804C2FC: .4byte gUnknown_2036E38
thumb_func_end sub_804C2B8
thumb_func_start SaveSerializedGame
SaveSerializedGame: @ 804C300
push {lr}
bl copy_player_party_to_sav1
bl save_serialize_npcs
pop {r0}
bx r0
thumb_func_end SaveSerializedGame
thumb_func_start LoadSerializedGame
LoadSerializedGame: @ 804C310
push {lr}
bl sub_804C230
bl sub_804C2B8
pop {r0}
bx r0
thumb_func_end LoadSerializedGame
thumb_func_start copy_bags_and_unk_data_from_save_blocks
copy_bags_and_unk_data_from_save_blocks: @ 804C320
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
movs r2, 0
ldr r0, _0804C424 @ =gUnknown_2031C8C
mov r12, r0
ldr r1, _0804C428 @ =gSaveBlock2Ptr
mov r10, r1
ldr r5, _0804C42C @ =gSaveBlock1Ptr
movs r3, 0xC4
lsls r3, 2
ldr r4, _0804C430 @ =gUnknown_2031764
_0804C33C:
lsls r0, r2, 2
ldr r1, [r5]
adds r1, r3
adds r1, r0
ldr r0, [r1]
stm r4!, {r0}
adds r2, 0x1
cmp r2, 0x29
ble _0804C33C
movs r2, 0
ldr r0, _0804C430 @ =gUnknown_2031764
ldr r5, _0804C42C @ =gSaveBlock1Ptr
movs r3, 0xEE
lsls r3, 2
adds r4, r0, 0
adds r4, 0xA8
_0804C35C:
lsls r0, r2, 2
ldr r1, [r5]
adds r1, r3
adds r1, r0
ldr r0, [r1]
stm r4!, {r0}
adds r2, 0x1
cmp r2, 0x1D
ble _0804C35C
movs r2, 0
ldr r0, _0804C430 @ =gUnknown_2031764
ldr r5, _0804C42C @ =gSaveBlock1Ptr
movs r6, 0x90
lsls r6, 1
adds r4, r0, r6
movs r3, 0x86
lsls r3, 3
_0804C37E:
lsls r0, r2, 2
ldr r1, [r5]
adds r1, r3
adds r1, r0
ldr r0, [r1]
stm r4!, {r0}
adds r2, 0x1
cmp r2, 0xC
ble _0804C37E
movs r2, 0
ldr r0, _0804C430 @ =gUnknown_2031764
ldr r5, _0804C42C @ =gSaveBlock1Ptr
movs r7, 0xAA
lsls r7, 1
adds r4, r0, r7
ldr r3, _0804C434 @ =0x00000464
_0804C39E:
lsls r0, r2, 2
ldr r1, [r5]
adds r1, r3
adds r1, r0
ldr r0, [r1]
stm r4!, {r0}
adds r2, 0x1
cmp r2, 0x39
ble _0804C39E
movs r2, 0
ldr r0, _0804C430 @ =gUnknown_2031764
ldr r5, _0804C42C @ =gSaveBlock1Ptr
movs r1, 0x8F
lsls r1, 2
adds r4, r0, r1
ldr r3, _0804C438 @ =0x0000054c
_0804C3BE:
lsls r0, r2, 2
ldr r1, [r5]
adds r1, r3
adds r1, r0
ldr r0, [r1]
stm r4!, {r0}
adds r2, 0x1
cmp r2, 0x2A
ble _0804C3BE
ldr r0, _0804C430 @ =gUnknown_2031764
ldr r5, _0804C42C @ =gSaveBlock1Ptr
mov r8, r5
movs r6, 0xBA
lsls r6, 2
adds r4, r0, r6
movs r3, 0
ldr r7, _0804C43C @ =0x00002cd0
mov r9, r7
movs r2, 0xF
_0804C3E4:
mov r0, r8
ldr r1, [r0]
adds r1, r3
adds r0, r4, 0
add r1, r9
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
adds r4, 0x24
adds r3, 0x24
subs r2, 0x1
cmp r2, 0
bge _0804C3E4
mov r1, r10
ldr r0, [r1]
movs r5, 0xF2
lsls r5, 4
adds r0, r5
ldr r0, [r0]
mov r6, r12
str r0, [r6]
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0804C424: .4byte gUnknown_2031C8C
_0804C428: .4byte gSaveBlock2Ptr
_0804C42C: .4byte gSaveBlock1Ptr
_0804C430: .4byte gUnknown_2031764
_0804C434: .4byte 0x00000464
_0804C438: .4byte 0x0000054c
_0804C43C: .4byte 0x00002cd0
thumb_func_end copy_bags_and_unk_data_from_save_blocks
thumb_func_start sub_804C440
sub_804C440: @ 804C440
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
movs r2, 0
ldr r0, _0804C550 @ =gSaveBlock2Ptr
mov r8, r0
ldr r1, _0804C554 @ =gUnknown_2031C8C
mov r12, r1
ldr r5, _0804C558 @ =gSaveBlock1Ptr
movs r3, 0xC4
lsls r3, 2
ldr r4, _0804C55C @ =gUnknown_2031764
_0804C45C:
ldr r0, [r5]
lsls r1, r2, 2
adds r0, r3
adds r0, r1
ldm r4!, {r1}
str r1, [r0]
adds r2, 0x1
cmp r2, 0x29
ble _0804C45C
movs r2, 0
ldr r5, _0804C558 @ =gSaveBlock1Ptr
movs r4, 0xEE
lsls r4, 2
ldr r0, _0804C55C @ =gUnknown_2031764
adds r3, r0, 0
adds r3, 0xA8
_0804C47C:
ldr r0, [r5]
lsls r1, r2, 2
adds r0, r4
adds r0, r1
ldm r3!, {r1}
str r1, [r0]
adds r2, 0x1
cmp r2, 0x1D
ble _0804C47C
movs r2, 0
ldr r5, _0804C558 @ =gSaveBlock1Ptr
movs r4, 0x86
lsls r4, 3
ldr r0, _0804C55C @ =gUnknown_2031764
movs r6, 0x90
lsls r6, 1
adds r3, r0, r6
_0804C49E:
ldr r0, [r5]
lsls r1, r2, 2
adds r0, r4
adds r0, r1
ldm r3!, {r1}
str r1, [r0]
adds r2, 0x1
cmp r2, 0xC
ble _0804C49E
movs r2, 0
ldr r5, _0804C558 @ =gSaveBlock1Ptr
ldr r4, _0804C560 @ =0x00000464
ldr r0, _0804C55C @ =gUnknown_2031764
movs r7, 0xAA
lsls r7, 1
adds r3, r0, r7
_0804C4BE:
ldr r0, [r5]
lsls r1, r2, 2
adds r0, r4
adds r0, r1
ldm r3!, {r1}
str r1, [r0]
adds r2, 0x1
cmp r2, 0x39
ble _0804C4BE
movs r2, 0
ldr r5, _0804C558 @ =gSaveBlock1Ptr
ldr r4, _0804C564 @ =0x0000054c
ldr r0, _0804C55C @ =gUnknown_2031764
movs r1, 0x8F
lsls r1, 2
adds r3, r0, r1
_0804C4DE:
ldr r0, [r5]
lsls r1, r2, 2
adds r0, r4
adds r0, r1
ldm r3!, {r1}
str r1, [r0]
adds r2, 0x1
cmp r2, 0x2A
ble _0804C4DE
ldr r2, _0804C558 @ =gSaveBlock1Ptr
mov r9, r2
ldr r5, _0804C568 @ =0x00002cd0
mov r10, r5
ldr r4, _0804C55C @ =gUnknown_2031764
movs r3, 0
movs r2, 0xF
_0804C4FE:
mov r6, r9
ldr r1, [r6]
adds r1, r3
add r1, r10
movs r7, 0xBA
lsls r7, 2
adds r0, r4, r7
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
adds r4, 0x24
adds r3, 0x24
subs r2, 0x1
cmp r2, 0
bge _0804C4FE
mov r1, r8
ldr r0, [r1]
movs r5, 0xF2
lsls r5, 4
adds r0, r5
ldr r4, [r0]
mov r2, r12
ldr r1, [r2]
str r1, [r0]
adds r0, r4, 0
bl ApplyNewEncryptionKeyToBagItems
mov r6, r8
ldr r0, [r6]
adds r0, r5
str r4, [r0]
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0804C550: .4byte gSaveBlock2Ptr
_0804C554: .4byte gUnknown_2031C8C
_0804C558: .4byte gSaveBlock1Ptr
_0804C55C: .4byte gUnknown_2031764
_0804C560: .4byte 0x00000464
_0804C564: .4byte 0x0000054c
_0804C568: .4byte 0x00002cd0
thumb_func_end sub_804C440
thumb_func_start sub_804C56C
sub_804C56C: @ 804C56C
ldr r2, _0804C584 @ =gSaveBlock2Ptr
ldr r2, [r2]
movs r3, 0xF2
lsls r3, 4
adds r2, r3
ldr r2, [r2]
ldrh r3, [r0]
eors r2, r3
eors r2, r1
strh r2, [r0]
bx lr
.align 2, 0
_0804C584: .4byte gSaveBlock2Ptr
thumb_func_end sub_804C56C
thumb_func_start sub_804C588
sub_804C588: @ 804C588
ldr r2, _0804C5A0 @ =gSaveBlock2Ptr
ldr r3, [r2]
movs r2, 0xF2
lsls r2, 4
adds r3, r2
ldr r2, [r0]
ldr r3, [r3]
eors r2, r3
eors r2, r1
str r2, [r0]
bx lr
.align 2, 0
_0804C5A0: .4byte gSaveBlock2Ptr
thumb_func_end sub_804C588
thumb_func_start sub_804C5A4
sub_804C5A4: @ 804C5A4
push {r4-r7,lr}
adds r5, r0, 0
ldr r7, _0804C5F8 @ =gSaveBlock1Ptr
ldr r6, _0804C5FC @ =0x00003d38
movs r4, 0x3
_0804C5AE:
ldr r0, [r7]
adds r0, r6
adds r0, 0x4
adds r1, r5, 0
bl sub_804C588
adds r6, 0xC
subs r4, 0x1
cmp r4, 0
bge _0804C5AE
adds r0, r5, 0
bl sub_8054F38
adds r0, r5, 0
bl ApplyNewEncryptionKeyToBagItems_
adds r0, r5, 0
bl sub_815EE6C
ldr r4, _0804C5F8 @ =gSaveBlock1Ptr
ldr r0, [r4]
movs r1, 0xA4
lsls r1, 2
adds r0, r1
adds r1, r5, 0
bl sub_804C588
ldr r0, [r4]
movs r1, 0xA5
lsls r1, 2
adds r0, r1
adds r1, r5, 0
bl sub_804C56C
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0804C5F8: .4byte gSaveBlock1Ptr
_0804C5FC: .4byte 0x00003d38
thumb_func_end sub_804C5A4
.align 2, 0 @ Don't pad with nop.
asm/mail_data.s
+8 -8
View File
@@ -301,11 +301,11 @@ _08097E36:
mov r0, r8
movs r1, 0x40
mov r2, r9
bl sub_804037C
bl SetMonData
mov r0, r8
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, r9
ldrb r0, [r1]
b _08097EEE
@@ -413,7 +413,7 @@ GiveMailToMon2: @ 8097F44
adds r0, r6, 0
movs r1, 0x40
adds r2, r4, 0
bl sub_804037C
bl SetMonData
mov r0, sp
strb r5, [r0]
mov r1, sp
@@ -422,7 +422,7 @@ GiveMailToMon2: @ 8097F44
adds r0, r6, 0
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
ldrb r0, [r4]
b _08097FAA
.align 2, 0
@@ -476,11 +476,11 @@ TakeMailFromMon: @ 8097FB8
strb r1, [r0, 0x1]
adds r0, r4, 0
movs r1, 0x40
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
_08098008:
add sp, 0x8
pop {r4}
@@ -577,11 +577,11 @@ _08098060:
adds r0, r5, 0
movs r1, 0x40
mov r2, r9
bl sub_804037C
bl SetMonData
adds r0, r5, 0
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
adds r0, r7, 0
b _080980E8
.align 2, 0
asm/main_menu.s
+2 -2
View File
@@ -254,7 +254,7 @@ _0800C4E8:
movs r0, 0x54
movs r1, 0x7
bl SetGpuReg
ldr r0, _0800C53C @ =gUnknown_30053A0
ldr r0, _0800C53C @ =gSaveFileStatus
ldrh r4, [r0]
cmp r4, 0x2
beq _0800C58C
@@ -267,7 +267,7 @@ _0800C4E8:
b _0800C5E8
.align 2, 0
_0800C538: .4byte gUnknown_2037AB8
_0800C53C: .4byte gUnknown_30053A0
_0800C53C: .4byte gSaveFileStatus
_0800C540:
cmp r4, 0x4
beq _0800C60C
asm/map_obj_80688E4.s
+6 -6
View File
@@ -86,7 +86,7 @@ _0806896E:
player_bitmagic: @ 8068974
push {r4,r5,lr}
movs r4, 0
ldr r5, _080689A8 @ =gUnknown_2036E38
ldr r5, _080689A8 @ =gMapObjects
_0806897A:
lsls r0, r4, 3
adds r0, r4
@@ -112,7 +112,7 @@ _08068998:
pop {r0}
bx r0
.align 2, 0
_080689A8: .4byte gUnknown_2036E38
_080689A8: .4byte gMapObjects
_080689AC: .4byte gUnknown_2037078
thumb_func_end player_bitmagic
@@ -122,7 +122,7 @@ FreezeMapObjectsExceptOne: @ 80689B0
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
ldr r6, _080689EC @ =gUnknown_2036E38
ldr r6, _080689EC @ =gMapObjects
_080689BA:
cmp r4, r5
beq _080689DC
@@ -150,7 +150,7 @@ _080689DC:
pop {r0}
bx r0
.align 2, 0
_080689EC: .4byte gUnknown_2036E38
_080689EC: .4byte gMapObjects
_080689F0: .4byte gUnknown_2037078
thumb_func_end FreezeMapObjectsExceptOne
@@ -213,7 +213,7 @@ _08068A58: .4byte gSprites
UnfreezeMapObjects: @ 8068A5C
push {r4,r5,lr}
movs r4, 0
ldr r5, _08068A88 @ =gUnknown_2036E38
ldr r5, _08068A88 @ =gMapObjects
_08068A62:
lsls r0, r4, 3
adds r0, r4
@@ -235,7 +235,7 @@ _08068A78:
pop {r0}
bx r0
.align 2, 0
_08068A88: .4byte gUnknown_2036E38
_08068A88: .4byte gMapObjects
thumb_func_end UnfreezeMapObjects
thumb_func_start little_step
asm/map_obj_lock.s
+12 -12
View File
@@ -100,7 +100,7 @@ _080695F6:
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0806961E
ldr r2, _08069640 @ =gUnknown_2036E38
ldr r2, _08069640 @ =gMapObjects
ldr r0, _08069644 @ =gUnknown_3005074
ldrb r1, [r0]
lsls r0, r1, 3
@@ -132,7 +132,7 @@ _08069634:
bx r0
.align 2, 0
_0806963C: .4byte gTasks
_08069640: .4byte gUnknown_2036E38
_08069640: .4byte gMapObjects
_08069644: .4byte gUnknown_3005074
thumb_func_end sub_80695CC
@@ -167,7 +167,7 @@ LockSelectedMapObject: @ 806966C
bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r2, _080696B8 @ =gUnknown_2036E38
ldr r2, _080696B8 @ =gMapObjects
ldrb r1, [r4]
lsls r0, r1, 3
adds r0, r1
@@ -193,7 +193,7 @@ _080696AA:
.align 2, 0
_080696B0: .4byte gUnknown_3005074
_080696B4: .4byte sub_80695CC
_080696B8: .4byte gUnknown_2036E38
_080696B8: .4byte gMapObjects
_080696BC: .4byte gTasks
thumb_func_end LockSelectedMapObject
@@ -210,7 +210,7 @@ sub_80696C0: @ 80696C0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080696EC @ =gUnknown_2036E38
ldr r1, _080696EC @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80974D8
@@ -218,13 +218,13 @@ sub_80696C0: @ 80696C0
pop {r0}
bx r0
.align 2, 0
_080696EC: .4byte gUnknown_2036E38
_080696EC: .4byte gMapObjects
thumb_func_end sub_80696C0
thumb_func_start sub_80696F0
sub_80696F0: @ 80696F0
push {r4,lr}
ldr r4, _08069738 @ =gUnknown_2036E38
ldr r4, _08069738 @ =gMapObjects
ldr r0, _0806973C @ =gUnknown_3005074
ldrb r1, [r0]
lsls r0, r1, 3
@@ -256,7 +256,7 @@ _0806970E:
pop {r0}
bx r0
.align 2, 0
_08069738: .4byte gUnknown_2036E38
_08069738: .4byte gMapObjects
_0806973C: .4byte gUnknown_3005074
thumb_func_end sub_80696F0
@@ -268,7 +268,7 @@ sub_8069740: @ 8069740
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08069760 @ =gUnknown_2036E38
ldr r1, _08069760 @ =gMapObjects
adds r0, r1
ldr r1, _08069764 @ =gUnknown_20370D4
ldrb r1, [r1]
@@ -277,7 +277,7 @@ sub_8069740: @ 8069740
bx r0
.align 2, 0
_0806975C: .4byte gUnknown_3005074
_08069760: .4byte gUnknown_2036E38
_08069760: .4byte gMapObjects
_08069764: .4byte gUnknown_20370D4
thumb_func_end sub_8069740
@@ -289,14 +289,14 @@ sub_8069768: @ 8069768
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08069784 @ =gUnknown_2036E38
ldr r1, _08069784 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimActive
pop {r0}
bx r0
.align 2, 0
_08069780: .4byte gUnknown_3005074
_08069784: .4byte gUnknown_2036E38
_08069784: .4byte gMapObjects
thumb_func_end sub_8069768
.align 2, 0 @ Don't pad with nop.
asm/mevent.s
+6 -6
View File
@@ -122,7 +122,7 @@ _081436B8: .4byte gUnknown_3003F84
thumb_func_start sub_81436BC
sub_81436BC: @ 81436BC
push {lr}
ldr r0, _081436E0 @ =gUnknown_201C000
ldr r0, _081436E0 @ =gDecompressionBuffer
movs r2, 0x80
lsls r2, 6
movs r1, 0
@@ -137,7 +137,7 @@ sub_81436BC: @ 81436BC
pop {r0}
bx r0
.align 2, 0
_081436E0: .4byte gUnknown_201C000
_081436E0: .4byte gDecompressionBuffer
_081436E4: .4byte gUnknown_202271A
_081436E8: .4byte 0x00005502
thumb_func_end sub_81436BC
@@ -775,7 +775,7 @@ _08143C12:
strb r0, [r4, 0x8]
b _08143D1A
_08143C1C:
ldr r0, _08143C30 @ =gUnknown_201C000
ldr r0, _08143C30 @ =gDecompressionBuffer
bl sub_815D6B4
strb r0, [r4, 0xE]
ldrb r0, [r4, 0xE]
@@ -784,7 +784,7 @@ _08143C1C:
strb r0, [r4, 0x8]
b _08143D1A
.align 2, 0
_08143C30: .4byte gUnknown_201C000
_08143C30: .4byte gDecompressionBuffer
_08143C34:
ldr r0, _08143C48 @ =gUnknown_3003F64
ldrb r0, [r0]
@@ -803,7 +803,7 @@ _08143C4C:
strb r0, [r4, 0x8]
b _08143D1A
_08143C52:
ldr r0, _08143C70 @ =gUnknown_201C000
ldr r0, _08143C70 @ =gDecompressionBuffer
bl sub_815D794
cmp r0, 0
beq _08143C78
@@ -815,7 +815,7 @@ _08143C52:
strb r0, [r4, 0x8]
b _08143D1A
.align 2, 0
_08143C70: .4byte gUnknown_201C000
_08143C70: .4byte gDecompressionBuffer
_08143C74: .4byte gUnknown_841DE99
_08143C78:
movs r0, 0x16
asm/mevent_server.s
+4 -4
View File
@@ -820,7 +820,7 @@ _08144E30:
.align 2, 0
_08144E48: .4byte gSaveBlock2Ptr
_08144E4C:
ldr r0, _08144E68 @ =gUnknown_201C000
ldr r0, _08144E68 @ =gDecompressionBuffer
ldr r1, [r4, 0x18]
movs r2, 0x80
lsls r2, 3
@@ -837,7 +837,7 @@ _08144E62:
pop {r1}
bx r1
.align 2, 0
_08144E68: .4byte gUnknown_201C000
_08144E68: .4byte gDecompressionBuffer
thumb_func_end sub_8144CA0
thumb_func_start sub_8144E6C
@@ -894,7 +894,7 @@ _08144EB4:
sub_8144EBC: @ 8144EBC
push {r4,lr}
adds r4, r0, 0
ldr r3, _08144EE4 @ =gUnknown_201C000
ldr r3, _08144EE4 @ =gDecompressionBuffer
adds r0, r4, 0x4
ldr r1, _08144EE8 @ =gSaveBlock2Ptr
ldr r1, [r1]
@@ -913,7 +913,7 @@ _08144EDC:
pop {r1}
bx r1
.align 2, 0
_08144EE4: .4byte gUnknown_201C000
_08144EE4: .4byte gDecompressionBuffer
_08144EE8: .4byte gSaveBlock2Ptr
_08144EEC: .4byte gSaveBlock1Ptr
thumb_func_end sub_8144EBC
asm/mystery_event_script.s
+4 -4
View File
@@ -511,20 +511,20 @@ sub_80DAB80: @ 80DAB80
cmp r4, r0
bne _080DABD0
ldr r0, _080DABC8 @ =gStringVar1
ldr r1, _080DABCC @ =gUnknown_8415A62
ldr r1, _080DABCC @ =gText_EggNickname
movs r2, 0xB
bl StringCopyN
b _080DABDA
.align 2, 0
_080DABC8: .4byte gStringVar1
_080DABCC: .4byte gUnknown_8415A62
_080DABCC: .4byte gText_EggNickname
_080DABD0:
ldr r0, _080DABF0 @ =gStringVar1
ldr r1, _080DABF4 @ =gUnknown_8415A66
movs r2, 0xB
bl StringCopyN
_080DABDA:
ldr r0, _080DABF8 @ =gUnknown_2024029
ldr r0, _080DABF8 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r0, 0x6
bne _080DAC04
@@ -536,7 +536,7 @@ _080DABDA:
.align 2, 0
_080DABF0: .4byte gStringVar1
_080DABF4: .4byte gUnknown_8415A66
_080DABF8: .4byte gUnknown_2024029
_080DABF8: .4byte gPlayerPartyCount
_080DABFC: .4byte gStringVar4
_080DAC00: .4byte gUnknown_8488D8E
_080DAC04:
asm/naming_screen.s
+2 -2
View File
@@ -3524,7 +3524,7 @@ sub_809F4F0: @ 809F4F0
ldrh r1, [r0]
movs r0, 0xB
muls r1, r0
ldr r0, _0809F560 @ =gUnknown_8245EE0
ldr r0, _0809F560 @ =gSpeciesNames
adds r1, r0
add r0, sp, 0xC
bl StringCopy
@@ -3565,7 +3565,7 @@ sub_809F4F0: @ 809F4F0
.align 2, 0
_0809F558: .4byte gUnknown_203998C
_0809F55C: .4byte 0x00001e34
_0809F560: .4byte gUnknown_8245EE0
_0809F560: .4byte gSpeciesNames
_0809F564: .4byte 0x00001e28
_0809F568: .4byte 0x00001e14
thumb_func_end sub_809F4F0
asm/new_game.s
+2 -2
View File
@@ -253,7 +253,7 @@ sub_8054A60: @ 8054A60
bl sub_80A0904
bl sub_80A0958
bl sub_806E190
ldr r0, _08054B64 @ =gUnknown_2024029
ldr r0, _08054B64 @ =gPlayerPartyCount
strb r5, [r0]
bl ZeroPlayerPartyMons
bl sub_808C7E0
@@ -291,7 +291,7 @@ _08054B54: .4byte 0x00003a4c
_08054B58: .4byte gUnknown_2031DB0
_08054B5C: .4byte gSaveBlock2Ptr
_08054B60: .4byte 0x00000bb8
_08054B64: .4byte gUnknown_2024029
_08054B64: .4byte gPlayerPartyCount
_08054B68: .4byte 0x00000296
_08054B6C: .4byte gUnknown_81A6481
thumb_func_end sub_8054A60
asm/oak_speech.s
+2 -2
View File
@@ -4637,7 +4637,7 @@ sub_8130F2C: @ 8130F2C
movs r0, 0x1D
movs r1, 0
bl sub_803F7D4
ldr r0, _08130FA8 @ =gUnknown_20244DC
ldr r0, _08130FA8 @ =gMultiuseSpriteTemplate
movs r1, 0x60
movs r2, 0x60
movs r3, 0x1
@@ -4677,7 +4677,7 @@ sub_8130F2C: @ 8130F2C
.align 2, 0
_08130FA0: .4byte gUnknown_8235194
_08130FA4: .4byte gUnknown_82373F4
_08130FA8: .4byte gUnknown_20244DC
_08130FA8: .4byte gMultiuseSpriteTemplate
_08130FAC: .4byte gSprites
_08130FB0: .4byte SpriteCallbackDummy
_08130FB4: .4byte gTasks
asm/overworld.s
+34 -34
View File
@@ -421,7 +421,7 @@ _08054F40:
ldr r0, [r6]
adds r0, r1
adds r1, r5, 0
bl sub_804C588
bl ApplyNewEncryptionKeyToWord
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -4439,7 +4439,7 @@ _08056E60:
thumb_func_start MoveSaveBlocks_ResetHeap_
MoveSaveBlocks_ResetHeap_: @ 8056E74
push {lr}
bl sub_804C0A4
bl MoveSaveBlocks_ResetHeap
pop {r0}
bx r0
thumb_func_end MoveSaveBlocks_ResetHeap_
@@ -4734,7 +4734,7 @@ sub_8057100: @ 8057100
thumb_func_start sub_8057114
sub_8057114: @ 8057114
push {lr}
ldr r2, _08057138 @ =gUnknown_2036E38
ldr r2, _08057138 @ =gMapObjects
ldr r3, _0805713C @ =gUnknown_2037078
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@@ -4750,7 +4750,7 @@ sub_8057114: @ 8057114
pop {r0}
bx r0
.align 2, 0
_08057138: .4byte gUnknown_2036E38
_08057138: .4byte gMapObjects
_0805713C: .4byte gUnknown_2037078
thumb_func_end sub_8057114
@@ -4834,7 +4834,7 @@ sub_80571A8: @ 80571A8
ldrb r0, [r0]
cmp r6, r0
bcs _08057212
ldr r7, _0805722C @ =gUnknown_202273C
ldr r7, _0805722C @ =gLinkPlayers
_080571D8:
lsls r5, r6, 24
lsrs r5, 24
@@ -4874,7 +4874,7 @@ _08057212:
.align 2, 0
_08057224: .4byte gUnknown_300502C
_08057228: .4byte gUnknown_3005030
_0805722C: .4byte gUnknown_202273C
_0805722C: .4byte gLinkPlayers
thumb_func_end sub_80571A8
thumb_func_start sub_8057230
@@ -4885,7 +4885,7 @@ sub_8057230: @ 8057230
ldrb r0, [r0]
cmp r4, r0
bcs _0805725E
ldr r5, _08057268 @ =gUnknown_202273C
ldr r5, _08057268 @ =gLinkPlayers
_0805723E:
lsls r0, r4, 24
lsrs r0, 24
@@ -4908,7 +4908,7 @@ _0805725E:
bx r0
.align 2, 0
_08057264: .4byte gUnknown_3005030
_08057268: .4byte gUnknown_202273C
_08057268: .4byte gLinkPlayers
thumb_func_end sub_8057230
thumb_func_start sub_805726C
@@ -7200,7 +7200,7 @@ SpawnLinkPlayerMapObject: @ 805839C
lsls r5, r6, 3
adds r5, r6
lsls r5, 2
ldr r0, _08058444 @ =gUnknown_2036E38
ldr r0, _08058444 @ =gMapObjects
adds r5, r0
adds r0, r4, 0
bl ZeroLinkPlayerMapObject
@@ -7248,7 +7248,7 @@ SpawnLinkPlayerMapObject: @ 805839C
bx r0
.align 2, 0
_08058440: .4byte gUnknown_2031DEC
_08058444: .4byte gUnknown_2036E38
_08058444: .4byte gMapObjects
thumb_func_end SpawnLinkPlayerMapObject
thumb_func_start InitLinkPlayerMapObjectPos
@@ -7300,7 +7300,7 @@ sub_8058488: @ 8058488
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, _080584B4 @ =gUnknown_2036E38
ldr r0, _080584B4 @ =gMapObjects
adds r1, r0
strb r2, [r1, 0x19]
_080584AA:
@@ -7308,7 +7308,7 @@ _080584AA:
bx r0
.align 2, 0
_080584B0: .4byte gUnknown_2031DEC
_080584B4: .4byte gUnknown_2036E38
_080584B4: .4byte gMapObjects
thumb_func_end sub_8058488
thumb_func_start sub_80584B8
@@ -7322,7 +7322,7 @@ sub_80584B8: @ 80584B8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080584FC @ =gUnknown_2036E38
ldr r1, _080584FC @ =gMapObjects
adds r4, r0, r1
ldrb r0, [r4, 0x4]
cmp r0, 0x40
@@ -7346,7 +7346,7 @@ _080584E4:
bx r0
.align 2, 0
_080584F8: .4byte gUnknown_2031DEC
_080584FC: .4byte gUnknown_2036E38
_080584FC: .4byte gMapObjects
_08058500: .4byte gSprites
thumb_func_end sub_80584B8
@@ -7360,13 +7360,13 @@ sub_8058504: @ 8058504
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08058520 @ =gUnknown_2036E38
ldr r1, _08058520 @ =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x4]
bx lr
.align 2, 0
_0805851C: .4byte gUnknown_2031DEC
_08058520: .4byte gUnknown_2036E38
_08058520: .4byte gMapObjects
thumb_func_end sub_8058504
thumb_func_start sub_8058524
@@ -7379,7 +7379,7 @@ sub_8058524: @ 8058524
lsls r0, r3, 3
adds r0, r3
lsls r0, 2
ldr r3, _08058548 @ =gUnknown_2036E38
ldr r3, _08058548 @ =gMapObjects
adds r0, r3
ldrh r3, [r0, 0x10]
strh r3, [r1]
@@ -7388,7 +7388,7 @@ sub_8058524: @ 8058524
bx lr
.align 2, 0
_08058544: .4byte gUnknown_2031DEC
_08058548: .4byte gUnknown_2036E38
_08058548: .4byte gMapObjects
thumb_func_end sub_8058524
thumb_func_start sub_805854C
@@ -7401,13 +7401,13 @@ sub_805854C: @ 805854C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08058568 @ =gUnknown_2036E38
ldr r1, _08058568 @ =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x19]
bx lr
.align 2, 0
_08058564: .4byte gUnknown_2031DEC
_08058568: .4byte gUnknown_2036E38
_08058568: .4byte gMapObjects
thumb_func_end sub_805854C
thumb_func_start sub_805856C
@@ -7420,7 +7420,7 @@ sub_805856C: @ 805856C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805858C @ =gUnknown_2036E38
ldr r1, _0805858C @ =gMapObjects
adds r0, r1
ldrb r0, [r0, 0xB]
lsls r0, 28
@@ -7428,7 +7428,7 @@ sub_805856C: @ 805856C
bx lr
.align 2, 0
_08058588: .4byte gUnknown_2031DEC
_0805858C: .4byte gUnknown_2036E38
_0805858C: .4byte gMapObjects
thumb_func_end sub_805856C
thumb_func_start sub_8058590
@@ -7441,7 +7441,7 @@ sub_8058590: @ 8058590
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080585B4 @ =gUnknown_2036E38
ldr r1, _080585B4 @ =gMapObjects
adds r0, r1
adds r0, 0x21
movs r1, 0
@@ -7451,7 +7451,7 @@ sub_8058590: @ 8058590
bx lr
.align 2, 0
_080585B0: .4byte gUnknown_2031DEC
_080585B4: .4byte gUnknown_2036E38
_080585B4: .4byte gMapObjects
thumb_func_end sub_8058590
thumb_func_start GetLinkPlayerIdAt
@@ -7479,7 +7479,7 @@ _080585DA:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08058600 @ =gUnknown_2036E38
ldr r1, _08058600 @ =gMapObjects
adds r1, r0, r1
movs r6, 0x10
ldrsh r0, [r1, r6]
@@ -7493,7 +7493,7 @@ _080585DA:
b _08058610
.align 2, 0
_080585FC: .4byte gUnknown_2031DEC
_08058600: .4byte gUnknown_2036E38
_08058600: .4byte gMapObjects
_08058604:
adds r0, r2, 0x1
lsls r0, 24
@@ -7521,7 +7521,7 @@ sub_8058618: @ 8058618
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0805864C @ =gUnknown_2036E38
ldr r1, _0805864C @ =gMapObjects
adds r6, r0, r1
ldrb r0, [r5]
cmp r0, 0
@@ -7535,7 +7535,7 @@ sub_8058618: @ 8058618
b _08058674
.align 2, 0
_08058648: .4byte gUnknown_2031DEC
_0805864C: .4byte gUnknown_2036E38
_0805864C: .4byte gMapObjects
_08058650:
ldr r4, _0805867C @ =gUnknown_826D374
ldr r1, _08058680 @ =gUnknown_826D33C
@@ -7780,7 +7780,7 @@ npc_080587EC: @ 80587EC
mov r12, r2
lsls r3, 16
movs r4, 0
ldr r0, _08058850 @ =gUnknown_2036E38
ldr r0, _08058850 @ =gMapObjects
mov r9, r0
lsrs r2, r3, 16
mov r10, r2
@@ -7820,7 +7820,7 @@ _0805884A:
movs r0, 0x1
b _0805886A
.align 2, 0
_08058850: .4byte gUnknown_2036E38
_08058850: .4byte gMapObjects
_08058854:
adds r0, r4, 0x1
lsls r0, 24
@@ -7857,7 +7857,7 @@ sub_8058878: @ 8058878
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080588B8 @ =gUnknown_2036E38
ldr r1, _080588B8 @ =gMapObjects
adds r4, r0, r1
ldrb r0, [r2]
cmp r0, 0
@@ -7875,7 +7875,7 @@ sub_8058878: @ 8058878
b _080588C6
.align 2, 0
_080588B4: .4byte gUnknown_2031DEC
_080588B8: .4byte gUnknown_2036E38
_080588B8: .4byte gMapObjects
_080588BC:
ldrb r0, [r4]
lsls r0, 30
@@ -7931,7 +7931,7 @@ SpriteCB_LinkPlayer: @ 805890C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08058974 @ =gUnknown_2036E38
ldr r1, _08058974 @ =gMapObjects
adds r6, r0, r1
ldrh r0, [r6, 0xC]
strh r0, [r5, 0x20]
@@ -7967,7 +7967,7 @@ SpriteCB_LinkPlayer: @ 805890C
b _0805898A
.align 2, 0
_08058970: .4byte gUnknown_2031DEC
_08058974: .4byte gUnknown_2036E38
_08058974: .4byte gMapObjects
_08058978:
ldrb r0, [r6, 0x19]
bl get_go_image_anim_num
asm/party_menu.s
+60 -60
View File
@@ -1299,7 +1299,7 @@ _0811F4A2:
adds r0, r6, 0
movs r1, 0x3
adds r2, r4, 0
bl sub_8042EC4
bl GetEvolutionTargetSpecies
lsls r0, 16
cmp r0, 0
bne _0811F492
@@ -2796,12 +2796,12 @@ _08120016:
_08120024:
cmp r1, 0x6
bne _08120034
ldr r0, _08120030 @ =gUnknown_2024029
ldr r0, _08120030 @ =gPlayerPartyCount
ldrb r0, [r0]
subs r0, 0x1
b _081200EC
.align 2, 0
_08120030: .4byte gUnknown_2024029
_08120030: .4byte gPlayerPartyCount
_08120034:
cmp r1, 0x7
bne _08120058
@@ -2816,12 +2816,12 @@ _08120034:
.align 2, 0
_08120048: .4byte gUnknown_203B09C
_0812004C:
ldr r0, _08120054 @ =gUnknown_2024029
ldr r0, _08120054 @ =gPlayerPartyCount
ldrb r0, [r0]
subs r0, 0x1
b _081200EC
.align 2, 0
_08120054: .4byte gUnknown_2024029
_08120054: .4byte gPlayerPartyCount
_08120058:
subs r0, 0x1
b _081200EC
@@ -2833,7 +2833,7 @@ _0812005C:
beq _081200EA
movs r1, 0
ldrsb r1, [r4, r1]
ldr r0, _08120084 @ =gUnknown_2024029
ldr r0, _08120084 @ =gPlayerPartyCount
ldrb r0, [r0]
subs r0, 0x1
cmp r1, r0
@@ -2847,7 +2847,7 @@ _0812005C:
movs r0, 0x6
b _081200EC
.align 2, 0
_08120084: .4byte gUnknown_2024029
_08120084: .4byte gPlayerPartyCount
_08120088: .4byte gUnknown_203B09C
_0812008C:
movs r0, 0x7
@@ -2856,7 +2856,7 @@ _08120090:
adds r0, r2, 0x1
b _081200EC
_08120094:
ldr r0, _081200B8 @ =gUnknown_2024029
ldr r0, _081200B8 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r0, 0x1
beq _081200EE
@@ -2874,7 +2874,7 @@ _08120094:
movs r0, 0x1
b _081200EC
.align 2, 0
_081200B8: .4byte gUnknown_2024029
_081200B8: .4byte gPlayerPartyCount
_081200BC: .4byte gUnknown_203B09C
_081200C0:
movs r0, 0
@@ -2947,12 +2947,12 @@ _08120124:
_08120132:
cmp r0, 0x6
bne _08120144
ldr r0, _08120140 @ =gUnknown_2024029
ldr r0, _08120140 @ =gPlayerPartyCount
ldrb r0, [r0]
subs r0, 0x1
b _0812028E
.align 2, 0
_08120140: .4byte gUnknown_2024029
_08120140: .4byte gPlayerPartyCount
_08120144:
cmp r0, 0x7
bne _08120160
@@ -3557,7 +3557,7 @@ _081205F2:
adds r0, r6, 0
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
_08120606:
add sp, 0x4
pop {r4-r7}
@@ -3592,7 +3592,7 @@ _0812062C:
adds r0, r4, 0
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
movs r0, 0x2
b _0812064E
_0812064C:
@@ -3672,7 +3672,7 @@ sub_81206A8: @ 81206A8
adds r0, r4
movs r1, 0x39
adds r2, r7, 0
bl sub_804037C
bl SetMonData
movs r3, 0x8
ldrsh r2, [r7, r3]
adds r0, r2, 0
@@ -3961,7 +3961,7 @@ sub_81208E4: @ 81208E4
cmp r0, 0
bne _08120944
movs r4, 0
ldr r0, _0812093C @ =gUnknown_2024029
ldr r0, _0812093C @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r4, r0
bcs _0812096E
@@ -3980,7 +3980,7 @@ _0812090C:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0812093C @ =gUnknown_2024029
ldr r0, _0812093C @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r4, r0
bcc _0812090C
@@ -3988,7 +3988,7 @@ _0812090C:
.align 2, 0
_08120934: .4byte gUnknown_203B0A0
_08120938: .4byte gUnknown_20370C2
_0812093C: .4byte gUnknown_2024029
_0812093C: .4byte gPlayerPartyCount
_08120940: .4byte gPlayerParty
_08120944:
movs r4, 0
@@ -4009,7 +4009,7 @@ _08120948:
lsls r0, 24
lsrs r4, r0, 24
_08120966:
ldr r0, _08120978 @ =gUnknown_2024029
ldr r0, _08120978 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r4, r0
bcc _08120948
@@ -4019,7 +4019,7 @@ _0812096E:
bx r0
.align 2, 0
_08120974: .4byte gPlayerParty
_08120978: .4byte gUnknown_2024029
_08120978: .4byte gPlayerPartyCount
thumb_func_end sub_81208E4
thumb_func_start sub_812097C
@@ -4877,7 +4877,7 @@ _08120FAC: .4byte sub_8120FB0
sub_8120FB0: @ 8120FB0
push {lr}
bl FreeRestoreBattleData
bl sub_804C230
bl LoadPlayerParty
bl sub_815AC20
ldr r0, _08120FC8 @ =sub_815ABFC
bl SetMainCallback2
@@ -6010,7 +6010,7 @@ _081218EC:
movs r0, 0xB
adds r1, r5, 0
muls r1, r0
ldr r0, _0812190C @ =gUnknown_8245EE0
ldr r0, _0812190C @ =gSpeciesNames
adds r1, r0
mov r0, r9
bl StringCompare
@@ -6024,7 +6024,7 @@ _08121900:
beq _08121950
b _08121982
.align 2, 0
_0812190C: .4byte gUnknown_8245EE0
_0812190C: .4byte gSpeciesNames
_08121910:
ldr r5, _08121944 @ =gUnknown_845A2B8
ldrb r0, [r5]
@@ -8673,7 +8673,7 @@ sub_8122D78: @ 8122D78
_08122D8C:
ldr r0, _08122DB0 @ =gPlayerParty
ldrb r1, [r4, 0x9]
ldr r2, _08122DB4 @ =gUnknown_2024029
ldr r2, _08122DB4 @ =gPlayerPartyCount
ldrb r2, [r2]
subs r2, 0x1
lsls r2, 24
@@ -8689,7 +8689,7 @@ _08122D8C:
.align 2, 0
_08122DAC: .4byte gUnknown_203B0A0
_08122DB0: .4byte gPlayerParty
_08122DB4: .4byte gUnknown_2024029
_08122DB4: .4byte gPlayerPartyCount
_08122DB8: .4byte sub_8122DBC
thumb_func_end sub_8122D78
@@ -10327,7 +10327,7 @@ sub_8123ACC: @ 8123ACC
adds r0, r5, 0
movs r1, 0xC
adds r2, r4, 0
bl sub_804037C
bl SetMonData
ldrh r0, [r4]
movs r1, 0x1
bl sub_809A1D8
@@ -12727,7 +12727,7 @@ sub_8124E48: @ 8124E48
muls r0, r6
adds r0, r5
movs r1, 0x4
bl sub_80436F8
bl AdjustFriendship
ldrh r1, [r7]
movs r0, 0xA9
lsls r0, 1
@@ -12815,7 +12815,7 @@ sub_8124EFC: @ 8124EFC
bl SetMonMoveSlot
adds r0, r5, 0
movs r1, 0x4
bl sub_80436F8
bl AdjustFriendship
ldrh r2, [r7]
movs r0, 0x4
adds r1, r5, 0
@@ -12920,7 +12920,7 @@ IsHPRecoveryItem: @ 8125018
_0812502C: .4byte gSaveBlock1Ptr
_08125030: .4byte 0x00003108
_08125034:
ldr r1, _0812504C @ =gUnknown_82528BC
ldr r1, _0812504C @ =gItemEffectTable
subs r0, 0xD
lsls r0, 2
adds r0, r1
@@ -12934,7 +12934,7 @@ _0812503E:
movs r0, 0
b _08125052
.align 2, 0
_0812504C: .4byte gUnknown_82528BC
_0812504C: .4byte gItemEffectTable
_08125050:
movs r0, 0x1
_08125052:
@@ -13217,7 +13217,7 @@ _081252A0:
adds r1, r5, 0
_081252BA:
adds r3, r6, 0
bl ExecuteTableBasedItemEffect_
bl ExecuteTableBasedItemEffect
lsls r0, 24
lsrs r0, 24
pop {r4-r6}
@@ -13278,7 +13278,7 @@ _08125330:
adds r0, r5, 0
adds r1, r6, 0
movs r3, 0
bl sub_8042414
bl PokemonUseItemEffects2
lsls r0, 24
lsrs r4, r0, 24
_08125342:
@@ -13749,7 +13749,7 @@ _08125710: .4byte gUnknown_203AD30
_08125714: .4byte gSaveBlock1Ptr
_08125718: .4byte 0x00003108
_0812571C:
ldr r1, _0812574C @ =gUnknown_82528BC
ldr r1, _0812574C @ =gItemEffectTable
subs r0, 0xD
lsls r0, 2
adds r0, r1
@@ -13773,7 +13773,7 @@ _08125726:
bl sub_8125958
b _0812577E
.align 2, 0
_0812574C: .4byte gUnknown_82528BC
_0812574C: .4byte gItemEffectTable
_08125750: .4byte gUnknown_203B0A0
_08125754:
adds r0, r4, 0
@@ -13882,7 +13882,7 @@ sub_812580C: @ 812580C
ldrh r1, [r1]
ldrb r2, [r3, 0x9]
ldrb r3, [r3, 0xE]
bl sub_8042414
bl PokemonUseItemEffects2
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -14399,7 +14399,7 @@ sub_8125C48: @ 8125C48
bne _08125C84
adds r0, r5, 0
movs r1, 0x4
bl sub_80436F8
bl AdjustFriendship
movs r0, 0xA9
lsls r0, 1
cmp r4, r0
@@ -14637,7 +14637,7 @@ sub_8125E4C: @ 8125E4C
ldr r0, _08125E74 @ =gPlayerParty
ldr r4, _08125E78 @ =gUnknown_203B0A0
ldrb r1, [r4, 0x9]
ldr r2, _08125E7C @ =gUnknown_2024029
ldr r2, _08125E7C @ =gPlayerPartyCount
ldrb r2, [r2]
subs r2, 0x1
lsls r2, 24
@@ -14653,7 +14653,7 @@ sub_8125E4C: @ 8125E4C
.align 2, 0
_08125E74: .4byte gPlayerParty
_08125E78: .4byte gUnknown_203B0A0
_08125E7C: .4byte gUnknown_2024029
_08125E7C: .4byte gPlayerPartyCount
_08125E80: .4byte sub_8125E84
thumb_func_end sub_8125E4C
@@ -15175,7 +15175,7 @@ dp05_rare_candy: @ 81262AC
adds r0, r4, 0
adds r1, r5, 0
movs r3, 0
bl sub_8042414
bl PokemonUseItemEffects2
lsls r0, 24
lsrs r4, r0, 24
b _081262F6
@@ -15693,7 +15693,7 @@ sub_8126704: @ 8126704
adds r0, r7, 0
movs r1, 0
movs r2, 0
bl sub_8042EC4
bl GetEvolutionTargetSpecies
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
@@ -15750,7 +15750,7 @@ sub_8126770: @ 8126770
ldr r1, _081267E4 @ =gStringVar1
bl GetMonNickname
ldr r0, _081267E8 @ =gStringVar2
ldr r6, _081267EC @ =gUnknown_2024022
ldr r6, _081267EC @ =gMoveToLearn
ldrh r2, [r6]
movs r1, 0xD
muls r1, r2
@@ -15786,7 +15786,7 @@ _081267DC: .4byte gUnknown_203B0A0
_081267E0: .4byte gPlayerParty
_081267E4: .4byte gStringVar1
_081267E8: .4byte gStringVar2
_081267EC: .4byte gUnknown_2024022
_081267EC: .4byte gMoveToLearn
_081267F0: .4byte gUnknown_8247094
_081267F4: .4byte gStringVar4
_081267F8: .4byte gUnknown_8416DF7
@@ -16210,7 +16210,7 @@ sub_8126B60: @ 8126B60
ldrh r1, [r1]
ldrb r2, [r2, 0x9]
movs r3, 0
bl sub_8042414
bl PokemonUseItemEffects2
lsls r0, 24
cmp r0, 0
beq _08126BC8
@@ -16297,7 +16297,7 @@ sub_8126C24: @ 8126C24
ldr r1, _08126C5C @ =gUnknown_203AD30
ldrh r2, [r1]
movs r1, 0x2
bl sub_8042EC4
bl GetEvolutionTargetSpecies
lsls r0, 16
lsrs r0, 16
cmp r0, 0x97
@@ -16339,7 +16339,7 @@ _08126C7C:
_08126C8C: .4byte gSaveBlock1Ptr
_08126C90: .4byte 0x00003108
_08126C94:
ldr r1, _08126CC4 @ =gUnknown_82528BC
ldr r1, _08126CC4 @ =gItemEffectTable
lsls r0, r2, 2
adds r0, r1
ldr r4, [r0]
@@ -16365,7 +16365,7 @@ _08126CBE:
movs r0, 0
b _08126DC2
.align 2, 0
_08126CC4: .4byte gUnknown_82528BC
_08126CC4: .4byte gItemEffectTable
_08126CC8:
movs r2, 0x40
adds r0, r2, 0
@@ -16968,7 +16968,7 @@ sub_812713C: @ 812713C
adds r0, r5, 0
movs r1, 0xC
adds r2, r4, 0
bl sub_804037C
bl SetMonData
ldrh r0, [r4]
movs r1, 0x1
bl sub_809A1D8
@@ -18220,7 +18220,7 @@ _08127B3C:
b _08127B68
_08127B40:
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08127B62
@@ -18239,7 +18239,7 @@ _08127B62:
lsls r0, 24
lsrs r4, r0, 24
_08127B68:
ldr r0, _08127B94 @ =gUnknown_2023BCC
ldr r0, _08127B94 @ =gBattlersCount
ldrb r0, [r0]
cmp r4, r0
bcc _08127B40
@@ -18259,7 +18259,7 @@ _08127B68:
b _08127C86
.align 2, 0
_08127B90: .4byte gBattlerPartyIndexes
_08127B94: .4byte gUnknown_2023BCC
_08127B94: .4byte gBattlersCount
_08127B98: .4byte gPlayerParty
_08127B9C: .4byte gStringVar4
_08127BA0: .4byte gUnknown_8416ACB
@@ -18305,7 +18305,7 @@ _08127BEC:
movs r0, 0x1
strb r0, [r1]
ldr r1, _08127C38 @ =gBattlerPartyIndexes
ldr r0, _08127C3C @ =gUnknown_2024004
ldr r0, _08127C3C @ =gBattlerInMenuId
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -18328,7 +18328,7 @@ _08127BEC:
_08127C30: .4byte gUnknown_203B0C1
_08127C34: .4byte gUnknown_203B0C0
_08127C38: .4byte gBattlerPartyIndexes
_08127C3C: .4byte gUnknown_2024004
_08127C3C: .4byte gBattlerInMenuId
_08127C40:
movs r0, 0x64
muls r0, r5
@@ -18345,7 +18345,7 @@ _08127C58: .4byte gStringVar1
_08127C5C: .4byte gStringVar4
_08127C60: .4byte gUnknown_8416A3A
_08127C64:
ldr r0, _08127C98 @ =gUnknown_2024004
ldr r0, _08127C98 @ =gBattlerInMenuId
ldrb r0, [r0]
ldr r1, _08127C9C @ =gBattlerPartyIndexes
lsls r0, 1
@@ -18371,7 +18371,7 @@ _08127C8C:
pop {r1}
bx r1
.align 2, 0
_08127C98: .4byte gUnknown_2024004
_08127C98: .4byte gBattlerInMenuId
_08127C9C: .4byte gBattlerPartyIndexes
_08127CA0: .4byte gStringVar1
_08127CA4: .4byte gStringVar4
@@ -18431,7 +18431,7 @@ _08127D02:
bne _08127D40
movs r5, 0x1
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
mov r2, sp
ldr r1, _08127D3C @ =gBattlerPartyIndexes
lsls r0, 24
@@ -18459,7 +18459,7 @@ _08127D3C: .4byte gBattlerPartyIndexes
_08127D40:
movs r5, 0x2
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
mov r1, sp
ldr r4, _08127DA4 @ =gBattlerPartyIndexes
lsls r0, 24
@@ -18468,7 +18468,7 @@ _08127D40:
ldrh r0, [r0]
strb r0, [r1]
movs r0, 0x2
bl GetBankByIdentity
bl GetBattlerAtPosition
mov r1, sp
lsls r0, 24
lsrs r0, 23
@@ -18545,24 +18545,24 @@ sub_8127DCC: @ 8127DCC
lsrs r7, r1, 24
lsls r0, 24
lsrs r0, 24
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08127DF4
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x2
b _08127E00
_08127DF4:
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
_08127E00:
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r6, r0, 24
bl sub_811FA20
asm/pokeball.s
+14 -14
View File
@@ -90,7 +90,7 @@ _0804A9D8:
mov r9, r0
ldrb r6, [r1, 0xE]
adds r0, r6, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0804AA04
@@ -130,7 +130,7 @@ _0804AA12:
ands r0, r1
cmp r0, 0
beq _0804AA60
ldr r4, _0804AA5C @ =gUnknown_202273C
ldr r4, _0804AA5C @ =gLinkPlayers
adds r0, r6, 0
bl GetBankMultiplayerId
lsls r1, r0, 3
@@ -144,7 +144,7 @@ _0804AA12:
_0804AA50: .4byte gBattlerPartyIndexes
_0804AA54: .4byte gPlayerParty
_0804AA58: .4byte gBattleTypeFlags
_0804AA5C: .4byte gUnknown_202273C
_0804AA5C: .4byte gLinkPlayers
_0804AA60:
ldr r0, _0804AAB8 @ =gSaveBlock2Ptr
ldr r0, [r0]
@@ -247,7 +247,7 @@ _0804AB30: .4byte gSprites
_0804AB34: .4byte SpriteCB_OpponentMonSendOut
_0804AB38:
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r1, _0804AB64 @ =gBattlerTarget
strb r0, [r1]
movs r2, 0x1
@@ -1213,7 +1213,7 @@ sub_804B268: @ 804B268
b _0804B420
_0804B2DA:
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0804B310
@@ -1253,13 +1253,13 @@ _0804B324:
lsrs r0, 16
mov r8, r0
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
cmp r5, r0
beq _0804B34E
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -1323,13 +1323,13 @@ _0804B3C8: .4byte 0x0000ffff
_0804B3CC: .4byte gUnknown_2024018
_0804B3D0:
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
cmp r5, r0
beq _0804B3EC
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -1858,7 +1858,7 @@ _0804B7C8:
movs r0, 0x3A
ldrsh r4, [r5, r0]
movs r0, 0x2
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -1935,7 +1935,7 @@ SpriteCB_OpponentMonSendOut: @ 804B868
movs r0, 0x3A
ldrsh r4, [r5, r0]
movs r0, 0x3
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -2612,7 +2612,7 @@ sub_804BD94: @ 804BD94
ldr r0, _0804BE1C @ =sub_804BE48
str r0, [r4, 0x1C]
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0804BDE2
@@ -2641,7 +2641,7 @@ _0804BDE2:
ldr r1, [r1]
bl _call_via_r1
adds r0, r5, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -2856,7 +2856,7 @@ GetBankPokeballItemId: @ 804BF90
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0804BFBC
asm/pokedex_screen.s
+20 -20
View File
@@ -1967,7 +1967,7 @@ _0810356C:
lsrs r0, 16
movs r1, 0xB
muls r0, r1
ldr r1, _081035C0 @ =gUnknown_8245EE0
ldr r1, _081035C0 @ =gSpeciesNames
adds r0, r1
str r0, [r2]
mov r10, r5
@@ -1975,7 +1975,7 @@ _0810356C:
b _081035D6
.align 2, 0
_081035BC: .4byte gUnknown_203ACF0
_081035C0: .4byte gUnknown_8245EE0
_081035C0: .4byte gSpeciesNames
_081035C4:
ldr r2, _081035FC @ =gUnknown_203ACF0
ldr r0, [r2]
@@ -2048,7 +2048,7 @@ _0810360C:
lsrs r0, 16
movs r1, 0xB
muls r0, r1
ldr r1, _08103698 @ =gUnknown_8245EE0
ldr r1, _08103698 @ =gSpeciesNames
adds r0, r1
str r0, [r2]
adds r0, r5, 0
@@ -2080,7 +2080,7 @@ _08103682:
.align 2, 0
_08103690: .4byte gUnknown_203ACF0
_08103694: .4byte gUnknown_8443FC0
_08103698: .4byte gUnknown_8245EE0
_08103698: .4byte gSpeciesNames
_0810369C:
movs r1, 0
mov r8, r1
@@ -2124,7 +2124,7 @@ _081036A4:
lsrs r0, 16
movs r1, 0xB
muls r0, r1
ldr r1, _08103738 @ =gUnknown_8245EE0
ldr r1, _08103738 @ =gSpeciesNames
adds r0, r1
str r0, [r2]
adds r0, r5, 0
@@ -2156,7 +2156,7 @@ _08103722:
.align 2, 0
_08103730: .4byte gUnknown_203ACF0
_08103734: .4byte gUnknown_84448FE
_08103738: .4byte gUnknown_8245EE0
_08103738: .4byte gSpeciesNames
_0810373C:
movs r1, 0
mov r8, r1
@@ -2197,7 +2197,7 @@ _08103744:
lsrs r0, 16
movs r1, 0xB
muls r0, r1
ldr r1, _081037D0 @ =gUnknown_8245EE0
ldr r1, _081037D0 @ =gSpeciesNames
adds r0, r1
str r0, [r2]
adds r0, r5, 0
@@ -2228,7 +2228,7 @@ _081037BA:
.align 2, 0
_081037C8: .4byte gUnknown_203ACF0
_081037CC: .4byte gUnknown_84442F6
_081037D0: .4byte gUnknown_8245EE0
_081037D0: .4byte gSpeciesNames
_081037D4: .4byte 0x00000181
_081037D8:
movs r1, 0
@@ -2270,7 +2270,7 @@ _081037E0:
lsrs r0, 16
movs r1, 0xB
muls r0, r1
ldr r1, _0810386C @ =gUnknown_8245EE0
ldr r1, _0810386C @ =gSpeciesNames
adds r0, r1
str r0, [r2]
adds r0, r5, 0
@@ -2301,7 +2301,7 @@ _08103856:
.align 2, 0
_08103864: .4byte gUnknown_203ACF0
_08103868: .4byte gUnknown_84445FA
_0810386C: .4byte gUnknown_8245EE0
_0810386C: .4byte gSpeciesNames
_08103870: .4byte 0x00000181
_08103874:
movs r1, 0
@@ -2338,7 +2338,7 @@ _08103878:
lsrs r0, 16
movs r1, 0xB
muls r0, r1
ldr r1, _081038CC @ =gUnknown_8245EE0
ldr r1, _081038CC @ =gSpeciesNames
adds r0, r1
str r0, [r2]
mov r10, r5
@@ -2346,7 +2346,7 @@ _08103878:
b _081038E2
.align 2, 0
_081038C8: .4byte gUnknown_203ACF0
_081038CC: .4byte gUnknown_8245EE0
_081038CC: .4byte gSpeciesNames
_081038D0:
ldr r2, _08103918 @ =gUnknown_203ACF0
ldr r0, [r2]
@@ -4988,7 +4988,7 @@ _08104D72:
movs r1, 0xB
mov r2, r8
muls r2, r1
ldr r1, _08104E70 @ =gUnknown_8245EE0
ldr r1, _08104E70 @ =gSpeciesNames
adds r2, r1
movs r1, 0xD
str r1, [sp]
@@ -5038,7 +5038,7 @@ _08104E60: .4byte gUnknown_203ACF0
_08104E64: .4byte gUnknown_84521CC
_08104E68: .4byte gUnknown_8452334
_08104E6C: .4byte gUnknown_8440124
_08104E70: .4byte gUnknown_8245EE0
_08104E70: .4byte gSpeciesNames
_08104E74: .4byte gUnknown_8443600
_08104E78:
ldrb r0, [r1]
@@ -6926,7 +6926,7 @@ sub_8105D64: @ 8105D64
adds r0, r1
ldr r0, [r0]
mov r12, r0
ldr r7, _08105E18 @ =gUnknown_201C000
ldr r7, _08105E18 @ =gDecompressionBuffer
movs r5, 0
movs r1, 0
_08105DA6:
@@ -6988,7 +6988,7 @@ _08105E02:
bx r0
.align 2, 0
_08105E14: .4byte gUnknown_843FAB0
_08105E18: .4byte gUnknown_201C000
_08105E18: .4byte gDecompressionBuffer
thumb_func_end sub_8105D64
thumb_func_start sub_8105E1C
@@ -7091,7 +7091,7 @@ sub_8105E1C: @ 8105E1C
ldrh r2, [r1]
movs r1, 0xB
muls r2, r1
ldr r1, _08105FE0 @ =gUnknown_8245EE0
ldr r1, _08105FE0 @ =gSpeciesNames
adds r2, r1
str r5, [sp]
mov r1, r8
@@ -7189,7 +7189,7 @@ _08105FD0: .4byte gUnknown_84521D4
_08105FD4: .4byte gUnknown_203ACF0
_08105FD8: .4byte gUnknown_84521DC
_08105FDC: .4byte gUnknown_84521E4
_08105FE0: .4byte gUnknown_8245EE0
_08105FE0: .4byte gSpeciesNames
_08105FE4: .4byte gUnknown_8415FAD
_08105FE8: .4byte gUnknown_8415FB3
_08105FEC:
@@ -7710,7 +7710,7 @@ _08106478:
ldr r3, [sp, 0x1C]
adds r2, r3, 0
muls r2, r1
ldr r1, _081066B0 @ =gUnknown_8245EE0
ldr r1, _081066B0 @ =gSpeciesNames
adds r2, r1
movs r1, 0xC
str r1, [sp]
@@ -7973,7 +7973,7 @@ _08106534:
bl SetOamMatrix
b _081066E2
.align 2, 0
_081066B0: .4byte gUnknown_8245EE0
_081066B0: .4byte gSpeciesNames
_081066B4: .4byte gBaseStats
_081066B8: .4byte gUnknown_203ACF0
_081066BC: .4byte gUnknown_8452368
asm/pokemon_1.s
-2431
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_2.s
-3902
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_3.s
+19 -4484
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_item_effect.s
-1972
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_size_record.s
+3 -3
View File
@@ -299,7 +299,7 @@ sub_80A08CC: @ 80A08CC
ldr r0, _080A08FC @ =gStringVar1
movs r1, 0xB
muls r1, r4
ldr r2, _080A0900 @ =gUnknown_8245EE0
ldr r2, _080A0900 @ =gSpeciesNames
adds r1, r2
bl StringCopy
pop {r4}
@@ -308,7 +308,7 @@ sub_80A08CC: @ 80A08CC
.align 2, 0
_080A08F8: .4byte gStringVar3
_080A08FC: .4byte gStringVar1
_080A0900: .4byte gUnknown_8245EE0
_080A0900: .4byte gSpeciesNames
thumb_func_end sub_80A08CC
thumb_func_start sub_80A0904
@@ -454,7 +454,7 @@ _080A09E6:
ldrb r1, [r0]
adds r0, r4, 0
mov r2, r8
bl sub_804037C
bl SetMonData
movs r7, 0x1
_080A0A18:
adds r5, 0x1
asm/pokemon_storage_system.s
+57 -57
View File
@@ -8,14 +8,14 @@
thumb_func_start sub_808B9C0
sub_808B9C0: @ 808B9C0
push {lr}
ldr r1, _0808B9D0 @ =gUnknown_3005010
ldr r1, _0808B9D0 @ =gPokemonStoragePtr
ldr r1, [r1]
ldr r2, _0808B9D4 @ =0x000083d0
bl memcpy
pop {r0}
bx r0
.align 2, 0
_0808B9D0: .4byte gUnknown_3005010
_0808B9D0: .4byte gPokemonStoragePtr
_0808B9D4: .4byte 0x000083d0
thumb_func_end sub_808B9C0
@@ -23,25 +23,25 @@ _0808B9D4: .4byte 0x000083d0
sub_808B9D8: @ 808B9D8
push {lr}
adds r1, r0, 0
ldr r0, _0808B9EC @ =gUnknown_3005010
ldr r0, _0808B9EC @ =gPokemonStoragePtr
ldr r0, [r0]
ldr r2, _0808B9F0 @ =0x000083d0
bl memcpy
pop {r0}
bx r0
.align 2, 0
_0808B9EC: .4byte gUnknown_3005010
_0808B9EC: .4byte gPokemonStoragePtr
_0808B9F0: .4byte 0x000083d0
thumb_func_end sub_808B9D8
thumb_func_start StorageGetCurrentBox
StorageGetCurrentBox: @ 808B9F4
ldr r0, _0808B9FC @ =gUnknown_3005010
ldr r0, _0808B9FC @ =gPokemonStoragePtr
ldr r0, [r0]
ldrb r0, [r0]
bx lr
.align 2, 0
_0808B9FC: .4byte gUnknown_3005010
_0808B9FC: .4byte gPokemonStoragePtr
thumb_func_end StorageGetCurrentBox
thumb_func_start sub_808BA00
@@ -51,14 +51,14 @@ sub_808BA00: @ 808BA00
lsrs r1, r0, 24
cmp r1, 0xD
bhi _0808BA10
ldr r0, _0808BA14 @ =gUnknown_3005010
ldr r0, _0808BA14 @ =gPokemonStoragePtr
ldr r0, [r0]
strb r1, [r0]
_0808BA10:
pop {r0}
bx r0
.align 2, 0
_0808BA14: .4byte gUnknown_3005010
_0808BA14: .4byte gPokemonStoragePtr
thumb_func_end sub_808BA00
thumb_func_start GetBoxMonDataFromAnyBox
@@ -73,7 +73,7 @@ GetBoxMonDataFromAnyBox: @ 808BA18
bhi _0808BA54
cmp r4, 0x1D
bhi _0808BA54
ldr r2, _0808BA50 @ =gUnknown_3005010
ldr r2, _0808BA50 @ =gPokemonStoragePtr
lsls r0, r3, 2
adds r0, r3
lsls r1, r0, 4
@@ -90,7 +90,7 @@ GetBoxMonDataFromAnyBox: @ 808BA18
bl GetBoxMonData
b _0808BA56
.align 2, 0
_0808BA50: .4byte gUnknown_3005010
_0808BA50: .4byte gPokemonStoragePtr
_0808BA54:
movs r0, 0
_0808BA56:
@@ -112,7 +112,7 @@ SetBoxMonDataFromAnyBox: @ 808BA5C
bhi _0808BA94
cmp r4, 0x1D
bhi _0808BA94
ldr r2, _0808BA9C @ =gUnknown_3005010
ldr r2, _0808BA9C @ =gPokemonStoragePtr
lsls r0, r3, 2
adds r0, r3
lsls r1, r0, 4
@@ -127,13 +127,13 @@ SetBoxMonDataFromAnyBox: @ 808BA5C
adds r0, r1
adds r1, r5, 0
adds r2, r6, 0
bl sub_80404D0
bl SetBoxMonData
_0808BA94:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0808BA9C: .4byte gUnknown_3005010
_0808BA9C: .4byte gPokemonStoragePtr
thumb_func_end SetBoxMonDataFromAnyBox
thumb_func_start GetBoxMonDataFromSelectedBox
@@ -143,7 +143,7 @@ GetBoxMonDataFromSelectedBox: @ 808BAA0
adds r2, r1, 0
lsls r3, 24
lsrs r3, 24
ldr r0, _0808BABC @ =gUnknown_3005010
ldr r0, _0808BABC @ =gPokemonStoragePtr
ldr r0, [r0]
ldrb r0, [r0]
adds r1, r3, 0
@@ -151,7 +151,7 @@ GetBoxMonDataFromSelectedBox: @ 808BAA0
pop {r1}
bx r1
.align 2, 0
_0808BABC: .4byte gUnknown_3005010
_0808BABC: .4byte gPokemonStoragePtr
thumb_func_end GetBoxMonDataFromSelectedBox
thumb_func_start SetBoxMonDataFromSelectedBox
@@ -162,7 +162,7 @@ SetBoxMonDataFromSelectedBox: @ 808BAC0
adds r3, r2, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _0808BAE0 @ =gUnknown_3005010
ldr r0, _0808BAE0 @ =gPokemonStoragePtr
ldr r0, [r0]
ldrb r0, [r0]
adds r1, r4, 0
@@ -172,7 +172,7 @@ SetBoxMonDataFromSelectedBox: @ 808BAC0
pop {r0}
bx r0
.align 2, 0
_0808BAE0: .4byte gUnknown_3005010
_0808BAE0: .4byte gPokemonStoragePtr
thumb_func_end SetBoxMonDataFromSelectedBox
thumb_func_start GetBoxMonNickFromAnyBox
@@ -187,7 +187,7 @@ GetBoxMonNickFromAnyBox: @ 808BAE4
bhi _0808BB20
cmp r4, 0x1D
bhi _0808BB20
ldr r2, _0808BB1C @ =gUnknown_3005010
ldr r2, _0808BB1C @ =gPokemonStoragePtr
lsls r0, r3, 2
adds r0, r3
lsls r1, r0, 4
@@ -205,7 +205,7 @@ GetBoxMonNickFromAnyBox: @ 808BAE4
bl GetBoxMonData
b _0808BB24
.align 2, 0
_0808BB1C: .4byte gUnknown_3005010
_0808BB1C: .4byte gPokemonStoragePtr
_0808BB20:
movs r0, 0xFF
strb r0, [r5]
@@ -227,7 +227,7 @@ SetBoxMonNickFromAnyBox: @ 808BB2C
bhi _0808BB62
cmp r4, 0x1D
bhi _0808BB62
ldr r2, _0808BB68 @ =gUnknown_3005010
ldr r2, _0808BB68 @ =gPokemonStoragePtr
lsls r0, r3, 2
adds r0, r3
lsls r1, r0, 4
@@ -242,13 +242,13 @@ SetBoxMonNickFromAnyBox: @ 808BB2C
adds r0, r1
movs r1, 0x2
adds r2, r5, 0
bl sub_80404D0
bl SetBoxMonData
_0808BB62:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0808BB68: .4byte gUnknown_3005010
_0808BB68: .4byte gPokemonStoragePtr
thumb_func_end SetBoxMonNickFromAnyBox
thumb_func_start GetAndCopyBoxMonDataFromAnyBox
@@ -264,7 +264,7 @@ GetAndCopyBoxMonDataFromAnyBox: @ 808BB6C
bhi _0808BBAC
cmp r4, 0x1D
bhi _0808BBAC
ldr r2, _0808BBA8 @ =gUnknown_3005010
ldr r2, _0808BBA8 @ =gPokemonStoragePtr
lsls r0, r3, 2
adds r0, r3
lsls r1, r0, 4
@@ -282,7 +282,7 @@ GetAndCopyBoxMonDataFromAnyBox: @ 808BB6C
bl GetBoxMonData
b _0808BBAE
.align 2, 0
_0808BBA8: .4byte gUnknown_3005010
_0808BBA8: .4byte gPokemonStoragePtr
_0808BBAC:
movs r0, 0
_0808BBAE:
@@ -303,7 +303,7 @@ CopyBoxMonFromAnyBox: @ 808BBB4
bhi _0808BBEA
cmp r1, 0x1D
bhi _0808BBEA
ldr r0, _0808BBF0 @ =gUnknown_3005010
ldr r0, _0808BBF0 @ =gPokemonStoragePtr
ldr r0, [r0]
lsls r3, r1, 2
adds r3, r1
@@ -324,7 +324,7 @@ _0808BBEA:
pop {r0}
bx r0
.align 2, 0
_0808BBF0: .4byte gUnknown_3005010
_0808BBF0: .4byte gPokemonStoragePtr
thumb_func_end CopyBoxMonFromAnyBox
thumb_func_start sub_808BBF4
@@ -339,7 +339,7 @@ sub_808BBF4: @ 808BBF4
bhi _0808BC2A
cmp r2, 0x1D
bhi _0808BC2A
ldr r0, _0808BC30 @ =gUnknown_3005010
ldr r0, _0808BC30 @ =gPokemonStoragePtr
ldr r1, [r0]
lsls r3, r2, 2
adds r3, r2
@@ -360,7 +360,7 @@ _0808BC2A:
pop {r0}
bx r0
.align 2, 0
_0808BC30: .4byte gUnknown_3005010
_0808BC30: .4byte gPokemonStoragePtr
thumb_func_end sub_808BBF4
thumb_func_start sub_808BC34
@@ -395,7 +395,7 @@ sub_808BC34: @ 808BC34
bhi _0808BCA0
cmp r6, 0x1D
bhi _0808BCA0
ldr r2, _0808BCB0 @ =gUnknown_3005010
ldr r2, _0808BCB0 @ =gPokemonStoragePtr
lsls r0, r7, 2
adds r0, r7
lsls r1, r0, 4
@@ -427,7 +427,7 @@ _0808BCA0:
pop {r0}
bx r0
.align 2, 0
_0808BCB0: .4byte gUnknown_3005010
_0808BCB0: .4byte gPokemonStoragePtr
thumb_func_end sub_808BC34
thumb_func_start sub_808BCB4
@@ -441,7 +441,7 @@ sub_808BCB4: @ 808BCB4
bhi _0808BCE4
cmp r4, 0x1D
bhi _0808BCE4
ldr r2, _0808BCEC @ =gUnknown_3005010
ldr r2, _0808BCEC @ =gPokemonStoragePtr
lsls r0, r3, 2
adds r0, r3
lsls r1, r0, 4
@@ -460,7 +460,7 @@ _0808BCE4:
pop {r0}
bx r0
.align 2, 0
_0808BCEC: .4byte gUnknown_3005010
_0808BCEC: .4byte gPokemonStoragePtr
thumb_func_end sub_808BCB4
thumb_func_start sub_808BCF0
@@ -475,7 +475,7 @@ sub_808BCF0: @ 808BCF0
bhi _0808BD24
cmp r4, 0x1D
bhi _0808BD24
ldr r2, _0808BD2C @ =gUnknown_3005010
ldr r2, _0808BD2C @ =gPokemonStoragePtr
lsls r0, r3, 2
adds r0, r3
lsls r1, r0, 4
@@ -495,7 +495,7 @@ _0808BD24:
pop {r0}
bx r0
.align 2, 0
_0808BD2C: .4byte gUnknown_3005010
_0808BD2C: .4byte gPokemonStoragePtr
thumb_func_end sub_808BCF0
thumb_func_start GetBoxedMonPtr
@@ -509,7 +509,7 @@ GetBoxedMonPtr: @ 808BD30
bhi _0808BD64
cmp r4, 0x1D
bhi _0808BD64
ldr r2, _0808BD60 @ =gUnknown_3005010
ldr r2, _0808BD60 @ =gPokemonStoragePtr
lsls r0, r3, 2
adds r0, r3
lsls r1, r0, 4
@@ -524,7 +524,7 @@ GetBoxedMonPtr: @ 808BD30
adds r0, r1
b _0808BD66
.align 2, 0
_0808BD60: .4byte gUnknown_3005010
_0808BD60: .4byte gPokemonStoragePtr
_0808BD64:
movs r0, 0
_0808BD66:
@@ -543,7 +543,7 @@ GetBoxNamePtr: @ 808BD6C
movs r0, 0
b _0808BD88
_0808BD7A:
ldr r0, _0808BD8C @ =gUnknown_3005010
ldr r0, _0808BD8C @ =gPokemonStoragePtr
lsls r1, r2, 3
adds r1, r2
ldr r2, _0808BD90 @ =0x00008344
@@ -554,7 +554,7 @@ _0808BD88:
pop {r1}
bx r1
.align 2, 0
_0808BD8C: .4byte gUnknown_3005010
_0808BD8C: .4byte gPokemonStoragePtr
_0808BD90: .4byte 0x00008344
thumb_func_end GetBoxNamePtr
@@ -568,7 +568,7 @@ sub_808BD94: @ 808BD94
movs r0, 0
b _0808BDAE
_0808BDA2:
ldr r0, _0808BDB4 @ =gUnknown_3005010
ldr r0, _0808BDB4 @ =gPokemonStoragePtr
ldr r0, [r0]
ldr r2, _0808BDB8 @ =0x000083c2
adds r0, r2
@@ -578,7 +578,7 @@ _0808BDAE:
pop {r1}
bx r1
.align 2, 0
_0808BDB4: .4byte gUnknown_3005010
_0808BDB4: .4byte gPokemonStoragePtr
_0808BDB8: .4byte 0x000083c2
thumb_func_end sub_808BD94
@@ -593,7 +593,7 @@ sub_808BDBC: @ 808BDBC
bhi _0808BDDA
cmp r1, 0xF
bhi _0808BDDA
ldr r0, _0808BDE0 @ =gUnknown_3005010
ldr r0, _0808BDE0 @ =gPokemonStoragePtr
ldr r0, [r0]
ldr r3, _0808BDE4 @ =0x000083c2
adds r0, r3
@@ -603,7 +603,7 @@ _0808BDDA:
pop {r0}
bx r0
.align 2, 0
_0808BDE0: .4byte gUnknown_3005010
_0808BDE0: .4byte gPokemonStoragePtr
_0808BDE4: .4byte 0x000083c2
thumb_func_end sub_808BDBC
@@ -6333,7 +6333,7 @@ _0808ECAC:
bne _0808ECD0
bl sub_808FF70
bl CalculatePlayerPartyCount
ldr r1, _0808ECD8 @ =gUnknown_2024029
ldr r1, _0808ECD8 @ =gPlayerPartyCount
strb r0, [r1]
ldr r0, _0808ECDC @ =gUnknown_20397B0
ldr r0, [r0]
@@ -6345,7 +6345,7 @@ _0808ECD0:
pop {r0}
bx r0
.align 2, 0
_0808ECD8: .4byte gUnknown_2024029
_0808ECD8: .4byte gPlayerPartyCount
_0808ECDC: .4byte gUnknown_20397B0
_0808ECE0: .4byte sub_808EE18
thumb_func_end sub_808EBB0
@@ -6476,7 +6476,7 @@ _0808EDE0:
bne _0808EE04
bl sub_808FF70
bl CalculatePlayerPartyCount
ldr r1, _0808EE0C @ =gUnknown_2024029
ldr r1, _0808EE0C @ =gPlayerPartyCount
strb r0, [r1]
ldr r0, _0808EE10 @ =gUnknown_20397B0
ldr r0, [r0]
@@ -6488,7 +6488,7 @@ _0808EE04:
pop {r0}
bx r0
.align 2, 0
_0808EE0C: .4byte gUnknown_2024029
_0808EE0C: .4byte gPlayerPartyCount
_0808EE10: .4byte gUnknown_20397B0
_0808EE14: .4byte sub_808EE18
thumb_func_end sub_808ECE4
@@ -6628,7 +6628,7 @@ sub_808EF0C: @ 808EF0C
adds r0, r1
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
b _0808EF56
.align 2, 0
_0808EF40: .4byte gUnknown_203AD30
@@ -16062,7 +16062,7 @@ sub_8093878: @ 8093878
adds r0, r1
movs r1, 0x8
mov r2, sp
bl sub_804037C
bl SetMonData
b _080938EC
.align 2, 0
_080938A8: .4byte gUnknown_20397B0
@@ -16084,7 +16084,7 @@ _080938B8:
adds r0, r1
movs r1, 0x8
mov r2, sp
bl sub_804037C
bl SetMonData
_080938D8:
movs r0, 0
ldrsb r0, [r4, r0]
@@ -16674,7 +16674,7 @@ _08093D90: .4byte 0x00000cf5
_08093D94:
ldr r2, _08093DD0 @ =0x00000cf5
adds r0, r1, r2
ldr r1, _08093DD4 @ =gUnknown_8415A62
ldr r1, _08093DD4 @ =gText_EggNickname
movs r2, 0
movs r3, 0x8
bl StringCopyPadded
@@ -16702,7 +16702,7 @@ _08093DC6:
b _08093F84
.align 2, 0
_08093DD0: .4byte 0x00000cf5
_08093DD4: .4byte gUnknown_8415A62
_08093DD4: .4byte gText_EggNickname
_08093DD8: .4byte gUnknown_20397B0
_08093DDC: .4byte 0x00000d19
_08093DE0: .4byte 0x00000d3d
@@ -16739,7 +16739,7 @@ _08093DF4:
ldrh r1, [r0]
movs r0, 0xB
muls r1, r0
ldr r0, _08093E8C @ =gUnknown_8245EE0
ldr r0, _08093E8C @ =gSpeciesNames
adds r1, r0
adds r0, r2, 0
movs r2, 0
@@ -16785,7 +16785,7 @@ _08093E7C: .4byte 0x00000cf5
_08093E80: .4byte 0x00000cea
_08093E84: .4byte 0x00000d19
_08093E88: .4byte 0x00000d1a
_08093E8C: .4byte gUnknown_8245EE0
_08093E8C: .4byte gSpeciesNames
_08093E90: .4byte 0x00000d3d
_08093E94: .4byte 0x00000d3e
_08093E98: .4byte 0x00000d3f
@@ -20886,7 +20886,7 @@ _08095DEC:
adds r0, r1
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
adds r0, r7, 0
movs r1, 0x1
bl sub_8090C84
@@ -21032,7 +21032,7 @@ _08095F10:
adds r2, r5
adds r0, r4, 0
movs r1, 0xC
bl sub_804037C
bl SetMonData
mov r1, r8
ldr r0, [r1]
adds r0, r5
@@ -21118,7 +21118,7 @@ _08095FD4:
ldr r1, _08096004 @ =0x00002224
adds r2, r1
movs r1, 0xC
bl sub_804037C
bl SetMonData
mov r0, r8
movs r1, 0
bl sub_8090C84
@@ -21183,7 +21183,7 @@ _08096064:
adds r0, r1
movs r1, 0xC
mov r2, sp
bl sub_804037C
bl SetMonData
adds r0, r7, 0
movs r1, 0x1
bl sub_8090C84
asm/pokemon_summary_screen.s
+18 -18
View File
@@ -3490,7 +3490,7 @@ _08136240:
adds r0, r3
movs r1, 0xB
muls r1, r4
ldr r2, _08136318 @ =gUnknown_8245EE0
ldr r2, _08136318 @ =gSpeciesNames
adds r1, r2
bl StringCompare
cmp r0, 0
@@ -3575,7 +3575,7 @@ _08136308: .4byte 0x00003084
_0813630C: .4byte gUnknown_84161CD
_08136310: .4byte gUnknown_203B140
_08136314: .4byte 0x00003034
_08136318: .4byte gUnknown_8245EE0
_08136318: .4byte gSpeciesNames
_0813631C: .4byte 0x00003290
_08136320: .4byte 0x0000ffff
_08136324: .4byte 0x0000306c
@@ -3973,7 +3973,7 @@ _08136630:
bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r4, _08136790 @ =gUnknown_8253AE4
ldr r4, _08136790 @ =gExperienceTables
adds r2, r5, 0x1
lsls r2, 2
ldr r3, _08136794 @ =gBaseStats
@@ -4084,7 +4084,7 @@ _08136780: .4byte 0x00003290
_08136784: .4byte 0x0000309c
_08136788: .4byte gUnknown_203B144
_0813678C: .4byte 0x000031a4
_08136790: .4byte gUnknown_8253AE4
_08136790: .4byte gExperienceTables
_08136794: .4byte gBaseStats
_08136798: .4byte 0x000031b0
_0813679C: .4byte 0x000031bc
@@ -7631,7 +7631,7 @@ sub_813847C: @ 813847C
eors r0, r1
lsls r0, 24
lsrs r0, 24
ldr r2, _081384C8 @ =gUnknown_202273C
ldr r2, _081384C8 @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -7649,7 +7649,7 @@ sub_813847C: @ 813847C
_081384BC: .4byte gUnknown_203B140
_081384C0: .4byte 0x000032f4
_081384C4: .4byte gEnemyParty
_081384C8: .4byte gUnknown_202273C
_081384C8: .4byte gLinkPlayers
_081384CC: .4byte 0x0000304c
_081384D0:
bl sub_80CC1E4
@@ -9242,29 +9242,29 @@ sub_81390B0: @ 81390B0
adds r1, 0xD
adds r0, r6, 0
mov r2, sp
bl sub_804037C
bl SetMonData
mov r0, r8
ldrb r1, [r0]
adds r1, 0xD
adds r0, r6, 0
ldr r2, [sp, 0x8]
bl sub_804037C
bl SetMonData
ldr r3, _081391E0 @ =gUnknown_203B16D
ldrb r1, [r3]
adds r1, 0x11
adds r0, r6, 0
adds r2, r7, 0
bl sub_804037C
bl SetMonData
mov r0, r8
ldrb r1, [r0]
adds r1, 0x11
adds r0, r6, 0
mov r2, r10
bl sub_804037C
bl SetMonData
adds r0, r6, 0
movs r1, 0x15
adds r2, r4, 0
bl sub_804037C
bl SetMonData
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -9389,29 +9389,29 @@ sub_81391EC: @ 81391EC
adds r1, 0xD
adds r0, r6, 0
mov r2, sp
bl sub_80404D0
bl SetBoxMonData
mov r0, r8
ldrb r1, [r0]
adds r1, 0xD
adds r0, r6, 0
ldr r2, [sp, 0x8]
bl sub_80404D0
bl SetBoxMonData
ldr r3, _0813931C @ =gUnknown_203B16D
ldrb r1, [r3]
adds r1, 0x11
adds r0, r6, 0
adds r2, r7, 0
bl sub_80404D0
bl SetBoxMonData
mov r0, r8
ldrb r1, [r0]
adds r1, 0x11
adds r0, r6, 0
mov r2, r10
bl sub_80404D0
bl SetBoxMonData
adds r0, r6, 0
movs r1, 0x15
adds r2, r4, 0
bl sub_80404D0
bl SetBoxMonData
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -12270,7 +12270,7 @@ _0813A9B4:
bls _0813A9E2
b _0813AAE8
_0813A9E2:
ldr r3, _0813AADC @ =gUnknown_8253AE4
ldr r3, _0813AADC @ =gExperienceTables
adds r1, r5, 0x1
lsls r1, 2
ldr r2, _0813AAE0 @ =gBaseStats
@@ -12395,7 +12395,7 @@ _0813AAB8:
.align 2, 0
_0813AAD4: .4byte gUnknown_203B140
_0813AAD8: .4byte 0x00003290
_0813AADC: .4byte gUnknown_8253AE4
_0813AADC: .4byte gExperienceTables
_0813AAE0: .4byte gBaseStats
_0813AAE4: .4byte gUnknown_203B160
_0813AAE8:
asm/post_battle_event_funcs.s
+1 -1
View File
@@ -78,7 +78,7 @@ _080CA34A:
adds r0, r4, 0
movs r1, 0x43
mov r2, sp
bl sub_804037C
bl SetMonData
movs r6, 0x1
_080CA388:
adds r5, 0x1
asm/quest_log.s
+10 -10
View File
@@ -2194,9 +2194,9 @@ _08111980: .4byte gUnknown_3005E88
sub_8111984: @ 8111984
push {lr}
bl sub_806E6FC
bl ResetSaveCounters
bl Save_ResetSaveCounters
movs r0, 0
bl sub_80DA4FC
bl Save_LoadGameData
ldr r0, _081119B4 @ =sub_8057430
bl SetMainCallback2
ldr r1, _081119B8 @ =gUnknown_3005024
@@ -3591,7 +3591,7 @@ sub_811246C: @ 811246C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _081124B0 @ =gUnknown_2036E38
ldr r1, _081124B0 @ =gMapObjects
adds r4, r0, r1
ldrb r0, [r4, 0x8]
cmp r0, 0xFF
@@ -3618,7 +3618,7 @@ _081124A6:
bl sub_8063E28
b _081124E0
.align 2, 0
_081124B0: .4byte gUnknown_2036E38
_081124B0: .4byte gMapObjects
_081124B4: .4byte gUnknown_203AF9A
_081124B8:
ldr r5, _081124E8 @ =gUnknown_203AF9A
@@ -7157,12 +7157,12 @@ sub_8113EAC: @ 8113EAC
bl GetSpeciesName
b _08113F08
_08113ED0:
ldr r1, _08113EDC @ =gUnknown_8415A62
ldr r1, _08113EDC @ =gText_EggNickname
adds r0, r3, 0
bl StringCopy
b _08113F08
.align 2, 0
_08113EDC: .4byte gUnknown_8415A62
_08113EDC: .4byte gText_EggNickname
_08113EE0:
movs r0, 0xCE
lsls r0, 1
@@ -7171,15 +7171,15 @@ _08113EE0:
movs r0, 0xB
adds r1, r4, 0
muls r1, r0
ldr r0, _08113EFC @ =gUnknown_8245EE0
ldr r0, _08113EFC @ =gSpeciesNames
adds r1, r0
adds r0, r2, 0
bl UnkTextUtil_SetPtrI
b _08113F08
.align 2, 0
_08113EFC: .4byte gUnknown_8245EE0
_08113EFC: .4byte gSpeciesNames
_08113F00:
ldr r1, _08113F10 @ =gUnknown_8415A62
ldr r1, _08113F10 @ =gText_EggNickname
adds r0, r5, 0
bl UnkTextUtil_SetPtrI
_08113F08:
@@ -7187,7 +7187,7 @@ _08113F08:
pop {r0}
bx r0
.align 2, 0
_08113F10: .4byte gUnknown_8415A62
_08113F10: .4byte gText_EggNickname
thumb_func_end sub_8113EAC
thumb_func_start sub_8113F14
asm/quest_log_8150454.s
+10 -10
View File
@@ -64,7 +64,7 @@ sub_81504A8: @ 81504A8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _081504E4 @ =gUnknown_2036E38
ldr r0, _081504E4 @ =gMapObjects
adds r4, r0
movs r0, 0
bl sub_805C808
@@ -84,7 +84,7 @@ sub_81504A8: @ 81504A8
bx r0
.align 2, 0
_081504E0: .4byte gUnknown_2037078
_081504E4: .4byte gUnknown_2036E38
_081504E4: .4byte gMapObjects
thumb_func_end sub_81504A8
thumb_func_start sub_81504E8
@@ -95,7 +95,7 @@ sub_81504E8: @ 81504E8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0815052C @ =gUnknown_2036E38
ldr r0, _0815052C @ =gMapObjects
adds r4, r0
movs r0, 0x1
bl sub_805C808
@@ -118,7 +118,7 @@ sub_81504E8: @ 81504E8
bx r0
.align 2, 0
_08150528: .4byte gUnknown_2037078
_0815052C: .4byte gUnknown_2036E38
_0815052C: .4byte gMapObjects
thumb_func_end sub_81504E8
thumb_func_start sub_8150530
@@ -129,7 +129,7 @@ sub_8150530: @ 8150530
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150580 @ =gUnknown_2036E38
ldr r1, _08150580 @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
@@ -162,7 +162,7 @@ _08150558:
b _081505BC
.align 2, 0
_0815057C: .4byte gUnknown_2037078
_08150580: .4byte gUnknown_2036E38
_08150580: .4byte gMapObjects
_08150584: .4byte gSprites
_08150588: .4byte gUnknown_3005E88
_0815058C: .4byte sub_81505C4
@@ -205,7 +205,7 @@ sub_81505C4: @ 81505C4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150610 @ =gUnknown_2036E38
ldr r1, _08150610 @ =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
@@ -230,7 +230,7 @@ sub_81505C4: @ 81505C4
b _081506FC
.align 2, 0
_0815060C: .4byte gUnknown_2037078
_08150610: .4byte gUnknown_2036E38
_08150610: .4byte gMapObjects
_08150614: .4byte gSprites
_08150618: .4byte gTasks
_0815061C:
@@ -353,7 +353,7 @@ sub_8150708: @ 8150708
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150774 @ =gUnknown_2036E38
ldr r1, _08150774 @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r5]
movs r0, 0x8
@@ -395,7 +395,7 @@ _08150768:
bx r0
.align 2, 0
_08150770: .4byte gUnknown_2037078
_08150774: .4byte gUnknown_2036E38
_08150774: .4byte gMapObjects
_08150778: .4byte gUnknown_20386E0
thumb_func_end sub_8150708
asm/quest_log_battle.s
+12 -12
View File
@@ -99,7 +99,7 @@ _0812C06A:
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0812C0BC
@@ -121,7 +121,7 @@ _0812C0B8: .4byte gBattleMons
_0812C0BC:
ldr r5, _0812C0D8 @ =gBattleMons
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
movs r4, 0x58
@@ -137,7 +137,7 @@ _0812C0D8: .4byte gBattleMons
_0812C0DC:
movs r0, 0x2
_0812C0DE:
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
muls r0, r4
@@ -146,10 +146,10 @@ _0812C0EA:
ldrh r0, [r0]
strh r0, [r7, 0x4]
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
adds r4, r0, 0
movs r0, 0x2
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r6, _0812C14C @ =gBattleMons
lsls r4, 24
lsrs r4, 24
@@ -168,10 +168,10 @@ _0812C0EA:
lsrs r0, 16
mov r8, r0
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
adds r4, r0, 0
movs r0, 0x2
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r4, 24
lsrs r4, 24
adds r1, r4, 0
@@ -194,7 +194,7 @@ _0812C150:
ldrh r0, [r0, 0x20]
strh r0, [r7, 0x2]
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
ldr r5, _0812C1C8 @ =gBattleMons
lsls r0, 24
lsrs r0, 24
@@ -204,7 +204,7 @@ _0812C150:
ldrh r0, [r0]
strh r0, [r7, 0x4]
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
muls r0, r4
@@ -212,7 +212,7 @@ _0812C150:
ldrh r0, [r0, 0x28]
mov r8, r0
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
muls r0, r4
@@ -432,7 +432,7 @@ _0812C330: .4byte gBattleStruct
sub_812C334: @ 812C334
push {r4-r6,lr}
adds r6, r0, 0
ldr r3, _0812C35C @ =gUnknown_202273C
ldr r3, _0812C35C @ =gLinkPlayers
ldr r4, _0812C360 @ =gBattleStruct
ldr r0, [r4]
adds r0, 0xB5
@@ -452,7 +452,7 @@ _0812C352:
str r5, [r6]
b _0812C370
.align 2, 0
_0812C35C: .4byte gUnknown_202273C
_0812C35C: .4byte gLinkPlayers
_0812C360: .4byte gBattleStruct
_0812C364:
ldr r0, [r4]
asm/reset_save_heap.s
+4 -4
View File
@@ -28,10 +28,10 @@ sub_8079B7C: @ 8079B7C
strb r0, [r1]
bl SetSaveBlocksPointers
bl sub_8054A28
bl ResetSaveCounters
bl Save_ResetSaveCounters
movs r0, 0
bl sub_80DA4FC
ldr r0, _08079BF8 @ =gUnknown_30053A0
bl Save_LoadGameData
ldr r0, _08079BF8 @ =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0
beq _08079BC4
@@ -59,7 +59,7 @@ _08079BC8:
_08079BEC: .4byte 0x04000208
_08079BF0: .4byte gMain
_08079BF4: .4byte 0x00000439
_08079BF8: .4byte gUnknown_30053A0
_08079BF8: .4byte gSaveFileStatus
_08079BFC: .4byte gSaveBlock2Ptr
_08079C00: .4byte gHeap
_08079C04: .4byte sub_8056938
asm/reshow_battle_screen.s
+34 -34
View File
@@ -276,7 +276,7 @@ _080779A8:
_080779B0:
bl LoadAndCreateEnemyShadowSprites
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -300,7 +300,7 @@ _080779B0:
cmp r0, 0
beq _08077A14
movs r0, 0x3
bl GetBankByIdentity
bl GetBattlerAtPosition
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -318,7 +318,7 @@ _080779B0:
bl SetBankEnemyShadowSpriteCallback
_08077A14:
ldr r1, _08077A4C @ =gUnknown_2023FF8
ldr r0, _08077A50 @ =gUnknown_2024004
ldr r0, _08077A50 @ =gBattlerInMenuId
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -341,7 +341,7 @@ _08077A14:
_08077A44: .4byte gBattlerPartyIndexes
_08077A48: .4byte gEnemyParty
_08077A4C: .4byte gUnknown_2023FF8
_08077A50: .4byte gUnknown_2024004
_08077A50: .4byte gBattlerInMenuId
_08077A54: .4byte gUnknown_3003F3C
_08077A58: .4byte gUnknown_3003F64
_08077A5C:
@@ -426,14 +426,14 @@ sub_8077B0C: @ 8077B0C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08077B54 @ =gUnknown_2023BCC
ldr r0, _08077B54 @ =gBattlersCount
ldrb r0, [r0]
cmp r4, r0
bcc _08077B1C
b _08077C2C
_08077B1C:
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08077BA6
@@ -458,7 +458,7 @@ _08077B1C:
bl sub_8034658
b _08077C24
.align 2, 0
_08077B54: .4byte gUnknown_2023BCC
_08077B54: .4byte gBattlersCount
_08077B58: .4byte gBattleTypeFlags
_08077B5C: .4byte gBattlerPartyIndexes
_08077B60: .4byte gEnemyParty
@@ -576,7 +576,7 @@ sub_8077C38: @ 8077C38
push {r5-r7}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _08077C6C @ =gUnknown_2023BCC
ldr r0, _08077C6C @ =gBattlersCount
ldrb r0, [r0]
cmp r7, r0
bcc _08077C50
@@ -595,7 +595,7 @@ _08077C50:
bl sub_8074900
b _08077C9A
.align 2, 0
_08077C6C: .4byte gUnknown_2023BCC
_08077C6C: .4byte gBattlersCount
_08077C70: .4byte gBattleTypeFlags
_08077C74:
ldr r0, _08077C90 @ =gUnknown_2024018
@@ -621,7 +621,7 @@ _08077C9A:
lsrs r0, 24
mov r8, r0
adds r0, r7, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08077CAE
@@ -656,13 +656,13 @@ _08077CD2:
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F7D4
ldr r5, _08077D98 @ =gUnknown_20244DC
ldr r5, _08077D98 @ =gMultiuseSpriteTemplate
adds r0, r7, 0
movs r1, 0x2
bl sub_8074480
@@ -726,7 +726,7 @@ _08077CD2:
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, _08077DA8 @ =gUnknown_2024024
ldr r1, _08077DA8 @ =gBattleMonForms
adds r1, r7, r1
ldrb r1, [r1]
bl StartSpriteAnim
@@ -734,11 +734,11 @@ _08077CD2:
.align 2, 0
_08077D90: .4byte gBattlerPartyIndexes
_08077D94: .4byte gEnemyParty
_08077D98: .4byte gUnknown_20244DC
_08077D98: .4byte gMultiuseSpriteTemplate
_08077D9C: .4byte gUnknown_2023D44
_08077DA0: .4byte gSprites
_08077DA4: .4byte SpriteCallbackDummy
_08077DA8: .4byte gUnknown_2024024
_08077DA8: .4byte gBattleMonForms
_08077DAC:
ldr r0, _08077E00 @ =gBattleTypeFlags
ldr r1, [r0]
@@ -752,13 +752,13 @@ _08077DAC:
ldr r0, [r5]
ldrb r4, [r0, 0x8]
movs r0, 0
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F864
ldr r6, _08077E08 @ =gUnknown_20244DC
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r6, _08077E08 @ =gMultiuseSpriteTemplate
ldr r1, _08077E0C @ =gUnknown_8239F8C
ldr r0, [r5]
ldrb r0, [r0, 0x8]
@@ -782,7 +782,7 @@ _08077DAC:
.align 2, 0
_08077E00: .4byte gBattleTypeFlags
_08077E04: .4byte gSaveBlock2Ptr
_08077E08: .4byte gUnknown_20244DC
_08077E08: .4byte gMultiuseSpriteTemplate
_08077E0C: .4byte gUnknown_8239F8C
_08077E10:
ldr r0, [r0]
@@ -794,13 +794,13 @@ _08077E10:
cmp r7, 0
bne _08077EA8
movs r0, 0
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
movs r0, 0x5
bl sub_803F864
ldr r5, _08077E94 @ =gUnknown_20244DC
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r5, _08077E94 @ =gMultiuseSpriteTemplate
ldr r0, _08077E98 @ =gUnknown_8239F8C
ldrb r0, [r0, 0x14]
movs r4, 0x8
@@ -849,7 +849,7 @@ _08077E54:
strh r7, [r0, 0x2E]
b _08077F84
.align 2, 0
_08077E94: .4byte gUnknown_20244DC
_08077E94: .4byte gMultiuseSpriteTemplate
_08077E98: .4byte gUnknown_8239F8C
_08077E9C: .4byte gUnknown_2023D44
_08077EA0: .4byte gSprites
@@ -882,13 +882,13 @@ _08077EA8:
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
bl GetBankIdentity
bl GetBattlerPosition
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F7D4
ldr r5, _08077FCC @ =gUnknown_20244DC
ldr r5, _08077FCC @ =gMultiuseSpriteTemplate
adds r0, r7, 0
movs r1, 0x2
bl sub_8074480
@@ -952,7 +952,7 @@ _08077EA8:
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, _08077FDC @ =gUnknown_2024024
ldr r1, _08077FDC @ =gBattleMonForms
adds r1, r7, r1
ldrb r1, [r1]
bl StartSpriteAnim
@@ -992,11 +992,11 @@ _08077FB4:
.align 2, 0
_08077FC4: .4byte gBattlerPartyIndexes
_08077FC8: .4byte gPlayerParty
_08077FCC: .4byte gUnknown_20244DC
_08077FCC: .4byte gMultiuseSpriteTemplate
_08077FD0: .4byte gUnknown_2023D44
_08077FD4: .4byte gSprites
_08077FD8: .4byte SpriteCallbackDummy
_08077FDC: .4byte gUnknown_2024024
_08077FDC: .4byte gBattleMonForms
_08077FE0: .4byte gUnknown_2024018
thumb_func_end sub_8077C38
@@ -1005,7 +1005,7 @@ CreateHealthboxSprite: @ 8077FE4
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0807800C @ =gUnknown_2023BCC
ldr r0, _0807800C @ =gBattlersCount
ldrb r0, [r0]
cmp r5, r0
bcc _08077FF4
@@ -1022,7 +1022,7 @@ _08077FF4:
bl CreateSafariPlayerHealthboxSprites
b _0807802C
.align 2, 0
_0807800C: .4byte gUnknown_2023BCC
_0807800C: .4byte gBattlersCount
_08078010: .4byte gBattleTypeFlags
_08078014:
ldr r0, [r0]
@@ -1048,7 +1048,7 @@ _0807802C:
adds r0, r6, 0
bl SetHealthboxSpriteVisible
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08078074
@@ -1105,13 +1105,13 @@ _080780A8:
bl UpdateHealthboxAttribute
_080780C0:
adds r0, r5, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _080780DC
adds r0, r5, 0
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -1135,7 +1135,7 @@ _080780F8:
bl nullsub_21
_08078104:
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0807813C
asm/roamer.s
+7 -7
View File
@@ -364,43 +364,43 @@ CreateRoamerMonInstance: @ 8141EF8
adds r2, r0
adds r0, r5, 0
movs r1, 0x37
bl sub_804037C
bl SetMonData
ldr r2, [r4]
ldr r1, _08141F94 @ =0x000030da
adds r2, r1
adds r0, r5, 0
movs r1, 0x39
bl sub_804037C
bl SetMonData
ldr r2, [r4]
ldr r0, _08141F98 @ =0x000030de
adds r2, r0
adds r0, r5, 0
movs r1, 0x16
bl sub_804037C
bl SetMonData
ldr r2, [r4]
ldr r1, _08141F9C @ =0x000030df
adds r2, r1
adds r0, r5, 0
movs r1, 0x17
bl sub_804037C
bl SetMonData
ldr r2, [r4]
ldr r0, _08141FA0 @ =0x000030e0
adds r2, r0
adds r0, r5, 0
movs r1, 0x18
bl sub_804037C
bl SetMonData
ldr r2, [r4]
ldr r1, _08141FA4 @ =0x000030e1
adds r2, r1
adds r0, r5, 0
movs r1, 0x21
bl sub_804037C
bl SetMonData
ldr r2, [r4]
ldr r0, _08141FA8 @ =0x000030e2
adds r2, r0
adds r0, r5, 0
movs r1, 0x2F
bl sub_804037C
bl SetMonData
add sp, 0x4
pop {r4,r5}
pop {r0}
asm/rom6.s
+8 -8
View File
@@ -23,7 +23,7 @@ npc_before_player_of_type: @ 80C97A8
bl GetFieldObjectIdByXYZ
lsls r0, 24
lsrs r0, 24
ldr r2, _080C97EC @ =gUnknown_2036E38
ldr r2, _080C97EC @ =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -38,7 +38,7 @@ npc_before_player_of_type: @ 80C97A8
b _080C97F6
.align 2, 0
_080C97E8: .4byte gUnknown_2039A04
_080C97EC: .4byte gUnknown_2036E38
_080C97EC: .4byte gMapObjects
_080C97F0: .4byte gUnknown_20370D2
_080C97F4:
movs r0, 0
@@ -80,7 +80,7 @@ task08_080C9820: @ 80C9820
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080C9878 @ =gUnknown_2036E38
ldr r1, _080C9878 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
@@ -108,7 +108,7 @@ _080C9856:
b _080C98A0
.align 2, 0
_080C9874: .4byte gUnknown_2037078
_080C9878: .4byte gUnknown_2036E38
_080C9878: .4byte gMapObjects
_080C987C: .4byte gMapHeader
_080C9880: .4byte gTasks
_080C9884: .4byte sub_80C98FC
@@ -144,7 +144,7 @@ sub_80C98B0: @ 80C98B0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080C98F0 @ =gUnknown_2036E38
ldr r1, _080C98F0 @ =gMapObjects
adds r0, r1
bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
@@ -166,7 +166,7 @@ _080C98E4:
bx r0
.align 2, 0
_080C98EC: .4byte gUnknown_2037078
_080C98F0: .4byte gUnknown_2036E38
_080C98F0: .4byte gMapObjects
_080C98F4: .4byte gTasks
_080C98F8: .4byte sub_80C98FC
thumb_func_end sub_80C98B0
@@ -212,7 +212,7 @@ _080C993C:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080C9990 @ =gUnknown_2036E38
ldr r0, _080C9990 @ =gMapObjects
adds r4, r0
bl GetPlayerAvatarGraphicsIdByCurrentState
adds r1, r0, 0
@@ -244,7 +244,7 @@ _080C9980:
.align 2, 0
_080C9988: .4byte gUnknown_20386E0
_080C998C: .4byte gUnknown_2037078
_080C9990: .4byte gUnknown_2036E38
_080C9990: .4byte gMapObjects
_080C9994: .4byte gSprites
_080C9998: .4byte gTasks
_080C999C: .4byte sub_80C99A0
asm/save.s
-2156
View File
File diff suppressed because it is too large Load Diff
asm/save_failed_screen.s
+9 -9
View File
@@ -15,8 +15,8 @@ sub_80F50F4: @ 80F50F4
_080F50FC: .4byte gUnknown_3005430
thumb_func_end sub_80F50F4
thumb_func_start sub_80F5100
sub_80F5100: @ 80F5100
thumb_func_start DoSaveFailedScreen
DoSaveFailedScreen: @ 80F5100
lsls r0, 24
lsrs r0, 24
ldr r1, _080F5110 @ =gUnknown_203AB4C
@@ -28,7 +28,7 @@ sub_80F5100: @ 80F5100
.align 2, 0
_080F5110: .4byte gUnknown_203AB4C
_080F5114: .4byte gUnknown_3005430
thumb_func_end sub_80F5100
thumb_func_end DoSaveFailedScreen
thumb_func_start sub_80F5118
sub_80F5118: @ 80F5118
@@ -435,7 +435,7 @@ _080F5454: .4byte 0x01001180
sub_80F5458: @ 80F5458
push {r4,r5,lr}
movs r5, 0
ldr r0, _080F5490 @ =gUnknown_300538C
ldr r0, _080F5490 @ =gDamagedSaveSectors
ldr r1, [r0]
adds r4, r0, 0
cmp r1, 0
@@ -447,12 +447,12 @@ _080F5466:
bne _080F5498
ldr r0, _080F5494 @ =gUnknown_203AB4C
ldrb r0, [r0]
bl sub_80DA248
bl HandleSavingData
adds r5, 0x1
ldr r0, [r4]
cmp r0, 0
beq _080F548C
ldr r4, _080F5490 @ =gUnknown_300538C
ldr r4, _080F5490 @ =gDamagedSaveSectors
cmp r5, 0x2
ble _080F5466
ldr r0, [r4]
@@ -462,7 +462,7 @@ _080F548C:
movs r0, 0x1
b _080F549A
.align 2, 0
_080F5490: .4byte gUnknown_300538C
_080F5490: .4byte gDamagedSaveSectors
_080F5494: .4byte gUnknown_203AB4C
_080F5498:
movs r0, 0
@@ -477,7 +477,7 @@ VerifySectorWipe: @ 80F54A0
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _080F54C4 @ =gUnknown_2039A38
ldr r4, _080F54C4 @ =gSaveDataBuffer
movs r3, 0x80
lsls r3, 5
movs r1, 0
@@ -492,7 +492,7 @@ _080F54B8:
movs r0, 0x1
b _080F54DA
.align 2, 0
_080F54C4: .4byte gUnknown_2039A38
_080F54C4: .4byte gSaveDataBuffer
_080F54C8: .4byte 0x000003ff
_080F54CC:
adds r0, r1, 0x1
asm/scrcmd.s
+14 -14
View File
@@ -3065,7 +3065,7 @@ ScrCmd_resetobjectpriority: @ 806B58C
thumb_func_start ScrCmd_faceplayer
ScrCmd_faceplayer: @ 806B5BC
push {r4,lr}
ldr r2, _0806B5EC @ =gUnknown_2036E38
ldr r2, _0806B5EC @ =gMapObjects
ldr r0, _0806B5F0 @ =gUnknown_3005074
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3088,7 +3088,7 @@ _0806B5E4:
pop {r1}
bx r1
.align 2, 0
_0806B5EC: .4byte gUnknown_2036E38
_0806B5EC: .4byte gMapObjects
_0806B5F0: .4byte gUnknown_3005074
thumb_func_end ScrCmd_faceplayer
@@ -3245,7 +3245,7 @@ ScrCmd_lock: @ 806B704
movs r0, 0
b _0806B752
_0806B714:
ldr r2, _0806B738 @ =gUnknown_2036E38
ldr r2, _0806B738 @ =gMapObjects
ldr r0, _0806B73C @ =gUnknown_3005074
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3262,7 +3262,7 @@ _0806B714:
bl SetupNativeScript
b _0806B750
.align 2, 0
_0806B738: .4byte gUnknown_2036E38
_0806B738: .4byte gMapObjects
_0806B73C: .4byte gUnknown_3005074
_0806B740: .4byte sub_8069648
_0806B744:
@@ -3294,7 +3294,7 @@ ScrCmd_releaseall: @ 806B75C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0806B790 @ =gUnknown_2036E38
ldr r1, _0806B790 @ =gMapObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80974D8
@@ -3303,14 +3303,14 @@ ScrCmd_releaseall: @ 806B75C
pop {r1}
bx r1
.align 2, 0
_0806B790: .4byte gUnknown_2036E38
_0806B790: .4byte gMapObjects
thumb_func_end ScrCmd_releaseall
thumb_func_start ScrCmd_release
ScrCmd_release: @ 806B794
push {r4,lr}
bl HideFieldMessageBox
ldr r4, _0806B7E4 @ =gUnknown_2036E38
ldr r4, _0806B7E4 @ =gMapObjects
ldr r0, _0806B7E8 @ =gUnknown_3005074
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3343,7 +3343,7 @@ _0806B7B6:
pop {r1}
bx r1
.align 2, 0
_0806B7E4: .4byte gUnknown_2036E38
_0806B7E4: .4byte gMapObjects
_0806B7E8: .4byte gUnknown_3005074
thumb_func_end ScrCmd_release
@@ -4022,7 +4022,7 @@ ScrCmd_bufferspeciesname: @ 806BC88
ldr r2, [r4]
movs r1, 0xB
muls r1, r0
ldr r0, _0806BCC4 @ =gUnknown_8245EE0
ldr r0, _0806BCC4 @ =gSpeciesNames
adds r1, r0
adds r0, r2, 0
bl StringCopy
@@ -4032,7 +4032,7 @@ ScrCmd_bufferspeciesname: @ 806BC88
bx r1
.align 2, 0
_0806BCC0: .4byte gUnknown_83A7294
_0806BCC4: .4byte gUnknown_8245EE0
_0806BCC4: .4byte gSpeciesNames
thumb_func_end ScrCmd_bufferspeciesname
thumb_func_start ScrCmd_bufferleadmonspeciesname
@@ -4058,7 +4058,7 @@ ScrCmd_bufferleadmonspeciesname: @ 806BCC8
bl GetMonData
movs r1, 0xB
muls r1, r0
ldr r0, _0806BD10 @ =gUnknown_8245EE0
ldr r0, _0806BD10 @ =gSpeciesNames
adds r1, r0
adds r0, r4, 0
bl StringCopy
@@ -4069,7 +4069,7 @@ ScrCmd_bufferleadmonspeciesname: @ 806BCC8
.align 2, 0
_0806BD08: .4byte gUnknown_83A7294
_0806BD0C: .4byte gPlayerParty
_0806BD10: .4byte gUnknown_8245EE0
_0806BD10: .4byte gSpeciesNames
thumb_func_end ScrCmd_bufferleadmonspeciesname
thumb_func_start ScrCmd_bufferpartymonnick
@@ -5537,7 +5537,7 @@ ScrCmd_setmonobedient: @ 806C7D4
adds r0, r1
movs r1, 0x50
mov r2, sp
bl sub_804037C
bl SetMonData
movs r0, 0
add sp, 0x4
pop {r1}
@@ -5598,7 +5598,7 @@ sub_806C844: @ 806C844
adds r0, r1
movs r1, 0x23
mov r2, sp
bl sub_804037C
bl SetMonData
_0806C87A:
movs r0, 0
add sp, 0x4
asm/script_movement.s
+4 -4
View File
@@ -480,7 +480,7 @@ _0809777C:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _080977A8 @ =gUnknown_2036E38
ldr r1, _080977A8 @ =gMapObjects
adds r0, r1
bl npc_sync_anim_pause_bits
_08097792:
@@ -495,7 +495,7 @@ _08097792:
bx r0
.align 2, 0
_080977A4: .4byte gTasks+0x8
_080977A8: .4byte gUnknown_2036E38
_080977A8: .4byte gMapObjects
thumb_func_end UnfreezeObjects
thumb_func_start Task_80A244C
@@ -557,7 +557,7 @@ sub_80977F0: @ 80977F0
lsls r0, r4, 3
adds r0, r4
lsls r0, 2
ldr r1, _08097850 @ =gUnknown_2036E38
ldr r1, _08097850 @ =gMapObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimActive
@@ -580,7 +580,7 @@ _08097838:
bl FreezeMapObject
b _0809786A
.align 2, 0
_08097850: .4byte gUnknown_2036E38
_08097850: .4byte gMapObjects
_08097854:
adds r0, r4, 0
bl sub_8063CA4
asm/script_pokemon_util_80A0058.s
+12 -12
View File
@@ -15,7 +15,7 @@ sp000_heal_pokemon: @ 80A0058
sub sp, 0x4
movs r0, 0
mov r8, r0
ldr r0, _080A0114 @ =gUnknown_2024029
ldr r0, _080A0114 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r8, r0
bcs _080A0104
@@ -37,7 +37,7 @@ _080A0076:
adds r0, r4, 0
movs r1, 0x39
mov r2, sp
bl sub_804037C
bl SetMonData
adds r0, r4, 0
movs r1, 0x15
bl GetMonData
@@ -62,7 +62,7 @@ _080A00AC:
adds r1, 0x11
adds r0, r4, 0
mov r2, sp
bl sub_804037C
bl SetMonData
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -79,12 +79,12 @@ _080A00AC:
add r0, r10
movs r1, 0x37
mov r2, sp
bl sub_804037C
bl SetMonData
mov r1, r9
lsls r0, r1, 24
lsrs r0, 24
mov r8, r0
ldr r0, _080A0114 @ =gUnknown_2024029
ldr r0, _080A0114 @ =gPlayerPartyCount
ldrb r0, [r0]
cmp r8, r0
bcc _080A0076
@@ -98,7 +98,7 @@ _080A0104:
pop {r0}
bx r0
.align 2, 0
_080A0114: .4byte gUnknown_2024029
_080A0114: .4byte gPlayerPartyCount
_080A0118: .4byte gPlayerParty
thumb_func_end sp000_heal_pokemon
@@ -139,7 +139,7 @@ ScriptGiveMon: @ 80A011C
adds r0, r7, 0
movs r1, 0xC
add r2, sp, 0x10
bl sub_804037C
bl SetMonData
adds r0, r7, 0
bl GiveMonToPlayer
lsls r0, 24
@@ -189,7 +189,7 @@ sub_80A01AC: @ 80A01AC
adds r0, r5, 0
movs r1, 0x2D
mov r2, sp
bl sub_804037C
bl SetMonData
adds r0, r5, 0
bl GiveMonToPlayer
adds r4, r0, 0
@@ -335,7 +335,7 @@ CreateScriptedWildMon: @ 80A029C
mov r0, r8
movs r1, 0xC
add r2, sp, 0x10
bl sub_804037C
bl SetMonData
_080A02EA:
add sp, 0x14
pop {r3}
@@ -358,7 +358,7 @@ ScriptSetMonMoveSlot: @ 80A02FC
lsrs r2, 24
cmp r3, 0x6
bls _080A0318
ldr r0, _080A032C @ =gUnknown_2024029
ldr r0, _080A032C @ =gPlayerPartyCount
ldrb r0, [r0]
subs r0, 0x1
lsls r0, 24
@@ -374,7 +374,7 @@ _080A0318:
pop {r0}
bx r0
.align 2, 0
_080A032C: .4byte gUnknown_2024029
_080A032C: .4byte gPlayerPartyCount
_080A0330: .4byte gPlayerParty
thumb_func_end ScriptSetMonMoveSlot
@@ -442,7 +442,7 @@ sub_80A039C: @ 80A039C
ldrb r4, [r0]
cmp r4, 0
bne _080A03B8
bl sub_804C230
bl LoadPlayerParty
ldr r0, _080A03B4 @ =gUnknown_20370D0
strh r4, [r0]
b _080A03C2
asm/script_pokemon_util_80BF8FC.s
+7 -7
View File
@@ -107,7 +107,7 @@ sub_80BF9BC: @ 80BF9BC
ldr r0, _080BF9F0 @ =gPlayerParty
ldr r1, _080BF9F4 @ =gUnknown_20370C0
ldrb r1, [r1]
ldr r2, _080BF9F8 @ =gUnknown_2024029
ldr r2, _080BF9F8 @ =gPlayerPartyCount
ldrb r2, [r2]
subs r2, 0x1
lsls r2, 24
@@ -128,7 +128,7 @@ sub_80BF9BC: @ 80BF9BC
.align 2, 0
_080BF9F0: .4byte gPlayerParty
_080BF9F4: .4byte gUnknown_20370C0
_080BF9F8: .4byte gUnknown_2024029
_080BF9F8: .4byte gPlayerPartyCount
_080BF9FC: .4byte c2_exit_to_overworld_2_switch
_080BFA00: .4byte gUnknown_3005020
_080BFA04: .4byte sub_807DD24
@@ -304,23 +304,23 @@ sub_80BFAA8: @ 80BFAA8
mov r0, r8
ldr r1, [sp, 0x8]
mov r2, sp
bl sub_804037C
bl SetMonData
mov r0, r8
ldr r1, [sp, 0xC]
ldr r2, [sp, 0x14]
bl sub_804037C
bl SetMonData
mov r0, r8
ldr r1, [sp, 0x10]
mov r2, r10
bl sub_804037C
bl SetMonData
mov r0, r8
ldr r1, [sp, 0x1C]
ldr r2, [sp, 0x18]
bl sub_804037C
bl SetMonData
mov r0, r8
movs r1, 0x15
adds r2, r6, 0
bl sub_804037C
bl SetMonData
add sp, 0x20
pop {r3-r5}
mov r8, r3
asm/shop.s
+4 -4
View File
@@ -1889,7 +1889,7 @@ _0809B976:
ldr r1, _0809B9EC @ =gUnknown_20398B8
adds r0, r2, r1
strh r5, [r0]
ldr r1, _0809B9F0 @ =gUnknown_2036E38
ldr r1, _0809B9F0 @ =gMapObjects
lsls r0, r3, 3
adds r0, r3
lsls r0, 2
@@ -1910,7 +1910,7 @@ _0809B9E0: .4byte gUnknown_20398BA
_0809B9E4: .4byte 0x0000fffd
_0809B9E8: .4byte 0x0000fffe
_0809B9EC: .4byte gUnknown_20398B8
_0809B9F0: .4byte gUnknown_2036E38
_0809B9F0: .4byte gMapObjects
_0809B9F4:
cmp r0, 0x3
beq _0809BA06
@@ -1968,7 +1968,7 @@ sub_809BA40: @ 809BA40
sub sp, 0x4
movs r6, 0
ldr r7, _0809BAE8 @ =gUnknown_20398B4
ldr r0, _0809BAEC @ =gUnknown_2036E38
ldr r0, _0809BAEC @ =gMapObjects
mov r8, r0
adds r1, r7, 0x6
mov r9, r1
@@ -2045,7 +2045,7 @@ _0809BACE:
bx r0
.align 2, 0
_0809BAE8: .4byte gUnknown_20398B4
_0809BAEC: .4byte gUnknown_2036E38
_0809BAEC: .4byte gMapObjects
_0809BAF0: .4byte 0xfff80000
_0809BAF4: .4byte SpriteCallbackDummy
_0809BAF8: .4byte gSprites
asm/ss_anne.s
+8 -8
View File
@@ -100,7 +100,7 @@ _0815D3D6:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0815D42C @ =gUnknown_2036E38
ldr r1, _0815D42C @ =gMapObjects
adds r0, r1
ldr r2, _0815D430 @ =gSprites
ldrb r1, [r0, 0x4]
@@ -128,7 +128,7 @@ _0815D3D6:
.align 2, 0
_0815D424: .4byte gTasks+0x8
_0815D428: .4byte gSaveBlock1Ptr
_0815D42C: .4byte gUnknown_2036E38
_0815D42C: .4byte gMapObjects
_0815D430: .4byte gSprites
_0815D434: .4byte sub_815D454
_0815D438:
@@ -197,7 +197,7 @@ sub_815D498: @ 815D498
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0815D50C @ =gUnknown_2036E38
ldr r1, _0815D50C @ =gMapObjects
adds r0, r1
ldr r4, _0815D510 @ =gSprites
ldrb r1, [r0, 0x4]
@@ -238,7 +238,7 @@ sub_815D498: @ 815D498
bx r0
.align 2, 0
_0815D508: .4byte gSaveBlock1Ptr
_0815D50C: .4byte gUnknown_2036E38
_0815D50C: .4byte gMapObjects
_0815D510: .4byte gSprites
_0815D514: .4byte gUnknown_8479C88
thumb_func_end sub_815D498
@@ -260,7 +260,7 @@ sub_815D518: @ 815D518
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0815D59C @ =gUnknown_2036E38
ldr r1, _0815D59C @ =gMapObjects
adds r0, r1
ldr r2, _0815D5A0 @ =gSprites
ldrb r1, [r0, 0x4]
@@ -308,7 +308,7 @@ _0815D58E:
bx r0
.align 2, 0
_0815D598: .4byte gSaveBlock1Ptr
_0815D59C: .4byte gUnknown_2036E38
_0815D59C: .4byte gMapObjects
_0815D5A0: .4byte gSprites
thumb_func_end sub_815D518
@@ -328,7 +328,7 @@ sub_815D5A4: @ 815D5A4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _0815D618 @ =gUnknown_2036E38
ldr r1, _0815D618 @ =gMapObjects
adds r0, r1
ldr r4, _0815D61C @ =gSprites
ldrb r0, [r0, 0x4]
@@ -371,7 +371,7 @@ _0815D60C:
bx r0
.align 2, 0
_0815D614: .4byte gSaveBlock1Ptr
_0815D618: .4byte gUnknown_2036E38
_0815D618: .4byte gMapObjects
_0815D61C: .4byte gSprites
_0815D620: .4byte gUnknown_8479CC0
thumb_func_end sub_815D5A4
asm/start_menu.s
+2 -2
View File
@@ -1379,7 +1379,7 @@ _0806F814:
beq _0806F858
b _0806F864
_0806F81A:
ldr r0, _0806F838 @ =gUnknown_30053A0
ldr r0, _0806F838 @ =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0
beq _0806F826
@@ -1396,7 +1396,7 @@ _0806F82E:
str r0, [r1]
b _0806F864
.align 2, 0
_0806F838: .4byte gUnknown_30053A0
_0806F838: .4byte gSaveFileStatus
_0806F83C: .4byte gUnknown_2031DB0
_0806F840: .4byte gUnknown_3000FA4
_0806F844: .4byte sub_806F86C
asm/teachy_tv.s
+2 -2
View File
@@ -2161,7 +2161,7 @@ sub_815BC90: @ 815BC90
ldr r1, _0815BCD8 @ =gMain
ldr r0, _0815BCDC @ =sub_815BD58
str r0, [r1, 0x8]
bl copy_player_party_to_sav1
bl SavePlayerParty
bl sub_8159F40
movs r0, 0
bl PlayMapChosenOrBattleBGM
@@ -2243,7 +2243,7 @@ _0815BD54: .4byte sub_800FD9C
thumb_func_start sub_815BD58
sub_815BD58: @ 815BD58
push {lr}
bl sub_804C230
bl LoadPlayerParty
ldr r0, _0815BD6C @ =gUnknown_2023E8A
ldrb r0, [r0]
cmp r0, 0x3
asm/title_screen.s
+4 -4
View File
@@ -1107,10 +1107,10 @@ _08079248:
bl SeedRngAndSetTrainerId
bl SetSaveBlocksPointers
bl sub_8054A28
bl ResetSaveCounters
bl Save_ResetSaveCounters
movs r0, 0
bl sub_80DA4FC
ldr r0, _080792B4 @ =gUnknown_30053A0
bl Save_LoadGameData
ldr r0, _080792B4 @ =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0
beq _08079276
@@ -1143,7 +1143,7 @@ _080792A6:
bx r0
.align 2, 0
_080792B0: .4byte gUnknown_2037AB8
_080792B4: .4byte gUnknown_30053A0
_080792B4: .4byte gSaveFileStatus
_080792B8: .4byte gSaveBlock2Ptr
_080792BC: .4byte gHeap
_080792C0: .4byte sub_800C300
asm/trade.s
+63 -63
View File
@@ -473,12 +473,12 @@ _0804CA10:
bl SetGpuReg
ldr r2, _0804CB2C @ =gUnknown_2031DA8
ldr r0, [r2]
ldr r1, _0804CB30 @ =gUnknown_2024029
ldr r1, _0804CB30 @ =gPlayerPartyCount
ldrb r1, [r1]
adds r0, 0x36
strb r1, [r0]
ldr r0, [r2]
ldr r1, _0804CB34 @ =gUnknown_202402A
ldr r1, _0804CB34 @ =gEnemyPartyCount
ldrb r1, [r1]
adds r0, 0x37
strb r1, [r0]
@@ -602,8 +602,8 @@ _0804CB20:
b _0804CEC2
.align 2, 0
_0804CB2C: .4byte gUnknown_2031DA8
_0804CB30: .4byte gUnknown_2024029
_0804CB34: .4byte gUnknown_202402A
_0804CB30: .4byte gPlayerPartyCount
_0804CB34: .4byte gEnemyPartyCount
_0804CB38: .4byte gUnknown_8261E40
_0804CB3C: .4byte gPlayerParty
_0804CB40: .4byte 0xfff40000
@@ -648,7 +648,7 @@ _0804CB9C:
ldr r0, [r0]
ldr r6, _0804CC18 @ =gUnknown_2031C94
ldr r1, [r6]
ldr r5, _0804CC1C @ =gUnknown_201C000
ldr r5, _0804CC1C @ =gDecompressionBuffer
str r5, [sp]
movs r4, 0x3
str r4, [sp, 0x4]
@@ -701,7 +701,7 @@ _0804CB9C:
.align 2, 0
_0804CC14: .4byte gSaveBlock2Ptr
_0804CC18: .4byte gUnknown_2031C94
_0804CC1C: .4byte gUnknown_201C000
_0804CC1C: .4byte gDecompressionBuffer
_0804CC20: .4byte gUnknown_2022744
_0804CC24: .4byte gUnknown_8261ECC
_0804CC28: .4byte gMain
@@ -1156,12 +1156,12 @@ _0804D00C:
bl CalculateEnemyPartyCount
ldr r4, _0804D12C @ =gUnknown_2031DA8
ldr r0, [r4]
ldr r1, _0804D130 @ =gUnknown_2024029
ldr r1, _0804D130 @ =gPlayerPartyCount
ldrb r1, [r1]
adds r0, 0x36
strb r1, [r0]
ldr r0, [r4]
ldr r1, _0804D134 @ =gUnknown_202402A
ldr r1, _0804D134 @ =gEnemyPartyCount
ldrb r1, [r1]
adds r0, 0x37
strb r1, [r0]
@@ -1292,8 +1292,8 @@ _0804D120:
b _0804D4B4
.align 2, 0
_0804D12C: .4byte gUnknown_2031DA8
_0804D130: .4byte gUnknown_2024029
_0804D134: .4byte gUnknown_202402A
_0804D130: .4byte gPlayerPartyCount
_0804D134: .4byte gEnemyPartyCount
_0804D138: .4byte gUnknown_8261E40
_0804D13C: .4byte gPlayerParty
_0804D140: .4byte 0xfff40000
@@ -1338,7 +1338,7 @@ _0804D19C:
ldr r0, [r0]
ldr r6, _0804D218 @ =gUnknown_2031C94
ldr r1, [r6]
ldr r5, _0804D21C @ =gUnknown_201C000
ldr r5, _0804D21C @ =gDecompressionBuffer
str r5, [sp]
movs r4, 0x3
str r4, [sp, 0x4]
@@ -1392,7 +1392,7 @@ _0804D200:
.align 2, 0
_0804D214: .4byte gSaveBlock2Ptr
_0804D218: .4byte gUnknown_2031C94
_0804D21C: .4byte gUnknown_201C000
_0804D21C: .4byte gDecompressionBuffer
_0804D220: .4byte gUnknown_2022744
_0804D224: .4byte gUnknown_8261ECC
_0804D228: .4byte gMain
@@ -2488,7 +2488,7 @@ _0804DB1A:
adds r0, r4, 0
movs r1, 0x2
ldr r2, _0804DB74 @ =gUnknown_8246BE5
bl sub_804037C
bl SetMonData
_0804DB5A:
adds r4, 0x64
subs r5, 0x1
@@ -3568,7 +3568,7 @@ _0804E3B6:
_0804E3D0: .4byte gUnknown_2031DA8
_0804E3D4:
ldr r0, _0804E3F4 @ =gPlayerParty
ldr r1, _0804E3F8 @ =gUnknown_2024029
ldr r1, _0804E3F8 @ =gPlayerPartyCount
ldrb r1, [r1]
ldr r2, _0804E3FC @ =gUnknown_2031DA8
ldr r2, [r2]
@@ -3584,7 +3584,7 @@ _0804E3D4:
mov pc, r0
.align 2, 0
_0804E3F4: .4byte gPlayerParty
_0804E3F8: .4byte gUnknown_2024029
_0804E3F8: .4byte gPlayerPartyCount
_0804E3FC: .4byte gUnknown_2031DA8
_0804E400: .4byte _0804E404
.align 2, 0
@@ -6024,7 +6024,7 @@ _0804F71E:
sub_804F728: @ 804F728
push {lr}
sub sp, 0x8
ldr r2, _0804F744 @ =gUnknown_201C000
ldr r2, _0804F744 @ =gDecompressionBuffer
str r2, [sp]
movs r2, 0x6
str r2, [sp, 0x4]
@@ -6035,7 +6035,7 @@ sub_804F728: @ 804F728
pop {r0}
bx r0
.align 2, 0
_0804F744: .4byte gUnknown_201C000
_0804F744: .4byte gDecompressionBuffer
thumb_func_end sub_804F728
thumb_func_start sub_804F748
@@ -6469,7 +6469,7 @@ _0804FA70:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r0, _0804FAB0 @ =gUnknown_202273C
ldr r0, _0804FAB0 @ =gLinkPlayers
adds r1, r0
ldrb r0, [r1]
subs r0, 0x1
@@ -6492,7 +6492,7 @@ _0804FA70:
movs r0, 0x5
b _0804FB24
.align 2, 0
_0804FAB0: .4byte gUnknown_202273C
_0804FAB0: .4byte gLinkPlayers
_0804FAB4:
cmp r1, 0x97
bgt _0804FADE
@@ -6578,7 +6578,7 @@ sub_804FB34: @ 804FB34
cmp r0, 0
beq _0804FBC0
bl GetMultiplayerId
ldr r6, _0804FBB8 @ =gUnknown_202273C
ldr r6, _0804FBB8 @ =gLinkPlayers
movs r7, 0x1
eors r0, r7
lsls r0, 24
@@ -6635,7 +6635,7 @@ _0804FB6E:
b _0804FBC2
.align 2, 0
_0804FBB4: .4byte gUnknown_3003F64
_0804FBB8: .4byte gUnknown_202273C
_0804FBB8: .4byte gLinkPlayers
_0804FBBC:
movs r0, 0x1
b _0804FBC2
@@ -7287,7 +7287,7 @@ _08050040:
lsls r0, r5, 3
ldr r1, _08050074 @ =gUnknown_82350AC
adds r0, r1
ldr r1, _08050078 @ =gUnknown_202401C
ldr r1, _08050078 @ =gMonSpritesGfxPtr
ldr r1, [r1]
ldr r1, [r1, 0x8]
adds r2, r5, 0
@@ -7297,12 +7297,12 @@ _08050040:
b _0805009A
.align 2, 0
_08050074: .4byte gUnknown_82350AC
_08050078: .4byte gUnknown_202401C
_08050078: .4byte gMonSpritesGfxPtr
_0805007C:
lsls r0, r5, 3
ldr r1, _080500BC @ =gUnknown_82350AC
adds r0, r1
ldr r1, _080500C0 @ =gUnknown_202401C
ldr r1, _080500C0 @ =gMonSpritesGfxPtr
ldr r2, [r1]
lsls r4, r6, 1
adds r1, r4, 0x1
@@ -7330,7 +7330,7 @@ _0805009A:
b _0805011E
.align 2, 0
_080500BC: .4byte gUnknown_82350AC
_080500C0: .4byte gUnknown_202401C
_080500C0: .4byte gMonSpritesGfxPtr
_080500C4: .4byte gUnknown_2031DAC
_080500C8:
mov r0, r8
@@ -7338,7 +7338,7 @@ _080500C8:
ldrh r0, [r0, 0x4]
adds r1, r4, 0
bl sub_803F7D4
ldr r0, _08050128 @ =gUnknown_20244DC
ldr r0, _08050128 @ =gMultiuseSpriteTemplate
movs r1, 0x78
movs r2, 0x3C
movs r3, 0x6
@@ -7380,7 +7380,7 @@ _0805011E:
pop {r0}
bx r0
.align 2, 0
_08050128: .4byte gUnknown_20244DC
_08050128: .4byte gMultiuseSpriteTemplate
_0805012C: .4byte gUnknown_2031DAC
_08050130: .4byte gSprites
_08050134: .4byte SpriteCallbackDummy
@@ -7852,7 +7852,7 @@ sub_80504CC: @ 80504CC
bl sub_80F696C
ldr r0, _080505BC @ =gUnknown_8D0051C
mov r8, r0
ldr r4, _080505C0 @ =gUnknown_201C000
ldr r4, _080505C0 @ =gDecompressionBuffer
adds r1, r4, 0
bl LZDecompressWram
movs r0, 0
@@ -7898,7 +7898,7 @@ sub_80504CC: @ 80504CC
_080505B4: .4byte gUnknown_826D1D4
_080505B8: .4byte gUnknown_8D00000
_080505BC: .4byte gUnknown_8D0051C
_080505C0: .4byte gUnknown_201C000
_080505C0: .4byte gDecompressionBuffer
_080505C4: .4byte gUnknown_8D004D8
_080505C8: .4byte gUnknown_826D1BC
thumb_func_end sub_80504CC
@@ -8221,7 +8221,7 @@ _08050866:
adds r0, r7, 0
movs r1, 0x20
mov r2, sp
bl sub_804037C
bl SetMonData
_080508A2:
mov r0, r8
cmp r0, 0xFF
@@ -10809,7 +10809,7 @@ _08052042:
lsls r0, r2, 3
ldr r1, _08052068 @ =gUnknown_82350AC
adds r0, r1
ldr r1, _0805206C @ =gUnknown_202401C
ldr r1, _0805206C @ =gMonSpritesGfxPtr
ldr r1, [r1]
ldr r1, [r1, 0x10]
ldr r3, [r3, 0x6C]
@@ -10820,7 +10820,7 @@ _08052042:
_08052060: .4byte gSprites
_08052064: .4byte SpriteCallbackDummy
_08052068: .4byte gUnknown_82350AC
_0805206C: .4byte gUnknown_202401C
_0805206C: .4byte gMonSpritesGfxPtr
_08052070:
ldr r4, _0805211C @ =gSprites
ldr r2, [r7]
@@ -11063,7 +11063,7 @@ _0805223C:
adds r0, r5
movs r1, 0x1
movs r2, 0
bl sub_8042EC4
bl GetEvolutionTargetSpecies
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
@@ -13034,7 +13034,7 @@ _0805349E:
lsls r0, r2, 3
ldr r1, _080534C4 @ =gUnknown_82350AC
adds r0, r1
ldr r1, _080534C8 @ =gUnknown_202401C
ldr r1, _080534C8 @ =gMonSpritesGfxPtr
ldr r1, [r1]
ldr r1, [r1, 0x10]
ldr r3, [r3, 0x6C]
@@ -13045,7 +13045,7 @@ _0805349E:
_080534BC: .4byte gSprites
_080534C0: .4byte SpriteCallbackDummy
_080534C4: .4byte gUnknown_82350AC
_080534C8: .4byte gUnknown_202401C
_080534C8: .4byte gMonSpritesGfxPtr
_080534CC:
ldr r4, _08053578 @ =gSprites
ldr r2, [r7]
@@ -13288,7 +13288,7 @@ _08053698:
adds r0, r5
movs r1, 0x1
movs r2, 0
bl sub_8042EC4
bl GetEvolutionTargetSpecies
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
@@ -13416,7 +13416,7 @@ _080537B8:
adds r0, r5
movs r1, 0x1
movs r2, 0
bl sub_8042EC4
bl GetEvolutionTargetSpecies
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
@@ -13793,7 +13793,7 @@ sub_8053A9C: @ 8053A9C
ldrh r1, [r4, 0x38]
movs r6, 0xB
muls r1, r6
ldr r5, _08053ADC @ =gUnknown_8245EE0
ldr r5, _08053ADC @ =gSpeciesNames
adds r1, r5
bl StringCopy
ldr r0, _08053AE0 @ =gStringVar2
@@ -13809,7 +13809,7 @@ sub_8053A9C: @ 8053A9C
_08053AD0: .4byte gUnknown_20370C0
_08053AD4: .4byte gUnknown_826CF8C
_08053AD8: .4byte gStringVar1
_08053ADC: .4byte gUnknown_8245EE0
_08053ADC: .4byte gSpeciesNames
_08053AE0: .4byte gStringVar2
thumb_func_end sub_8053A9C
@@ -13840,7 +13840,7 @@ sub_8053AE4: @ 8053AE4
ldrh r2, [r4, 0xC]
movs r1, 0xB
muls r1, r2
ldr r2, _08053B44 @ =gUnknown_8245EE0
ldr r2, _08053B44 @ =gSpeciesNames
adds r1, r2
bl StringCopy
add sp, 0x20
@@ -13854,7 +13854,7 @@ _08053B34: .4byte gUnknown_20370C2
_08053B38: .4byte gPlayerParty
_08053B3C: .4byte gStringVar1
_08053B40: .4byte gStringVar2
_08053B44: .4byte gUnknown_8245EE0
_08053B44: .4byte gSpeciesNames
thumb_func_end sub_8053AE4
thumb_func_start sub_8053B48
@@ -13898,85 +13898,85 @@ sub_8053B48: @ 8053B48
adds r2, 0xE
adds r0, r6, 0
movs r1, 0x27
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0xF
adds r0, r6, 0
movs r1, 0x28
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x10
adds r0, r6, 0
movs r1, 0x29
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x11
adds r0, r6, 0
movs r1, 0x2A
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x12
adds r0, r6, 0
movs r1, 0x2B
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x13
adds r0, r6, 0
movs r1, 0x2C
bl sub_804037C
bl SetMonData
adds r0, r6, 0
movs r1, 0x2
adds r2, r5, 0
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x2B
adds r0, r6, 0
movs r1, 0x7
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x36
adds r0, r6, 0
movs r1, 0x31
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x14
adds r0, r6, 0
movs r1, 0x2E
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x1D
adds r0, r6, 0
movs r1, 0x17
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x1E
adds r0, r6, 0
movs r1, 0x18
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x1C
adds r0, r6, 0
movs r1, 0x16
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x1F
adds r0, r6, 0
movs r1, 0x21
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x20
adds r0, r6, 0
movs r1, 0x2F
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x37
adds r0, r6, 0
movs r1, 0x30
bl sub_804037C
bl SetMonData
adds r0, r6, 0
movs r1, 0x23
adds r2, r4, 0
bl sub_804037C
bl SetMonData
mov r4, sp
adds r4, 0x35
movs r0, 0
@@ -14002,12 +14002,12 @@ sub_8053B48: @ 8053B48
adds r0, r6, 0
movs r1, 0x40
adds r2, r4, 0
bl sub_804037C
bl SetMonData
adds r2, r5, 0
adds r2, 0x28
adds r0, r6, 0
movs r1, 0xC
bl sub_804037C
bl SetMonData
b _08053CC0
.align 2, 0
_08053CA4: .4byte gUnknown_826CF8C
@@ -14019,7 +14019,7 @@ _08053CB4:
adds r2, 0x28
adds r0, r6, 0
movs r1, 0xC
bl sub_804037C
bl SetMonData
_08053CC0:
ldr r0, _08053CD0 @ =gEnemyParty
bl CalculateMonStats
@@ -14480,7 +14480,7 @@ _08054132:
ldrb r0, [r0]
cmp r0, 0
beq _0805415A
ldr r4, _0805417C @ =gUnknown_202273C
ldr r4, _0805417C @ =gLinkPlayers
bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
@@ -14509,7 +14509,7 @@ _0805415A:
.align 2, 0
_08054174: .4byte gUnknown_2031DAC
_08054178: .4byte gUnknown_3003F3C
_0805417C: .4byte gUnknown_202273C
_0805417C: .4byte gLinkPlayers
_08054180: .4byte gMain
_08054184:
ldr r0, _0805419C @ =gUnknown_2031DAC

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