ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

GetBattlerSpriteId -> GetAnimBattlerSpriteId

Browse Source
This commit is contained in:
camthesaxman 2018-02-06 14:00:01 -06:00
parent 6a4967689e
commit aba388d332
6 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
asm/battle_anim_80A5C6C.s
View File

@ -716,8 +716,8 @@ _080A6238:
bx r1 bx r1
thumb_func_end sub_80A6190 thumb_func_end sub_80A6190
thumb_func_start GetBattlerSpriteId thumb_func_start GetAnimBattlerSpriteId
GetBattlerSpriteId: @ 80A6240 GetAnimBattlerSpriteId: @ 80A6240
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -785,7 +785,7 @@ _080A62CA:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end GetBattlerSpriteId thumb_func_end GetAnimBattlerSpriteId
thumb_func_start StoreSpriteCallbackInData6 thumb_func_start StoreSpriteCallbackInData6
StoreSpriteCallbackInData6: @ 80A62D4 StoreSpriteCallbackInData6: @ 80A62D4
@ -2889,7 +2889,7 @@ sub_80A7238: @ 80A7238
beq _080A7268 beq _080A7268
ldr r4, =gSprites ldr r4, =gSprites
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@ -3858,7 +3858,7 @@ duplicate_obj_of_side_rel2move_in_transparent_mode: @ 80A79E8
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0xFF cmp r1, 0xFF
@ -4084,7 +4084,7 @@ sub_80A7B98: @ 80A7B98
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0xFF cmp r3, 0xFF
@ -6101,7 +6101,7 @@ sub_80A8BC4: @ 80A8BC4
ldr r0, =gTasks ldr r0, =gTasks
adds r5, r1, r0 adds r5, r1, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r6, 0 movs r6, 0

26
asm/battle_anim_80D51AC.s
View File

@ -12,7 +12,7 @@ sub_80D51AC: @ 80D51AC
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs ldr r4, =gBattleAnimArgs
ldrb r0, [r4] ldrb r0, [r4]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0xFF cmp r2, 0xFF
@ -165,7 +165,7 @@ sub_80D52D0: @ 80D52D0
bgt _080D52FC bgt _080D52FC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0xFF cmp r3, 0xFF
@ -379,7 +379,7 @@ sub_80D5484: @ 80D5484
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs ldr r4, =gBattleAnimArgs
ldrb r0, [r4] ldrb r0, [r4]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0xFF cmp r3, 0xFF
@ -603,7 +603,7 @@ sub_80D5644: @ 80D5644
lsrs r4, 24 lsrs r4, 24
ldr r5, =gBattleAnimArgs ldr r5, =gBattleAnimArgs
ldrb r0, [r5] ldrb r0, [r5]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@ -723,7 +723,7 @@ sub_80D5738: @ 80D5738
movs r6, 0x1 movs r6, 0x1
ldr r4, =gBattleAnimArgs ldr r4, =gBattleAnimArgs
ldrb r0, [r4] ldrb r0, [r4]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
movs r1, 0x8 movs r1, 0x8
@ -938,7 +938,7 @@ sub_80D58F8: @ 80D58F8
strb r0, [r2] strb r0, [r2]
ldr r5, =gBattleAnimArgs ldr r5, =gBattleAnimArgs
ldrb r0, [r5, 0x4] ldrb r0, [r5, 0x4]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r2, [r5] ldrh r2, [r5]
@ -1352,7 +1352,7 @@ sub_80D5C50: @ 80D5C50
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
_080D5C82: _080D5C82:
ldrb r0, [r5] ldrb r0, [r5]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r1, =gTasks ldr r1, =gTasks
lsls r4, r6, 2 lsls r4, r6, 2
adds r4, r6 adds r4, r6
@ -1508,7 +1508,7 @@ sub_80D5DB0: @ 80D5DB0
cmp r0, 0 cmp r0, 0
blt _080D5E10 blt _080D5E10
ldrb r0, [r1] ldrb r0, [r1]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
b _080D5E18 b _080D5E18
@ -1635,7 +1635,7 @@ sub_80D5EB8: @ 80D5EB8
_080D5ED4: _080D5ED4:
ldr r4, =gBattleAnimArgs ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x8] ldrb r0, [r4, 0x8]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gTasks ldr r2, =gTasks
@ -1836,7 +1836,7 @@ sub_80D6064: @ 80D6064
lsrs r4, 24 lsrs r4, 24
ldr r6, =gBattleAnimArgs ldr r6, =gBattleAnimArgs
ldrb r0, [r6, 0x6] ldrb r0, [r6, 0x6]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
@ -1939,7 +1939,7 @@ sub_80D6134: @ 80D6134
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r4, =gBattleAnimArgs ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x4] ldrb r0, [r4, 0x4]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
@ -2057,7 +2057,7 @@ sub_80D622C: @ 80D622C
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x4] ldrb r0, [r4, 0x4]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
@ -2290,7 +2290,7 @@ _080D63EE:
ldrh r0, [r1, 0x8] ldrh r0, [r1, 0x8]
strh r0, [r4, 0x1E] strh r0, [r4, 0x1E]
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x16] strh r0, [r4, 0x16]

