dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

more renaming

Browse Source
This commit is contained in:
camthesaxman
2018-02-06 13:48:02 -06:00
parent f78fa6aabf
commit 6a4967689e
51 changed files with 5105 additions and 5108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_anim_80A5C6C.s
+117 -117
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start GetBankCoord
GetBankCoord: @ 80A5C6C
thumb_func_start GetBattlerSpriteCoord
GetBattlerSpriteCoord: @ 80A5C6C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -102,7 +102,7 @@ _080A5D28:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A5D98
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
@@ -120,7 +120,7 @@ _080A5D60:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A5D98
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
@@ -154,7 +154,7 @@ _080A5DB0:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end GetBankCoord
thumb_func_end GetBattlerSpriteCoord
thumb_func_start sub_80A5DB8
sub_80A5DB8: @ 80A5DB8
@@ -203,7 +203,7 @@ _080A5E04:
ldrh r0, [r0, 0x2]
cmp r0, 0
bne _080A5E3C
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -293,7 +293,7 @@ _080A5EC8:
ldrh r0, [r0, 0x2]
cmp r0, 0
bne _080A5F04
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -577,7 +577,7 @@ _080A611C:
_080A6126:
adds r0, r4, 0
adds r1, r5, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
_080A612E:
lsls r0, 24
lsrs r0, 24
@@ -586,18 +586,18 @@ _080A612E:
bx r1
thumb_func_end sub_80A60AC
thumb_func_start GetBankSpriteDefault_Y
GetBankSpriteDefault_Y: @ 80A6138
thumb_func_start GetBattlerSpriteDefault_Y
GetBattlerSpriteDefault_Y: @ 80A6138
push {lr}
lsls r0, 24
lsrs r0, 24
movs r1, 0x4
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end GetBankSpriteDefault_Y
thumb_func_end GetBattlerSpriteDefault_Y
thumb_func_start GetSubstituteSpriteDefault_Y
GetSubstituteSpriteDefault_Y: @ 80A614C
@@ -611,7 +611,7 @@ GetSubstituteSpriteDefault_Y: @ 80A614C
beq _080A6170
adds r0, r4, 0
movs r1, 0x1
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r1, 0x80
@@ -620,7 +620,7 @@ GetSubstituteSpriteDefault_Y: @ 80A614C
_080A6170:
adds r0, r4, 0
movs r1, 0x1
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r1, 0x88
@@ -642,7 +642,7 @@ sub_80A6190: @ 80A6190
lsrs r5, r0, 24
adds r0, r5, 0
movs r1, 0x1
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
bl IsContest
@@ -662,7 +662,7 @@ sub_80A6190: @ 80A6190
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A621C
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
@@ -680,7 +680,7 @@ _080A61E4:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A621C
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
@@ -716,56 +716,56 @@ _080A6238:
bx r1
thumb_func_end sub_80A6190
thumb_func_start GetAnimBankSpriteId
GetAnimBankSpriteId: @ 80A6240
thumb_func_start GetBattlerSpriteId
GetBattlerSpriteId: @ 80A6240
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
cmp r0, 0
bne _080A6268
ldr r4, =gAnimBankAttacker
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
bl IsBankSpritePresent
bl IsBattlerSpritePresent
lsls r0, 24
cmp r0, 0
beq _080A62B6
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
ldrb r0, [r4]
b _080A62C6
.pool
_080A6268:
cmp r0, 0x1
bne _080A6288
ldr r4, =gAnimBankTarget
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
bl IsBankSpritePresent
bl IsBattlerSpritePresent
lsls r0, 24
cmp r0, 0
beq _080A62B6
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
ldrb r0, [r4]
b _080A62C6
.pool
_080A6288:
cmp r1, 0x2
bne _080A62A4
ldr r5, =gAnimBankAttacker
ldr r5, =gBattleAnimAttacker
ldrb r0, [r5]
movs r4, 0x2
eors r0, r4
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A62B6
b _080A62C0
.pool
_080A62A4:
ldr r5, =gAnimBankTarget
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r4, 0x2
eors r0, r4
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _080A62C0
@@ -774,7 +774,7 @@ _080A62B6:
b _080A62CA
.pool
_080A62C0:
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
ldrb r0, [r5]
eors r0, r4
_080A62C6:
@@ -785,7 +785,7 @@ _080A62CA:
pop {r1}
bx r1
.pool
thumb_func_end GetAnimBankSpriteId
thumb_func_end GetBattlerSpriteId
thumb_func_start StoreSpriteCallbackInData6
StoreSpriteCallbackInData6: @ 80A62D4
@@ -1242,16 +1242,16 @@ sub_80A65EC: @ 80A65EC
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x34]
ldr r5, =gAnimBankTarget
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -1439,16 +1439,16 @@ sub_80A6760: @ 80A6760
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x34]
ldr r5, =gAnimBankAttacker
ldr r5, =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x2
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -1547,16 +1547,16 @@ sub_80A6814: @ 80A6814
sub_80A6838: @ 80A6838
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =gAnimBankAttacker
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1575,16 +1575,16 @@ sub_80A6864: @ 80A6864
lsls r1, 16
lsrs r5, r1, 16
mov r8, r5
ldr r7, =gAnimBankAttacker
ldr r7, =gBattleAnimAttacker
ldrb r0, [r7]
movs r1, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -1729,7 +1729,7 @@ sub_80A6980: @ 80A6980
lsls r1, 24
cmp r1, 0
bne _080A69A8
ldr r4, =gAnimBankTarget
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0
bl sub_80A60AC
@@ -1765,7 +1765,7 @@ sub_80A69CC: @ 80A69CC
lsls r1, 24
cmp r1, 0
bne _080A69F0
ldr r4, =gAnimBankAttacker
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_80A60AC
@@ -1777,7 +1777,7 @@ sub_80A69CC: @ 80A69CC
b _080A6A04
.pool
_080A69F0:
ldr r4, =gAnimBankAttacker
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_80A60AC
@@ -1862,8 +1862,8 @@ _080A6A7E:
.pool
thumb_func_end GetBattlerAtPosition
thumb_func_start IsBankSpritePresent
IsBankSpritePresent: @ 80A6A90
thumb_func_start IsBattlerSpritePresent
IsBattlerSpritePresent: @ 80A6A90
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1872,11 +1872,11 @@ IsBankSpritePresent: @ 80A6A90
lsls r0, 24
cmp r0, 0
beq _080A6ABC
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
cmp r0, r4
beq _080A6B0A
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
cmp r0, r4
beq _080A6B0A
@@ -1893,7 +1893,7 @@ _080A6ABC:
lsls r0, 24
cmp r0, 0
beq _080A6AF0
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -1903,7 +1903,7 @@ _080A6ABC:
b _080A6AFE
.pool
_080A6AF0:
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
@@ -1926,7 +1926,7 @@ _080A6B1A:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end IsBankSpritePresent
thumb_func_end IsBattlerSpritePresent
thumb_func_start IsDoubleBattle
IsDoubleBattle: @ 80A6B20
@@ -2061,7 +2061,7 @@ sub_80A6BFC: @ 80A6BFC
b _080A6C60
.pool
_080A6C30:
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80A8364
lsls r0, 24
@@ -2889,7 +2889,7 @@ sub_80A7238: @ 80A7238
beq _080A7268
ldr r4, =gSprites
movs r0, 0
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -2934,7 +2934,7 @@ sub_80A7270: @ 80A7270
cmp r0, 0
bne _080A72A6
adds r0, r7, 0
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A72B4
@@ -3372,7 +3372,7 @@ _080A75F6:
_080A7602:
cmp r7, 0
beq _080A7614
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
adds r1, r0, 0
adds r1, 0x10
@@ -3383,7 +3383,7 @@ _080A7614:
mov r0, r8
cmp r0, 0
beq _080A7628
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r1, r0, 0
adds r1, 0x10
@@ -3394,11 +3394,11 @@ _080A7628:
mov r0, r9
cmp r0, 0
beq _080A764E
ldr r6, =gAnimBankAttacker
ldr r6, =gBattleAnimAttacker
ldrb r0, [r6]
movs r5, 0x2
eors r0, r5
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A764E
@@ -3413,11 +3413,11 @@ _080A764E:
mov r0, r10
cmp r0, 0
beq _080A7674
ldr r6, =gAnimBankTarget
ldr r6, =gBattleAnimTarget
ldrb r0, [r6]
movs r5, 0x2
eors r0, r5
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A7674
@@ -3499,7 +3499,7 @@ _080A76F2:
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A771A
@@ -3517,7 +3517,7 @@ _080A771A:
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A7746
@@ -3537,7 +3537,7 @@ _080A7746:
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A7772
@@ -3558,7 +3558,7 @@ _080A7772:
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A77A0
@@ -3670,7 +3670,7 @@ _080A7838:
_080A7842:
adds r0, r5, 0
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -3682,10 +3682,10 @@ _080A7842:
_080A785C:
ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E]
ldr r4, =gAnimBankTarget
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -3693,7 +3693,7 @@ _080A785C:
strh r0, [r5, 0x32]
ldrb r0, [r4]
adds r1, r7, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -3716,7 +3716,7 @@ sub_80A78AC: @ 80A78AC
adds r6, r0, 0
movs r1, 0x1
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -3730,10 +3730,10 @@ _080A78CC:
ldr r4, =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
ldr r5, =gAnimBankTarget
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -3741,7 +3741,7 @@ _080A78CC:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x6]
@@ -3799,17 +3799,17 @@ _080A7954:
adds r0, r5, 0
adds r1, r4, 0
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _080A7976
.pool
_080A796C:
adds r0, r5, 0
adds r1, r4, 0
bl sub_80A6980
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_080A7976:
ldrb r6, [r0]
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -3828,7 +3828,7 @@ _080A798E:
strh r0, [r5, 0x2E]
adds r0, r6, 0
movs r1, 0x2
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r4, 0x4]
@@ -3836,7 +3836,7 @@ _080A798E:
strh r0, [r5, 0x32]
adds r0, r6, 0
adds r1, r7, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -3858,7 +3858,7 @@ duplicate_obj_of_side_rel2move_in_transparent_mode: @ 80A79E8
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -4084,7 +4084,7 @@ sub_80A7B98: @ 80A7B98
lsrs r4, r0, 24
ldr r0, =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@@ -4539,7 +4539,7 @@ sub_80A7F18: @ 80A7F18
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
ldr r7, =0x00000181
ldr r0, =gBattleMonForms
adds r6, r5, r0
@@ -4579,7 +4579,7 @@ _080A7F78:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A7FC0
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -4614,7 +4614,7 @@ _080A7FD8:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A8010
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -4837,14 +4837,14 @@ sub_80A8174: @ 80A8174
lsls r0, 24
lsrs r4, r0, 24
adds r7, r4, 0
ldr r6, =gAnimBankTarget
ldr r6, =gBattleAnimTarget
ldrb r0, [r6]
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A81B4
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -4863,15 +4863,15 @@ sub_80A8174: @ 80A8174
orrs r0, r2
strb r0, [r1, 0x5]
_080A81B4:
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
mov r8, r0
ldrb r0, [r0]
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A81EC
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
mov r3, r8
ldrb r0, [r3]
adds r0, r1
@@ -4894,12 +4894,12 @@ _080A81EC:
ldrb r0, [r6]
movs r5, 0x2
eors r0, r5
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A8224
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
ldrb r0, [r6]
eors r0, r5
adds r0, r1
@@ -4922,12 +4922,12 @@ _080A8224:
mov r1, r8
ldrb r0, [r1]
eors r0, r5
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A825C
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
mov r3, r8
ldrb r0, [r3]
eors r0, r5
@@ -4968,13 +4968,13 @@ _080A8286:
lsls r0, r5, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080A82C8
adds r0, r4, 0
bl sub_80A82E4
ldr r3, =gBankSpriteIds
ldr r3, =gBattlerSpriteIds
adds r3, r5, r3
ldrb r2, [r3]
lsls r1, r2, 4
@@ -5499,7 +5499,7 @@ _080A86C4:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A871C
ldr r0, =gBattlePartyID
ldr r0, =gBattlerPartyIndexes
mov r1, r8
lsls r4, r1, 1
adds r4, r0
@@ -5589,7 +5589,7 @@ _080A8790:
ldrh r0, [r1, 0x2]
cmp r0, 0
bne _080A87DC
ldr r0, =gBattlePartyID
ldr r0, =gBattlerPartyIndexes
mov r1, r8
lsls r4, r1, 1
adds r4, r0
@@ -5713,7 +5713,7 @@ _080A88A6:
_080A88AE:
mov r0, r8
movs r1, 0x2
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrb r1, [r4]
@@ -5722,7 +5722,7 @@ _080A88AE:
_080A88C0:
mov r0, r8
movs r1, 0x2
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrb r1, [r4]
@@ -5731,7 +5731,7 @@ _080A88C0:
_080A88D2:
mov r0, r8
movs r1, 0x3
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrb r2, [r4]
@@ -5744,7 +5744,7 @@ _080A88E4:
_080A88EA:
mov r0, r8
movs r1, 0x3
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrb r2, [r4]
@@ -5757,7 +5757,7 @@ _080A88FC:
_080A8902:
mov r0, r8
movs r1, 0x1
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x1F
@@ -5798,13 +5798,13 @@ _080A8942:
_080A8946:
adds r0, r4, 0
adds r1, r5, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r8, r0
adds r0, r4, 0
adds r1, r6, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r7, r0, 24
bl IsDoubleBattle
@@ -5819,12 +5819,12 @@ _080A8946:
eors r4, r0
adds r0, r4, 0
adds r1, r5, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
adds r1, r6, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r3, r0, 24
mov r0, r8
@@ -5941,7 +5941,7 @@ sub_80A8A6C: @ 80A8A6C
push {r4,lr}
adds r4, r0, 0
bl sub_80A6838
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -5998,7 +5998,7 @@ _080A8AB6:
sub_80A8AEC: @ 80A8AEC
push {r4,lr}
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -6054,7 +6054,7 @@ sub_80A8B64: @ 80A8B64
push {r4,lr}
adds r4, r0, 0
bl sub_80A6838
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -6101,12 +6101,12 @@ sub_80A8BC4: @ 80A8BC4
ldr r0, =gTasks
adds r5, r1, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r6, 0
strh r0, [r5, 0x8]
ldr r7, =gAnimBankAttacker
ldr r7, =gBattleAnimAttacker
ldrb r0, [r7]
bl GetBattlerSide
lsls r0, 24
@@ -6389,16 +6389,16 @@ _080A8E26:
sub_80A8E30: @ 80A8E30
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =gAnimBankAttacker
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -6487,7 +6487,7 @@ sub_80A8EE4: @ 80A8EE4
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x36]
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
asm/battle_anim_80A9C70.s
+6 -6
View File
@@ -17,7 +17,7 @@ sub_80A9C70: @ 80A9C70
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
ldr r0, =gBankSpriteIds
ldr r0, =gBattlerSpriteIds
adds r0, r4, r0
ldrb r6, [r0]
ldr r0, =sub_80A9DB4
@@ -331,10 +331,10 @@ sub_80A9EF4: @ 80A9EF4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r4, =gAnimBankTarget
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
ldr r1, =0xffe00000
@@ -342,7 +342,7 @@ sub_80A9EF4: @ 80A9EF4
lsrs r5, r0, 16
ldrb r0, [r4]
movs r1, 0x3
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
ldr r1, =0xffdc0000
@@ -863,9 +863,9 @@ LaunchStatusAnimation: @ 80AA364
lsrs r4, 24
lsls r1, 24
lsrs r1, 24
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
strb r4, [r0]
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
strb r4, [r0]
ldr r0, =gBattleAnims_Statuses
movs r2, 0
asm/battle_anim_80D51AC.s
+43 -43
View File
@@ -12,7 +12,7 @@ sub_80D51AC: @ 80D51AC
lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -165,7 +165,7 @@ sub_80D52D0: @ 80D52D0
bgt _080D52FC
lsls r0, 24
lsrs r0, 24
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@@ -204,19 +204,19 @@ _080D5326:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _080D533C
movs r6, 0x1
_080D533C:
ldr r0, =gBankSpriteIds
ldr r0, =gBattlerSpriteIds
adds r0, r4, r0
b _080D5350
.pool
_080D5348:
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
_080D5350:
@@ -379,7 +379,7 @@ sub_80D5484: @ 80D5484
lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@@ -603,7 +603,7 @@ sub_80D5644: @ 80D5644
lsrs r4, 24
ldr r5, =gBattleAnimArgs
ldrb r0, [r5]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, =gSprites
@@ -723,7 +723,7 @@ sub_80D5738: @ 80D5738
movs r6, 0x1
ldr r4, =gBattleAnimArgs
ldrb r0, [r4]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r7, r0, 24
movs r1, 0x8
@@ -842,7 +842,7 @@ sub_80D5830: @ 80D5830
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -871,7 +871,7 @@ sub_80D5860: @ 80D5860
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -891,8 +891,8 @@ _080D5894:
movs r0, 0
strh r2, [r4, 0x2E]
strh r0, [r4, 0x32]
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -938,7 +938,7 @@ sub_80D58F8: @ 80D58F8
strb r0, [r2]
ldr r5, =gBattleAnimArgs
ldrb r0, [r5, 0x4]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldrh r2, [r5]
@@ -987,13 +987,13 @@ sub_80D5968: @ 80D5968
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D598C
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
b _080D5990
.pool
_080D598C:
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankTarget
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimTarget
_080D5990:
ldrb r0, [r0]
adds r0, r1
@@ -1133,14 +1133,14 @@ sub_80D5A94: @ 80D5A94
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D5AB0
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _080D5AB2
.pool
_080D5AB0:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_080D5AB2:
ldrb r2, [r0]
ldr r0, =gBankSpriteIds
ldr r0, =gBattlerSpriteIds
adds r0, r2, r0
ldrb r6, [r0]
adds r0, r2, 0
@@ -1218,14 +1218,14 @@ sub_80D5B48: @ 80D5B48
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D5B70
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _080D5B72
.pool
_080D5B70:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_080D5B72:
ldrb r1, [r0]
ldr r0, =gBankSpriteIds
ldr r0, =gBattlerSpriteIds
adds r0, r1, r0
ldrb r7, [r0]
adds r0, r1, 0
@@ -1338,7 +1338,7 @@ sub_80D5C50: @ 80D5C50
bl __divsi3
lsls r0, 16
lsrs r7, r0, 16
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -1352,7 +1352,7 @@ sub_80D5C50: @ 80D5C50
strh r0, [r5, 0xA]
_080D5C82:
ldrb r0, [r5]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
ldr r1, =gTasks
lsls r4, r6, 2
adds r4, r6
@@ -1508,7 +1508,7 @@ sub_80D5DB0: @ 80D5DB0
cmp r0, 0
blt _080D5E10
ldrb r0, [r1]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r2, r0, 24
b _080D5E18
@@ -1518,20 +1518,20 @@ _080D5DD8:
beq _080D5DE8
b _080D5E10
_080D5DDE:
ldr r5, =gAnimBankAttacker
ldr r5, =gBattleAnimAttacker
b _080D5DEA
.pool
_080D5DE8:
ldr r5, =gAnimBankTarget
ldr r5, =gBattleAnimTarget
_080D5DEA:
ldrb r0, [r5]
movs r4, 0x2
eors r0, r4
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080D5E10
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
ldrb r0, [r5]
eors r0, r4
adds r0, r1
@@ -1549,7 +1549,7 @@ _080D5E18:
lsls r0, 3
adds r5, r0, r1
strh r2, [r5, 0x8]
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -1622,7 +1622,7 @@ sub_80D5EB8: @ 80D5EB8
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r6, =gAnimBankAttacker
ldr r6, =gBattleAnimAttacker
ldrb r0, [r6]
bl GetBattlerSide
lsls r0, 24
@@ -1635,7 +1635,7 @@ sub_80D5EB8: @ 80D5EB8
_080D5ED4:
ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x8]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
@@ -1660,7 +1660,7 @@ _080D5ED4:
b _080D5F18
.pool
_080D5F14:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
_080D5F18:
strh r0, [r2, 0x12]
@@ -1836,7 +1836,7 @@ sub_80D6064: @ 80D6064
lsrs r4, 24
ldr r6, =gBattleAnimArgs
ldrb r0, [r6, 0x6]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -1939,7 +1939,7 @@ sub_80D6134: @ 80D6134
lsrs r7, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x4]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -1995,11 +1995,11 @@ _080D61B8:
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080D61C8
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _080D61CA
.pool
_080D61C8:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_080D61CA:
ldrb r0, [r0]
bl GetBattlerSide
@@ -2057,7 +2057,7 @@ sub_80D622C: @ 80D622C
lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x4]
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -2076,11 +2076,11 @@ sub_80D622C: @ 80D622C
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080D6274
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _080D6276
.pool
_080D6274:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_080D6276:
ldrb r0, [r0]
bl GetBattlerSide
@@ -2290,7 +2290,7 @@ _080D63EE:
ldrh r0, [r1, 0x8]
strh r0, [r4, 0x1E]
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x16]
asm/battle_anim_80FE840.s
+935 -935
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_815A0D4.s
+197 -197
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_8170478.s
+65 -65
View File
@@ -16,7 +16,7 @@ sub_8170478: @ 8170478
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x10]
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r4, [r0]
ldr r0, =gBattle_WIN0H
movs r1, 0
@@ -56,7 +56,7 @@ sub_8170478: @ 8170478
movs r1, 0x3
movs r2, 0x1
bl SetAnimBgAttribute
ldr r0, =gHealthBoxesIds
ldr r0, =gHealthboxSpriteIds
adds r4, r0
ldrb r0, [r4]
ldr r1, =gSprites
@@ -212,7 +212,7 @@ sub_8170660: @ 8170660
push {r7}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
mov r8, r0
ldr r1, =gTasks
@@ -373,7 +373,7 @@ _0817076C:
movs r1, 0x1
movs r2, 0
bl SetAnimBgAttribute
ldr r0, =gHealthBoxesIds
ldr r0, =gHealthboxSpriteIds
add r0, r8
ldrb r0, [r0]
lsls r1, r0, 4
@@ -434,7 +434,7 @@ sub_8170834: @ 8170834
adds r7, r1, 0
lsls r2, 24
lsrs r2, 24
ldr r0, =gHealthBoxesIds
ldr r0, =gHealthboxSpriteIds
adds r2, r0
ldrb r0, [r2]
lsls r5, r0, 4
@@ -540,7 +540,7 @@ sub_8170920: @ 8170920
lsrs r4, 24
mov r1, sp
adds r1, 0x1
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r2, [r0]
mov r0, sp
bl sub_8170834
@@ -561,7 +561,7 @@ sub_817094C: @ 817094C
push {r5,r6}
lsls r0, 24
lsrs r0, 24
ldr r1, =gHealthBoxesIds
ldr r1, =gHealthboxSpriteIds
adds r0, r1
ldrb r0, [r0]
ldr r1, =gSprites
@@ -628,7 +628,7 @@ sub_81709EC: @ 81709EC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_817094C
adds r0, r4, 0
@@ -765,8 +765,8 @@ sub_8170B04: @ 8170B04
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r5, [r0]
@@ -851,8 +851,8 @@ sub_8170BB0: @ 8170BB0
sub sp, 0xC
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =gBankSpriteIds
ldr r4, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
adds r1, r0, r1
ldrb r1, [r1]
@@ -861,7 +861,7 @@ sub_8170BB0: @ 8170BB0
lsls r0, 24
cmp r0, 0
bne _08170BF8
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
ldrb r0, [r4]
lsls r0, 1
adds r0, r1
@@ -872,7 +872,7 @@ sub_8170BB0: @ 8170BB0
b _08170C08
.pool
_08170BF8:
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
ldrb r0, [r4]
lsls r0, 1
adds r0, r1
@@ -904,16 +904,16 @@ _08170C08:
b _08170CEE
.pool
_08170C44:
ldr r5, =gAnimBankAttacker
ldr r5, =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
bl GetBankCoord
bl GetBattlerSpriteCoord
adds r1, r0, 0
lsls r1, 24
ldr r2, =gSprites
@@ -1162,18 +1162,18 @@ sub_8170E04: @ 8170E04
adds r6, r4, r1
movs r0, 0x22
strh r0, [r6, 0x2E]
ldr r2, =gAnimBankTarget
ldr r2, =gBattleAnimTarget
mov r8, r2
ldrb r0, [r2]
movs r1, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1186,7 +1186,7 @@ sub_8170E04: @ 8170E04
ldr r0, =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r3, [r0, 0x8]
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
mov r2, r8
ldrb r0, [r2]
adds r0, r1
@@ -1313,18 +1313,18 @@ _08170F54:
adds r6, r4, r0
movs r0, 0x22
strh r0, [r6, 0x2E]
ldr r1, =gAnimBankTarget
ldr r1, =gBattleAnimTarget
mov r8, r1
ldrb r0, [r1]
movs r1, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1336,7 +1336,7 @@ _08170F54:
str r0, [r4]
movs r0, 0
bl GetBattlerAtPosition
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1372,7 +1372,7 @@ sub_8171030: @ 8171030
ldr r6, =gSprites
movs r0, 0
bl GetBattlerAtPosition
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1423,7 +1423,7 @@ sub_81710A8: @ 81710A8
ldr r6, =gSprites
movs r0, 0
bl GetBattlerAtPosition
ldr r4, =gBankSpriteIds
ldr r4, =gBattlerSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -1550,7 +1550,7 @@ _08171188:
movs r2, 0x1
movs r3, 0x1C
bl LaunchBallStarsTask
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r1, [r0]
movs r0, 0
movs r2, 0xE
@@ -1584,8 +1584,8 @@ sub_81711E8: @ 81711E8
ldr r0, =sub_8171240
str r0, [r4, 0x1C]
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankTarget
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -1606,8 +1606,8 @@ _08171224:
sub_8171240: @ 8171240
push {r4-r7,lr}
adds r7, r0, 0
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankTarget
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r0, r1
ldrb r4, [r0]
@@ -2333,7 +2333,7 @@ sub_81717F8: @ 81717F8
push {r7}
sub sp, 0x4
adds r6, r0, 0
ldr r7, =gAnimBankTarget
ldr r7, =gBattleAnimTarget
ldrh r0, [r6, 0x36]
adds r0, 0x1
movs r1, 0
@@ -2390,7 +2390,7 @@ _08171880:
cmp r1, r0
bne _081718BC
ldr r5, =gSprites
ldr r4, =gBankSpriteIds
ldr r4, =gBattlerSpriteIds
ldrb r0, [r7]
adds r0, r4
ldrb r1, [r0]
@@ -2715,7 +2715,7 @@ sub_8171AE4: @ 8171AE4
movs r2, 0x1
movs r3, 0x1C
bl LaunchBallStarsTask
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r1, [r0]
movs r0, 0x1
movs r2, 0xE
@@ -2723,8 +2723,8 @@ sub_8171AE4: @ 8171AE4
bl LaunchBallFadeMonTask
_08171B36:
ldr r6, =gSprites
ldr r5, =gBankSpriteIds
ldr r4, =gAnimBankTarget
ldr r5, =gBattlerSpriteIds
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -2791,8 +2791,8 @@ sub_8171BAC: @ 8171BAC
strb r0, [r2]
_08171BCA:
ldr r4, =gSprites
ldr r3, =gBankSpriteIds
ldr r2, =gAnimBankTarget
ldr r3, =gBattlerSpriteIds
ldr r2, =gBattleAnimTarget
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -2840,8 +2840,8 @@ _08171C24:
cmp r5, 0
beq _08171C8A
ldr r4, =gSprites
ldr r3, =gBankSpriteIds
ldr r2, =gAnimBankTarget
ldr r3, =gBattlerSpriteIds
ldr r2, =gBattleAnimTarget
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -4729,8 +4729,8 @@ sub_8172BF0: @ 8172BF0
lsrs r7, r0, 24
movs r0, 0
mov r8, r0
ldr r0, =gBankSpriteIds
ldr r3, =gAnimBankAttacker
ldr r0, =gBattlerSpriteIds
ldr r3, =gBattleAnimAttacker
ldrb r2, [r3]
adds r0, r2, r0
ldrb r6, [r0]
@@ -4877,7 +4877,7 @@ _08172D28:
adds r0, r1
ldrb r1, [r0, 0x8]
strh r1, [r0, 0x8]
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -4949,7 +4949,7 @@ _08172DC0:
beq _08172E4E
b _08172E84
_08172DC6:
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80A8364
lsls r0, 24
@@ -5009,8 +5009,8 @@ _08172E14:
strh r0, [r4, 0x26]
b _08172E84
_08172E4E:
ldr r1, =gBankSpriteIds
ldr r4, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
adds r0, r1
ldrb r1, [r0]
@@ -5048,7 +5048,7 @@ sub_8172E9C: @ 8172E9C
ldr r3, =gBattleAnimArgs
ldr r1, =gBattleSpritesDataPtr
ldr r2, [r1]
ldr r1, =gAnimBankAttacker
ldr r1, =gBattleAnimAttacker
ldrb r1, [r1]
ldr r2, [r2]
lsls r1, 2
@@ -5068,7 +5068,7 @@ sub_8172ED0: @ 8172ED0
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gAnimBankTarget
ldr r2, =gBattleAnimTarget
ldr r1, =gEffectBank
ldrb r1, [r1]
strb r1, [r2]
@@ -5108,7 +5108,7 @@ sub_8172EF0: @ 8172EF0
bl GetMonData
adds r4, r0, 0
adds r0, r6, 0
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _08172FC8
@@ -5234,12 +5234,12 @@ _0817303A:
ldrb r0, [r4, 0x8]
mov r8, r0
movs r1, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r5, r0, 24
mov r0, r8
movs r1, 0x1
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0x1E
@@ -5579,7 +5579,7 @@ sub_817330C: @ 817330C
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r5, =gBattleAnimArgs
lsrs r0, 24
@@ -5591,7 +5591,7 @@ sub_817330C: @ 817330C
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -5602,8 +5602,8 @@ sub_817330C: @ 817330C
adds r0, r4, 0
bl sub_80A68D4
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -5627,8 +5627,8 @@ sub_817339C: @ 817339C
push {lr}
adds r3, r0, 0
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -5678,8 +5678,8 @@ sub_8173400: @ 8173400
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, =gSprites
ldr r3, =gBankSpriteIds
ldr r2, =gAnimBankAttacker
ldr r3, =gBattlerSpriteIds
ldr r2, =gBattleAnimAttacker
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -5733,7 +5733,7 @@ sub_817345C: @ 817345C
_08173478:
movs r0, 0
bl GetBattlerAtPosition
ldr r1, =gAnimBankAttacker
ldr r1, =gBattleAnimAttacker
strb r0, [r1]
movs r0, 0x1
b _08173498
@@ -5741,12 +5741,12 @@ _08173478:
_0817348C:
movs r0, 0x1
bl GetBattlerAtPosition
ldr r1, =gAnimBankAttacker
ldr r1, =gBattleAnimAttacker
strb r0, [r1]
movs r0, 0
_08173498:
bl GetBattlerAtPosition
ldr r1, =gAnimBankTarget
ldr r1, =gBattleAnimTarget
strb r0, [r1]
_081734A0:
adds r0, r4, 0
@@ -5812,13 +5812,13 @@ sub_817351C: @ 817351C
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, =gAnimBankAttacker
ldr r3, =gBattleAnimAttacker
ldr r1, =gBattleSpritesDataPtr
ldr r2, [r1]
ldr r1, [r2, 0x8]
ldrh r1, [r1]
strb r1, [r3]
ldr r3, =gAnimBankTarget
ldr r3, =gBattleAnimTarget
ldr r1, [r2, 0x8]
ldrh r1, [r1]
lsrs r1, 8
asm/battle_anim_sound_tasks.s
+15 -15
View File
@@ -336,25 +336,25 @@ _08158DD0:
adds r2, r0, 0
cmp r1, 0
bne _08158DEC
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r4, [r0]
b _08158E12
.pool
_08158DEC:
cmp r1, 0x1
bne _08158DFC
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r4, [r0]
b _08158E12
.pool
_08158DFC:
cmp r1, 0x2
bne _08158E08
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _08158E0A
.pool
_08158E08:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_08158E0A:
ldrb r1, [r0]
movs r0, 0x2
@@ -369,7 +369,7 @@ _08158E12:
bne _08158E38
_08158E1E:
adds r0, r4, 0
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _08158E38
@@ -383,7 +383,7 @@ _08158E38:
lsls r0, 24
cmp r0, 0
beq _08158E5C
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -393,7 +393,7 @@ _08158E38:
b _08158E6A
.pool
_08158E5C:
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -461,25 +461,25 @@ _08158EE0:
adds r2, r0, 0
cmp r1, 0
bne _08158EFC
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r4, [r0]
b _08158F22
.pool
_08158EFC:
cmp r1, 0x1
bne _08158F0C
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r4, [r0]
b _08158F22
.pool
_08158F0C:
cmp r1, 0x2
bne _08158F18
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _08158F1A
.pool
_08158F18:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_08158F1A:
ldrb r1, [r0]
movs r0, 0x2
@@ -494,7 +494,7 @@ _08158F22:
bne _08158F48
_08158F2E:
adds r0, r4, 0
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _08158F48
@@ -508,7 +508,7 @@ _08158F48:
lsls r0, 24
cmp r0, 0
beq _08158F6C
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -518,7 +518,7 @@ _08158F48:
b _08158F7A
.pool
_08158F6C:
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -705,7 +705,7 @@ sub_81590B8: @ 81590B8
.pool
_081590F8:
ldr r1, =gAnimSpeciesByBanks
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
asm/battle_link_817C95C.s
+115 -115
View File
@@ -34,12 +34,12 @@ _0817C988:
movs r1, 0x81
lsls r1, 2
adds r7, r0, r1
ldr r5, =gBattleAttacker
ldr r5, =gBattleMoveAttacker
ldrb r0, [r5]
bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gBattleDefender
ldr r0, =gBattleMoveTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -59,7 +59,7 @@ _0817C988:
str r0, [sp, 0x4]
cmp r4, 0
bne _0817CA00
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
ldrb r0, [r5]
lsls r0, 1
adds r0, r2
@@ -70,7 +70,7 @@ _0817C988:
b _0817CA10
.pool
_0817CA00:
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
ldrb r0, [r5]
lsls r0, 1
adds r0, r2
@@ -83,7 +83,7 @@ _0817CA10:
str r1, [sp, 0x8]
cmp r6, 0
bne _0817CA3C
ldr r0, =gBattleDefender
ldr r0, =gBattleMoveTarget
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -94,7 +94,7 @@ _0817CA10:
b _0817CA4C
.pool
_0817CA3C:
ldr r0, =gBattleDefender
ldr r0, =gBattleMoveTarget
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -105,12 +105,12 @@ _0817CA3C:
_0817CA4C:
adds r1, r0
str r1, [sp, 0xC]
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
ldr r1, =gStringInfo
ldr r1, [r1]
ldrh r1, [r1]
bl GetBankMoveSlotId
bl GetBattlerMoveSlotId
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -134,13 +134,13 @@ _0817CA4C:
bl _0817E0A2
.pool
_0817CA9C:
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
mov r8, r0
ldr r0, =gBattleDefender
ldr r0, =gBattleMoveTarget
ldrb r0, [r0]
bl GetBattlerPosition
lsls r0, 24
@@ -571,8 +571,8 @@ _0817D0DC:
adds r3, r4
lsls r3, 2
adds r3, r7, r3
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -601,8 +601,8 @@ _0817D124:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -634,8 +634,8 @@ _0817D16C:
adds r0, r4
lsls r0, 2
adds r5, r7, r0
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -715,8 +715,8 @@ _0817D216:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -775,8 +775,8 @@ _0817D296:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -833,8 +833,8 @@ _0817D314:
lsls r0, r4, 4
adds r3, r0
adds r3, r7, r3
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -940,8 +940,8 @@ _0817D3F2:
bne _0817D3FE
bl _0817E0A6
_0817D3FE:
ldr r0, =gBattleAttacker
ldr r1, =gBattleDefender
ldr r0, =gBattleMoveAttacker
ldr r1, =gBattleMoveTarget
ldrb r0, [r0]
ldrb r1, [r1]
cmp r0, r1
@@ -1014,8 +1014,8 @@ _0817D498:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1091,8 +1091,8 @@ _0817D53C:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1161,8 +1161,8 @@ _0817D5CE:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1226,8 +1226,8 @@ _0817D65E:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1301,7 +1301,7 @@ _0817D6F2:
strb r0, [r1]
bl _0817E0A6
_0817D704:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1314,7 +1314,7 @@ _0817D704:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1353,8 +1353,8 @@ _0817D76C:
bne _0817D77E
bl _0817E0A6
_0817D77E:
ldr r6, =gBattlePartyID
ldr r5, =gBattleAttacker
ldr r6, =gBattlerPartyIndexes
ldr r5, =gBattleMoveAttacker
ldrb r0, [r5]
lsls r0, 1
adds r0, r6
@@ -1395,7 +1395,7 @@ _0817D7B2:
b _0817D934
.pool
_0817D7D8:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1408,7 +1408,7 @@ _0817D7D8:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1439,7 +1439,7 @@ _0817D7D8:
b _0817D88C
.pool
_0817D838:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1452,7 +1452,7 @@ _0817D838:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1496,9 +1496,9 @@ _0817D8A4:
bne _0817D8B6
bl _0817E0A6
_0817D8B6:
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
mov r8, r2
ldr r6, =gBattleAttacker
ldr r6, =gBattleMoveAttacker
ldrb r0, [r6]
lsls r0, 1
add r0, r8
@@ -1573,8 +1573,8 @@ _0817D94C:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1627,7 +1627,7 @@ _0817D9AE:
movs r0, 0x9
b _0817E086
_0817D9C2:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1640,7 +1640,7 @@ _0817D9C2:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1671,8 +1671,8 @@ _0817D9C2:
b _0817DB76
.pool
_0817DA24:
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1702,7 +1702,7 @@ _0817DA48:
b _0817E0A6
.pool
_0817DA68:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1715,7 +1715,7 @@ _0817DA68:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1747,8 +1747,8 @@ _0817DA68:
b _0817DB76
.pool
_0817DACC:
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1790,7 +1790,7 @@ _0817DB10:
b _0817E0A6
.pool
_0817DB24:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1803,7 +1803,7 @@ _0817DB24:
lsls r4, 3
adds r3, r4
adds r3, r7, r3
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1838,8 +1838,8 @@ _0817DB76:
b _0817E0A6
.pool
_0817DB90:
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1875,8 +1875,8 @@ _0817DBD4:
lsls r0, r1, 4
adds r3, r0
adds r3, r7, r3
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1943,8 +1943,8 @@ _0817DC62:
adds r2, r6
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2021,8 +2021,8 @@ _0817DCFC:
lsls r0, r4, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2049,8 +2049,8 @@ _0817DD38:
lsls r0, r4, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2121,8 +2121,8 @@ _0817DDC8:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2154,8 +2154,8 @@ _0817DE10:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2253,8 +2253,8 @@ _0817DEDC:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2331,8 +2331,8 @@ _0817DF70:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2413,8 +2413,8 @@ _0817DFE6:
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2557,14 +2557,14 @@ _0817E122:
lsls r1, 2
adds r1, r0, r1
str r1, [sp, 0x8]
ldr r2, =gBattleAttacker
ldr r2, =gBattleMoveAttacker
mov r10, r2
ldrb r0, [r2]
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, =gBattleDefender
ldr r0, =gBattleMoveTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -2572,7 +2572,7 @@ _0817E122:
mov r1, r10
ldrb r0, [r1]
adds r1, r7, 0
bl GetBankMoveSlotId
bl GetBattlerMoveSlotId
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x3
@@ -2604,7 +2604,7 @@ _0817E184:
mov r2, r10
ldrb r1, [r2]
lsls r1, 1
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
adds r1, r2
ldrh r2, [r1]
adds r2, 0x1
@@ -2685,7 +2685,7 @@ _0817E23C:
mov r1, r10
ldrb r0, [r1]
lsls r0, 1
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
adds r0, r2
ldrh r1, [r0]
adds r1, 0x1
@@ -2723,7 +2723,7 @@ _0817E27A:
mov r1, r10
ldrb r0, [r1]
lsls r0, 1
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
adds r0, r1
ldrh r1, [r0]
adds r1, 0x1
@@ -2812,7 +2812,7 @@ sub_817E32C: @ 817E32C
movs r1, 0x81
lsls r1, 2
adds r4, r0, r1
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -3244,12 +3244,12 @@ sub_817E684: @ 817E684
movs r2, 0x81
lsls r2, 2
adds r7, r0, r2
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gBattleDefender
ldr r0, =gBattleMoveTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -3297,8 +3297,8 @@ _0817E6F0:
.4byte _0817E760
.4byte _0817E760
_0817E760:
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -3324,13 +3324,13 @@ _0817E760:
_0817E79C:
ldr r1, =gUnknown_0860A834
add r1, r12
ldr r7, =gBattlePartyID
ldr r7, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r4
lsls r2, r0, 4
ldr r4, =0x0000ffff
ldr r1, [r1]
ldr r3, =gBattleAttacker
ldr r3, =gBattleMoveAttacker
ldrh r0, [r1]
cmp r6, r0
bne _0817E7E0
@@ -3708,13 +3708,13 @@ sub_817EA80: @ 817EA80
movs r1, 0x81
lsls r1, 2
adds r5, r0, r1
ldr r3, =gBattleAttacker
ldr r3, =gBattleMoveAttacker
mov r8, r3
ldrb r0, [r3]
bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gBattleDefender
ldr r0, =gBattleMoveTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -4005,8 +4005,8 @@ _0817ECCC:
ldrb r0, [r0]
lsrs r0, 5
subs r6, r0, 0x1
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -4164,8 +4164,8 @@ _0817EE1C:
cmp r7, 0x1
bne _0817EEBC
adds r2, r4, 0
ldr r1, =gBattlePartyID
ldr r0, =gBattleAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -4227,7 +4227,7 @@ _0817EE8E:
b _0817EEBC
_0817EE96:
adds r2, r4, 0
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
mov r3, r8
ldrb r0, [r3]
lsls r0, 1
@@ -4269,7 +4269,7 @@ sub_817EECC: @ 817EECC
beq _0817EEE6
b _0817F1FA
_0817EEE6:
ldr r4, =gBattleAttacker
ldr r4, =gBattleMoveAttacker
ldrb r0, [r4]
bl GetBattlerSide
lsls r0, 24
@@ -4291,7 +4291,7 @@ _0817EEF8:
bgt _0817EF10
b _0817F1FA
_0817EF10:
ldr r0, =gBattleDefender
ldr r0, =gBattleMoveTarget
ldrb r0, [r0]
muls r0, r1
adds r0, r5
@@ -4367,7 +4367,7 @@ _0817EF8A:
beq _0817EF98
b _0817F1FA
_0817EF98:
ldr r2, =gBattleAttacker
ldr r2, =gBattleMoveAttacker
ldrb r0, [r2]
adds r0, r6
ldrb r0, [r0]
@@ -4386,11 +4386,11 @@ _0817EF98:
mov r10, r3
mov r8, r0
add r7, sp, 0x10
ldr r4, =gBattleDefender
ldr r4, =gBattleMoveTarget
mov r9, r4
_0817EFC2:
lsls r1, r5, 1
ldr r6, =gBattleAttacker
ldr r6, =gBattleMoveAttacker
ldrb r0, [r6]
movs r2, 0x58
muls r0, r2
@@ -4420,7 +4420,7 @@ _0817EFC2:
lsls r1, 1
adds r1, r4
ldrh r3, [r1]
ldr r2, =gBattleAttacker
ldr r2, =gBattleMoveAttacker
ldrb r0, [r2]
movs r4, 0x58
muls r0, r4
@@ -4437,7 +4437,7 @@ _0817EFC2:
str r4, [sp]
movs r4, 0
str r4, [sp, 0x4]
ldr r6, =gBattleAttacker
ldr r6, =gBattleMoveAttacker
ldrb r4, [r6]
str r4, [sp, 0x8]
mov r6, r9
@@ -4448,7 +4448,7 @@ _0817EFC2:
ldr r4, =gBattleMoveDamage
str r3, [r4]
ldr r1, =gStatuses3
ldr r2, =gBattleAttacker
ldr r2, =gBattleMoveAttacker
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -4472,7 +4472,7 @@ _0817EFC2:
str r0, [r4]
_0817F06A:
ldr r0, =gProtectStructs
ldr r6, =gBattleAttacker
ldr r6, =gBattleMoveAttacker
ldrb r1, [r6]
lsls r1, 4
adds r1, r0
@@ -4513,9 +4513,9 @@ _0817F0B4:
cmp r5, 0x3
ble _0817EFC2
movs r5, 0
ldr r3, =gBattleAttacker
ldr r3, =gBattleMoveAttacker
ldr r6, =gMoveSelectionCursor
ldr r4, =gBattlePartyID
ldr r4, =gBattlerPartyIndexes
mov r8, r4
movs r7, 0x64
mov r9, r7
@@ -4545,9 +4545,9 @@ _0817F0D8:
movs r7, 0
_0817F0F6:
movs r5, 0
ldr r4, =gBattleDefender
ldr r4, =gBattleMoveTarget
ldr r6, =gEnemyParty
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
add r0, r10
ldrb r3, [r0]
@@ -4582,7 +4582,7 @@ _0817F11A:
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
ldr r2, =gBattleAttacker
ldr r2, =gBattleMoveAttacker
ldrb r0, [r2]
lsls r0, 1
add r0, r8
@@ -4598,7 +4598,7 @@ _0817F11A:
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
ldr r4, =gBattleAttacker
ldr r4, =gBattleMoveAttacker
ldrb r3, [r4]
mov r2, r10
adds r0, r3, r2
@@ -4625,7 +4625,7 @@ _0817F1D4:
_0817F1DC:
ldr r2, =gBattleMoveDamage
ldr r1, =gMoveSelectionCursor
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -4695,7 +4695,7 @@ _0817F270:
cmp r2, 0x95
bne _0817F294
ldr r2, =gBattleMons
ldr r0, =gBattleAttacker
ldr r0, =gBattleMoveAttacker
ldrb r1, [r0]
movs r0, 0x58
muls r0, r1
@@ -4793,8 +4793,8 @@ _0817F324:
.pool
thumb_func_end sub_817F2A8
thumb_func_start GetBankMoveSlotId
GetBankMoveSlotId: @ 817F33C
thumb_func_start GetBattlerMoveSlotId
GetBattlerMoveSlotId: @ 817F33C
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -4809,7 +4809,7 @@ GetBankMoveSlotId: @ 817F33C
ldr r6, =gPlayerParty
_0817F356:
movs r4, 0
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r5, 1
adds r5, r0, r1
b _0817F36E
@@ -4835,7 +4835,7 @@ _0817F388:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end GetBankMoveSlotId
thumb_func_end GetBattlerMoveSlotId
thumb_func_start sub_817F394
sub_817F394: @ 817F394
asm/battle_tower.s
+1 -1
View File
@@ -5354,7 +5354,7 @@ sub_8164E04: @ 8164E04
adds r0, r2
ldrh r1, [r5]
bl sub_8165B88
ldr r6, =gBattlePartyID
ldr r6, =gBattlerPartyIndexes
ldrh r0, [r6, 0x2]
movs r5, 0x64
muls r0, r5
asm/contest.s
+12 -12
View File
@@ -1058,12 +1058,12 @@ _080D8004:
strb r2, [r1, 0x3]
ldr r0, =gBattleTypeFlags
str r4, [r0]
ldr r4, =gBattleAttacker
ldr r4, =gBattleMoveAttacker
strb r2, [r4]
ldr r0, =gBattleDefender
ldr r0, =gBattleMoveTarget
strb r3, [r0]
bl sub_80DB0C4
ldr r2, =gBankSpriteIds
ldr r2, =gBattlerSpriteIds
ldrb r1, [r4]
adds r1, r2
strb r0, [r1]
@@ -2547,8 +2547,8 @@ _080D8DD0:
lsls r4, 3
adds r4, r0
strh r5, [r4, 0xC]
ldr r1, =gBankSpriteIds
ldr r0, =gBattleAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleMoveAttacker
ldrb r0, [r0]
adds r0, r1
strb r5, [r0]
@@ -13796,9 +13796,9 @@ sub_80DEA20: @ 80DEA20
push {lr}
ldr r0, =SpriteCallbackDummy
bl CreateInvisibleSpriteWithCallback
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
strb r0, [r1, 0x3]
ldr r0, =gBattleDefender
ldr r0, =gBattleMoveTarget
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -13817,7 +13817,7 @@ sub_80DEA20: @ 80DEA20
thumb_func_start sub_80DEA5C
sub_80DEA5C: @ 80DEA5C
push {r4,lr}
ldr r0, =gBankSpriteIds
ldr r0, =gBattlerSpriteIds
ldrb r0, [r0, 0x3]
lsls r4, r0, 4
adds r4, r0
@@ -13829,13 +13829,13 @@ sub_80DEA5C: @ 80DEA5C
strh r0, [r4, 0x26]
movs r0, 0x3
movs r1, 0
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
movs r0, 0x3
movs r1, 0x1
bl GetBankCoord
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -13905,12 +13905,12 @@ _080DEAD0:
.4byte _080DEB60
.4byte _080DEB60
_080DEB54:
ldr r1, =gBattleDefender
ldr r1, =gBattleMoveTarget
movs r0, 0x2
b _080DEB64
.pool
_080DEB60:
ldr r1, =gBattleDefender
ldr r1, =gBattleMoveTarget
movs r0, 0x3
_080DEB64:
strb r0, [r1]
asm/party_menu.s
+7 -7
View File
@@ -16048,7 +16048,7 @@ _081B8AFC:
adds r0, r5, 0
bl sub_81B8F38
lsls r0, 24
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
lsls r1, r4, 1
adds r1, r2
lsrs r0, 24
@@ -16115,7 +16115,7 @@ _081B8BA8:
ldr r1, =gUnknown_0203CEE8
movs r0, 0x1
strb r0, [r1]
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBankInMenu
ldrb r0, [r0]
lsls r0, 1
@@ -16150,7 +16150,7 @@ _081B8BFC:
_081B8C20:
ldr r0, =gBankInMenu
ldrb r0, [r0]
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, 1
adds r0, r1
ldrb r0, [r0]
@@ -16230,7 +16230,7 @@ _081B8CBE:
movs r0, 0
bl GetBattlerAtPosition
mov r2, sp
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
adds r0, r1
@@ -16257,7 +16257,7 @@ _081B8CFC:
movs r0, 0
bl GetBattlerAtPosition
mov r1, sp
ldr r4, =gBattlePartyID
ldr r4, =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
adds r0, r4
@@ -16388,7 +16388,7 @@ _081B8DF0:
bne _081B8E28
movs r3, 0x1
mov r2, sp
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r0, [r0]
@@ -16412,7 +16412,7 @@ _081B8E1A:
_081B8E28:
movs r3, 0x2
mov r1, sp
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r2
ldrh r0, [r0]
asm/pokemon_item_effect.s
+4 -4
View File
@@ -130,7 +130,7 @@ _0806BDC4:
ldrb r0, [r0]
cmp r1, r0
bge _0806BE70
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
lsls r0, r1, 1
adds r0, r2
ldrh r3, [r0]
@@ -973,7 +973,7 @@ _0806C4FC:
ldrb r0, [r2]
bics r0, r1
strb r0, [r2]
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r3, 1
adds r0, r1
ldrb r0, [r0]
@@ -1155,9 +1155,9 @@ _0806C6AE:
movs r0, 0
movs r1, 0
movs r2, 0
bl EmitGetMonData
bl BtlController_EmitGetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
bl MarkBattlerForControllerExec
strb r5, [r4]
b _0806C6EC
.pool