116
asm/battle_anim_80FE840.s
View File

@ -1434,7 +1434,7 @@ sub_80FF3B0: @ 80FF3B0
ands r0, r1 ands r0, r1
strb r0, [r2] strb r0, [r2]
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
movs r0, 0x80 movs r0, 0x80
lsls r0, 1 lsls r0, 1
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
@ -1452,7 +1452,7 @@ sub_80FF3EC: @ 80FF3EC
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
movs r1, 0x32 movs r1, 0x32
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
cmp r0, 0 cmp r0, 0
@ -1517,7 +1517,7 @@ sub_80FF458: @ 80FF458
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
ldr r0, =gSprites ldr r0, =gSprites
@ -1567,7 +1567,7 @@ _080FF498:
orrs r0, r1 orrs r0, r1
strb r0, [r7, 0x5] strb r0, [r7, 0x5]
movs r0, 0x3 movs r0, 0x3
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r4, r1, 4 lsls r4, r1, 4
@ -1618,7 +1618,7 @@ sub_80FF53C: @ 80FF53C
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r6, r0, 0 adds r6, r0, 0
@ -1698,7 +1698,7 @@ sub_80FF5CC: @ 80FF5CC
cmp r5, 0 cmp r5, 0
bne _080FF674 bne _080FF674
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@ -1723,7 +1723,7 @@ sub_80FF5CC: @ 80FF5CC
orrs r0, r2 orrs r0, r2
strb r0, [r1, 0x5] strb r0, [r1, 0x5]
movs r0, 0x3 movs r0, 0x3
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@ -3867,7 +3867,7 @@ _08100700:
adds r0, r7 adds r0, r7
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
_0810071A: _0810071A:
adds r0, r6, 0 adds r0, r6, 0
bl sub_80A8328 bl sub_80A8328
@ -8237,7 +8237,7 @@ sub_81029B4: @ 81029B4
ldr r1, =gTasks ldr r1, =gTasks
adds r6, r0, r1 adds r6, r0, r1
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r6, 0x8] strh r0, [r6, 0x8]
@ -11678,7 +11678,7 @@ sub_81045B0: @ 81045B0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@ -11735,7 +11735,7 @@ sub_8104614: @ 8104614
cmp r1, r0 cmp r1, r0
bne _08104664 bne _08104664
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@ -11771,7 +11771,7 @@ sub_8104674: @ 8104674
ldr r0, =gTasks ldr r0, =gTasks
adds r4, r0 adds r4, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r5, 0 movs r5, 0
@ -12129,7 +12129,7 @@ sub_8104938: @ 8104938
.pool .pool
_08104964: _08104964:
ldrb r0, [r5] ldrb r0, [r5]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -12303,7 +12303,7 @@ sub_8104AB4: @ 8104AB4
ldr r0, =gTasks ldr r0, =gTasks
adds r4, r0 adds r4, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -12476,7 +12476,7 @@ sub_8104C38: @ 8104C38
ldr r0, =gTasks ldr r0, =gTasks
adds r4, r0 adds r4, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -12528,7 +12528,7 @@ sub_8104CA4: @ 8104CA4
ldr r0, =gTasks ldr r0, =gTasks
adds r4, r1, r0 adds r4, r1, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r2, 0 movs r2, 0
@ -13873,7 +13873,7 @@ sub_810577C: @ 810577C
ldr r0, =gTasks ldr r0, =gTasks
adds r4, r0 adds r4, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -13968,7 +13968,7 @@ _08105850:
_08105856: _08105856:
strh r0, [r4, 0x24] strh r0, [r4, 0x24]
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
@ -14154,7 +14154,7 @@ sub_810599C: @ 810599C
movs r0, 0x2 movs r0, 0x2
strh r0, [r4, 0x24] strh r0, [r4, 0x24]
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
@ -14939,7 +14939,7 @@ sub_8106020: @ 8106020
lsrs r0, 24 lsrs r0, 24
adds r6, r0, 0 adds r6, r0, 0
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r1, =gTasks ldr r1, =gTasks
@ -14955,7 +14955,7 @@ sub_8106020: @ 8106020
cmp r0, 0x1 cmp r0, 0x1
bne _0810607C bne _0810607C
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -15004,7 +15004,7 @@ sub_81060B0: @ 81060B0
lsrs r0, 24 lsrs r0, 24
adds r6, r0, 0 adds r6, r0, 0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r1, =gTasks ldr r1, =gTasks
@ -15020,7 +15020,7 @@ sub_81060B0: @ 81060B0
cmp r0, 0x1 cmp r0, 0x1
bne _0810610C bne _0810610C
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -16593,7 +16593,7 @@ sub_8106D90: @ 8106D90
lsrs r5, 24 lsrs r5, 24
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -18963,7 +18963,7 @@ sub_81080E4: @ 81080E4
ldr r0, =gTasks ldr r0, =gTasks
adds r4, r0 adds r4, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
@ -21389,7 +21389,7 @@ sub_8109460: @ 8109460
ldr r0, =gTasks ldr r0, =gTasks
adds r4, r0 adds r4, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r5, 0 movs r5, 0
@ -22600,12 +22600,12 @@ _08109DE2:
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x24] strh r0, [r4, 0x24]
movs r0, 0x3 movs r0, 0x3
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
@ -24532,7 +24532,7 @@ sub_810AD98: @ 810AD98
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x3A] strh r0, [r5, 0x3A]
@ -24641,7 +24641,7 @@ _0810AE8E:
b _0810AFC0 b _0810AFC0
_0810AE90: _0810AE90:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r6, 0 movs r6, 0
@ -27505,7 +27505,7 @@ _0810C594:
cmp r0, 0 cmp r0, 0
bne _0810C5F0 bne _0810C5F0
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r2, =gSprites ldr r2, =gSprites
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -30867,7 +30867,7 @@ sub_810E13C: @ 810E13C
ldr r0, =sub_810E184 ldr r0, =sub_810E184
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r2, =gSprites ldr r2, =gSprites
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -31021,7 +31021,7 @@ _0810E274:
ble _0810E2BC ble _0810E2BC
_0810E296: _0810E296:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r2, =gSprites ldr r2, =gSprites
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -32289,7 +32289,7 @@ _0810EC46:
movs r1, 0x1 movs r1, 0x1
bl sub_80A69CC bl sub_80A69CC
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r2, =gSprites ldr r2, =gSprites
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -32379,7 +32379,7 @@ _0810ECE0:
cmp r0, r1 cmp r0, r1
bge _0810ED1E bge _0810ED1E
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r2, =gSprites ldr r2, =gSprites
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -32416,7 +32416,7 @@ sub_810ED28: @ 810ED28
ldr r0, =sub_810ED70 ldr r0, =sub_810ED70
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r2, =gSprites ldr r2, =gSprites
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -32989,7 +32989,7 @@ sub_810F184: @ 810F184
cmp r0, 0 cmp r0, 0
bne _0810F1BC bne _0810F1BC
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@ -33005,7 +33005,7 @@ sub_810F184: @ 810F184
.pool .pool
_0810F1BC: _0810F1BC:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@ -33774,7 +33774,7 @@ sub_810F7D4: @ 810F7D4
ldr r0, =gTasks ldr r0, =gTasks
adds r4, r0 adds r4, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -33824,7 +33824,7 @@ sub_810F83C: @ 810F83C
ldr r0, =gTasks ldr r0, =gTasks
adds r4, r1, r0 adds r4, r1, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
@ -34891,7 +34891,7 @@ _08110094:
bl CalcCenterToCornerVec bl CalcCenterToCornerVec
ldr r1, =gBattleAnimArgs ldr r1, =gBattleAnimArgs
ldrb r0, [r1] ldrb r0, [r1]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r7, 0x22] strh r0, [r7, 0x22]
@ -36732,7 +36732,7 @@ _0811101E:
strh r0, [r6, 0x24] strh r0, [r6, 0x24]
strh r5, [r6, 0xA] strh r5, [r6, 0xA]
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r6, 0x26] strh r0, [r6, 0x26]
@ -37770,7 +37770,7 @@ sub_811188C: @ 811188C
movs r0, 0x52 movs r0, 0x52
bl SetGpuReg bl SetGpuReg
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@ -37881,7 +37881,7 @@ sub_811196C: @ 811196C
.pool .pool
_08111994: _08111994:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
@ -38626,7 +38626,7 @@ _08111F0C:
movs r0, 0x10 movs r0, 0x10
strh r0, [r5, 0xE] strh r0, [r5, 0xE]
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
@ -38888,7 +38888,7 @@ _081121AE:
movs r0, 0x3 movs r0, 0x3
strb r0, [r1, 0x15] strb r0, [r1, 0x15]
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x24] strh r0, [r4, 0x24]
@ -42979,7 +42979,7 @@ sub_8114374: @ 8114374
_0811438A: _0811438A:
lsls r0, r4, 24 lsls r0, r4, 24
lsrs r0, 24 lsrs r0, 24
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0xFF cmp r0, 0xFF
@ -43295,7 +43295,7 @@ _08114650:
lsrs r5, r0, 16 lsrs r5, r0, 16
_0811465C: _0811465C:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@ -43421,7 +43421,7 @@ _08114776:
cmp r0, 0x2 cmp r0, 0x2
bne _08114824 bne _08114824
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r5, =gSprites ldr r5, =gSprites
@ -43562,7 +43562,7 @@ _081148C4:
.4byte _081148FC .4byte _081148FC
_081148E4: _081148E4:
ldrb r0, [r2] ldrb r0, [r2]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
b _08114902 b _08114902
@ -44092,7 +44092,7 @@ _08114D28:
.4byte _08114E8C .4byte _08114E8C
_08114D3C: _08114D3C:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x1C] strh r0, [r4, 0x1C]
@ -44272,7 +44272,7 @@ sub_8114EB4: @ 8114EB4
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@ -44361,7 +44361,7 @@ sub_8114F54: @ 8114F54
.pool .pool
_08114F78: _08114F78:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x1C] strh r0, [r4, 0x1C]
@ -44438,7 +44438,7 @@ _08115004:
.4byte _081150D4 .4byte _081150D4
_08115018: _08115018:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x1C] strh r0, [r4, 0x1C]
@ -44846,7 +44846,7 @@ _08115370:
.pool .pool
_08115380: _08115380:
ldrb r0, [r6] ldrb r0, [r6]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x1A] strh r0, [r4, 0x1A]
@ -47048,7 +47048,7 @@ sub_81164F0: @ 81164F0
adds r4, r0, 0 adds r4, r0, 0
ldr r5, =gBattleAnimArgs ldr r5, =gBattleAnimArgs
ldrb r0, [r5] ldrb r0, [r5]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
@ -47965,7 +47965,7 @@ _08116CA0:
lsrs r5, r0, 16 lsrs r5, r0, 16
_08116CAC: _08116CAC:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@ -48119,7 +48119,7 @@ _08116DF6:
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r4, =gSprites ldr r4, =gSprites
movs r0, 0x8 movs r0, 0x8
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]

54
asm/battle_anim_815A0D4.s
View File

@ -1922,7 +1922,7 @@ sub_815AFF0: @ 815AFF0
strh r0, [r4, 0x12] strh r0, [r4, 0x12]
strh r5, [r4, 0x14] strh r5, [r4, 0x14]
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
@ -2320,7 +2320,7 @@ sub_815B338: @ 815B338
.pool .pool
_0815B35C: _0815B35C:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -2351,7 +2351,7 @@ sub_815B394: @ 815B394
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r0, 0 adds r5, r0, 0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
movs r1, 0x2E movs r1, 0x2E
@ -2728,7 +2728,7 @@ sub_815B65C: @ 815B65C
cmp r0, 0 cmp r0, 0
bne _0815B69C bne _0815B69C
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -2770,7 +2770,7 @@ sub_815B6B4: @ 815B6B4
cmp r0, 0 cmp r0, 0
bne _0815B6F4 bne _0815B6F4
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -2868,7 +2868,7 @@ sub_815B778: @ 815B778
cmp r0, 0 cmp r0, 0
bne _0815B7B8 bne _0815B7B8
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -4272,7 +4272,7 @@ sub_815C3A8: @ 815C3A8
cmp r0, 0 cmp r0, 0
bne _0815C3E8 bne _0815C3E8
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -4419,7 +4419,7 @@ _0815C4BC:
subs r0, 0x1 subs r0, 0x1
strh r0, [r4, 0x14] strh r0, [r4, 0x14]
ldrb r0, [r5] ldrb r0, [r5]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
@ -4758,7 +4758,7 @@ sub_815C770: @ 815C770
strh r0, [r4, 0x24] strh r0, [r4, 0x24]
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
@ -5110,7 +5110,7 @@ _0815CA5E:
strh r0, [r2, 0x1E] strh r0, [r2, 0x1E]
mov r1, r8 mov r1, r8
ldrb r0, [r1] ldrb r0, [r1]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r1, =gTasks ldr r1, =gTasks
@ -5674,7 +5674,7 @@ sub_815CED8: @ 815CED8
lsrs r0, 24 lsrs r0, 24
str r0, [sp, 0x18] str r0, [sp, 0x18]
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
bl IsContest bl IsContest
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
@ -6118,7 +6118,7 @@ _0815D2B4:
strh r0, [r4, 0x24] strh r0, [r4, 0x24]
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
@ -6562,7 +6562,7 @@ sub_815D64C: @ 815D64C
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -7399,7 +7399,7 @@ _0815DCEA:
strh r0, [r5, 0x14] strh r0, [r5, 0x14]
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -7661,7 +7661,7 @@ sub_815DF0C: @ 815DF0C
ldrh r0, [r1, 0x2] ldrh r0, [r1, 0x2]
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
ldrb r0, [r1] ldrb r0, [r1]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@ -8827,7 +8827,7 @@ _0815E85C:
ldrh r0, [r2, 0x2] ldrh r0, [r2, 0x2]
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
ldrb r0, [r2] ldrb r0, [r2]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -9326,7 +9326,7 @@ sub_815EC48: @ 815EC48
ldr r0, =gTasks ldr r0, =gTasks
adds r6, r1, r0 adds r6, r1, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r6, 0x26] strh r0, [r6, 0x26]
@ -10057,7 +10057,7 @@ sub_815F20C: @ 815F20C
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
adds r2, r5, 0 adds r2, r5, 0
@ -10191,7 +10191,7 @@ sub_815F330: @ 815F330
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r1, =gTasks ldr r1, =gTasks
@ -10943,7 +10943,7 @@ _0815F92C:
.4byte _0815FD8C .4byte _0815FD8C
_0815F940: _0815F940:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r1, =gTasks ldr r1, =gTasks
@ -11096,7 +11096,7 @@ _0815FA9C:
ldrh r6, [r1, 0x2] ldrh r6, [r1, 0x2]
_0815FA9E: _0815FA9E:
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r2, =gSprites ldr r2, =gSprites
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -11160,7 +11160,7 @@ _0815FB2C:
ldrh r6, [r1, 0x2] ldrh r6, [r1, 0x2]
_0815FB2E: _0815FB2E:
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r2, =gSprites ldr r2, =gSprites
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -11365,7 +11365,7 @@ _0815FCE8:
.pool .pool
_0815FD08: _0815FD08:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r1, =gTasks ldr r1, =gTasks
@ -11425,7 +11425,7 @@ _0815FD7E:
.pool .pool
_0815FD8C: _0815FD8C:
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r1, =gTasks ldr r1, =gTasks
@ -11595,7 +11595,7 @@ _0815FE92:
cmp r0, 0 cmp r0, 0
bne _0815FFBC bne _0815FFBC
movs r0, 0x1 movs r0, 0x1
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r2, =gSprites ldr r2, =gSprites
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -11893,7 +11893,7 @@ sub_8160164: @ 8160164
ldr r0, =gTasks ldr r0, =gTasks
adds r4, r1, r0 adds r4, r1, r0
movs r0, 0 movs r0, 0
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r5, 0 movs r5, 0
@ -12396,7 +12396,7 @@ sub_8160544: @ 8160544
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSpriteId bl GetAnimBattlerSpriteId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24

2
include/battle_anim.h
View File

@ -89,7 +89,7 @@ u8 GetBattlerSpriteCoord(u8 bank, u8 attributeId);
bool8 IsBattlerSpritePresent(u8 bank); bool8 IsBattlerSpritePresent(u8 bank);
void sub_80A6C68(u8 arg0); void sub_80A6C68(u8 arg0);
u8 GetBattlerSpriteId(u8 wantedBank); u8 GetAnimBattlerSpriteId(u8 wantedBank);
bool8 IsDoubleBattle(void); bool8 IsDoubleBattle(void);
u8 sub_80A6D94(void); u8 sub_80A6D94(void);
u8 sub_80A8364(u8); u8 sub_80A8364(u8);

12
src/battle_anim.c
View File

@ -1751,7 +1751,7 @@ static void ScriptCmd_invisible(void)
{ {
u8 spriteId; u8 spriteId;
spriteId = GetBattlerSpriteId(sBattleAnimScriptPtr[1]); spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
if (spriteId != 0xFF) if (spriteId != 0xFF)
gSprites[spriteId].invisible = 1; gSprites[spriteId].invisible = 1;
@ -1762,7 +1762,7 @@ static void ScriptCmd_visible(void)
{ {
u8 spriteId; u8 spriteId;
spriteId = GetBattlerSpriteId(sBattleAnimScriptPtr[1]); spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
if (spriteId != 0xFF) if (spriteId != 0xFF)
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = 0;
@ -1783,12 +1783,12 @@ static void ScriptCmd_doublebattle_2D(void)
if (wantedBank == ANIM_ATTACKER) if (wantedBank == ANIM_ATTACKER)
{ {
r4 = sub_80A8364(gBattleAnimAttacker); r4 = sub_80A8364(gBattleAnimAttacker);
spriteId = GetBattlerSpriteId(ANIM_ATTACKER); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
} }
else else
{ {
r4 = sub_80A8364(gBattleAnimTarget); r4 = sub_80A8364(gBattleAnimTarget);
spriteId = GetBattlerSpriteId(ANIM_TARGET); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
} }
if (spriteId != 0xFF) if (spriteId != 0xFF)
{ {
@ -1818,12 +1818,12 @@ static void ScriptCmd_doublebattle_2E(void)
if (wantedBank == ANIM_ATTACKER) if (wantedBank == ANIM_ATTACKER)
{ {
r4 = sub_80A8364(gBattleAnimAttacker); r4 = sub_80A8364(gBattleAnimAttacker);
spriteId = GetBattlerSpriteId(ANIM_ATTACKER); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
} }
else else
{ {
r4 = sub_80A8364(gBattleAnimTarget); r4 = sub_80A8364(gBattleAnimTarget);
spriteId = GetBattlerSpriteId(ANIM_TARGET); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
} }
if (spriteId != 0xFF && r4 == 2) if (spriteId != 0xFF && r4 == 2)