Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-09-13 13:36:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use 'battler' instead of 'bank'

Browse Source
This commit is contained in:
Marcus Huderle
2018-04-06 16:24:35 -07:00
parent 818801cf5a
commit c36715e3b6
108 changed files with 907 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
asm/battle_anim_812C144.s
View File

@@ -92,7 +92,7 @@ sub_812C1D0: @ 812C1D0
ldr r6, _0812C21C @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 8
@@ -102,7 +102,7 @@ sub_812C1D0: @ 812C1D0
asrs r4, 16
ldrb r0, [r6]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r1, r0, 0
lsls r1, 24
lsrs r1, 8
@@ -213,13 +213,13 @@ sub_812C2BC: @ 812C2BC
ldr r4, _0812C348 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r7, r0, 0
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r6, r0, 0
@@ -1309,13 +1309,13 @@ sub_812CAFC: @ 812CAFC
ldr r4, _0812CB74 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1562,7 +1562,7 @@ _0812CD04:
_0812CD06:
ldrb r0, [r4]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x2]
@@ -1570,7 +1570,7 @@ _0812CD06:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1977,13 +1977,13 @@ sub_812D008: @ 812D008
ldr r6, _0812D060 @ =gAnimBankAttacker
ldrb r0, [r6]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xC]
ldrb r0, [r6]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xE]
@@ -1993,7 +1993,7 @@ sub_812D008: @ 812D008
strh r0, [r4, 0x12]
strh r5, [r4, 0x14]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -2366,13 +2366,13 @@ _0812D2F0:
ldr r4, _0812D348 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -2409,7 +2409,7 @@ sub_812D350: @ 812D350
_0812D370: .4byte gTasks
_0812D374:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2441,7 +2441,7 @@ sub_812D3AC: @ 812D3AC
push {r4-r6,lr}
adds r5, r0, 0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r6, r0, 24
movs r1, 0x2E
@@ -2463,13 +2463,13 @@ _0812D3D6:
ldr r4, _0812D408 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2829,7 +2829,7 @@ sub_812D674: @ 812D674
cmp r0, 0
bne _0812D6B4
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2873,7 +2873,7 @@ sub_812D6CC: @ 812D6CC
cmp r0, 0
bne _0812D70C
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2922,7 +2922,7 @@ _0812D736:
ldr r0, _0812D75C @ =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -2974,7 +2974,7 @@ sub_812D790: @ 812D790
cmp r0, 0
bne _0812D7D0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3858,14 +3858,14 @@ _0812DED6:
ldr r4, _0812DFD0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, r5
strh r0, [r7, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -4587,7 +4587,7 @@ sub_812E498: @ 812E498
cmp r0, 0
bne _0812E4D8
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4739,7 +4739,7 @@ _0812E5AC:
subs r0, 0x1
strh r0, [r4, 0x14]
ldrb r0, [r5]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5090,7 +5090,7 @@ sub_812E860: @ 812E860
strh r0, [r4, 0x24]
ldr r0, _0812E8AC @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5332,13 +5332,13 @@ sub_812EA4C: @ 812EA4C
ldr r4, _0812EAA8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -5453,7 +5453,7 @@ _0812EB4E:
strh r0, [r2, 0x1E]
mov r1, r8
ldrb r0, [r1]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _0812EB8C @ =gTasks
@@ -5895,13 +5895,13 @@ sub_812EEA4: @ 812EEA4
ldr r5, _0812EEE0 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -6045,7 +6045,7 @@ sub_812EFC8: @ 812EFC8
lsrs r0, 24
str r0, [sp, 0x10]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
bl IsContest
lsls r0, 24
cmp r0, 0
@@ -6219,13 +6219,13 @@ _0812F13E:
ldr r5, _0812F21C @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
mov r2, r10
lsls r1, r2, 16
@@ -6503,7 +6503,7 @@ _0812F388:
strh r0, [r4, 0x24]
ldr r0, _0812F3C4 @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -6974,7 +6974,7 @@ sub_812F724: @ 812F724
strh r0, [r4, 0x8]
ldr r0, _0812F760 @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7262,7 +7262,7 @@ _0812F96E:
ldr r4, _0812F9A8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x2]
@@ -7270,7 +7270,7 @@ _0812F96E:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x4]
@@ -7833,13 +7833,13 @@ _0812FDC2:
ldrb r4, [r0]
adds r0, r4, 0
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
adds r0, r4, 0
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
@@ -7850,7 +7850,7 @@ _0812FDC2:
strh r0, [r5, 0x14]
ldr r0, _0812FE14 @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -8123,7 +8123,7 @@ sub_812FFE4: @ 812FFE4
ldrh r0, [r1, 0x2]
strh r0, [r4, 0xA]
ldrb r0, [r1]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _08130034 @ =gSprites
@@ -8262,7 +8262,7 @@ sub_81300F4: @ 81300F4
_08130110:
ldrb r0, [r6]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _08130150 @ =gBattleAnimArgs
lsrs r0, 24
@@ -8271,7 +8271,7 @@ _08130110:
strh r0, [r5, 0x20]
ldrb r0, [r6]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
@@ -8410,7 +8410,7 @@ _08130226:
bne _08130260
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8431,7 +8431,7 @@ _0813025C: .4byte gAnimBankAttacker
_08130260:
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8451,7 +8451,7 @@ _08130284:
ldr r5, _081302D8 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8470,13 +8470,13 @@ _081302A8:
ldr r4, _081302DC @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x24]
@@ -8840,14 +8840,14 @@ sub_8130554: @ 8130554
mov r10, r0
ldrb r0, [r0]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x1E]
mov r1, r10
ldrb r0, [r1]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x20]
@@ -8855,14 +8855,14 @@ sub_8130554: @ 8130554
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x22]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r4, r0, 0
mov r1, r8
ldrb r0, [r1]
@@ -9163,7 +9163,7 @@ _081307FC:
strh r1, [r4, 0x3C]
adds r0, r5, 0
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -9336,7 +9336,7 @@ _08130934:
ldrh r0, [r2, 0x2]
strh r0, [r4, 0x8]
ldrb r0, [r2]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -9470,7 +9470,7 @@ _08130A48:
_08130A4A:
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -9858,7 +9858,7 @@ sub_8130D20: @ 8130D20
ldr r0, _08130D7C @ =gTasks
adds r6, r1, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
@@ -9874,7 +9874,7 @@ sub_8130D20: @ 8130D20
ldr r5, _08130D80 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -9882,7 +9882,7 @@ sub_8130D20: @ 8130D20
movs r0, 0x2
eors r0, r1
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -10323,14 +10323,14 @@ _081310C4:
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r5, r0, 24
ldrh r0, [r4, 0x3C]
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r1, r0, 24
_081310E4:
@@ -10547,10 +10547,10 @@ sub_8131264: @ 8131264
ldr r4, _081312A0 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
ldrb r0, [r4]
bl GetBattlerSide
lsls r0, 24
@@ -10614,7 +10614,7 @@ sub_81312E4: @ 81312E4
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r5, r0, 24
adds r2, r5, 0
@@ -10755,7 +10755,7 @@ sub_8131408: @ 8131408
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r3, r0, 24
ldr r1, _08131434 @ =gTasks
@@ -10960,7 +10960,7 @@ _081315A0:
ldr r0, _081315C0 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -11473,7 +11473,7 @@ _0813197C:
.4byte _08131DC4
_08131990:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _081319DC @ =gTasks
@@ -11633,7 +11633,7 @@ _08131AE4:
ldrh r5, [r1, 0x2]
_08131AE6:
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _08131B0C @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -11699,7 +11699,7 @@ _08131B70:
ldrh r5, [r1, 0x2]
_08131B72:
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _08131C04 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -11719,7 +11719,7 @@ _08131B94:
ldr r0, _08131C0C @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
lsls r3, r6, 16
@@ -11861,7 +11861,7 @@ _08131C8E:
ldr r0, _08131CE8 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -11878,7 +11878,7 @@ _08131CEC:
ldr r0, _08131D30 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -11916,7 +11916,7 @@ _08131D38: .4byte 0x0000ffff
_08131D3C: .4byte gTasks
_08131D40:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _08131D8C @ =gTasks
@@ -11980,7 +11980,7 @@ _08131DB6:
_08131DC0: .4byte gTasks
_08131DC4:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _08131E38 @ =gTasks
@@ -12024,7 +12024,7 @@ _08131DC4:
mov r1, r10
ldrb r0, [r1]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r3, r5, 0
@@ -12057,7 +12057,7 @@ _08131E44:
mov r2, r10
ldrb r0, [r2]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r3, r5, 0
@@ -12126,7 +12126,7 @@ _08131ECA:
ldr r0, _08131F54 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -12155,7 +12155,7 @@ _08131ECA:
cmp r0, 0
bne _08131FF4
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _08131F60 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -12292,14 +12292,14 @@ _08132040:
ldr r0, _08132084 @ =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
ldr r0, _08132088 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
@@ -12473,7 +12473,7 @@ sub_813219C: @ 813219C
ldr r0, _08132204 @ =gTasks
adds r4, r1, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -12764,7 +12764,7 @@ sub_81323E0: @ 81323E0
ldr r4, _08132424 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -12996,7 +12996,7 @@ sub_813257C: @ 813257C
strh r0, [r4, 0x8]
ldr r0, _081325B8 @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24

20
asm/battle_anim_813F0F4.s
View File

@@ -972,13 +972,13 @@ _0813F8D8:
ldr r5, _0813F950 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r1, r0, 0
lsls r1, 24
ldr r2, _0813F954 @ =gSprites
@@ -1238,14 +1238,14 @@ sub_813FA94: @ 813FA94
mov r8, r2
ldrb r0, [r2]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1400,14 +1400,14 @@ _0813FBE0:
mov r8, r1
ldrb r0, [r1]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -5124,12 +5124,12 @@ _08141966:
ldrb r0, [r4, 0x8]
mov r8, r0
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r5, r0, 24
mov r0, r8
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0x1E
@@ -5487,7 +5487,7 @@ sub_8141C30: @ 8141C30
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r5, _08141CA4 @ =gBattleAnimArgs
lsrs r0, 24
@@ -5499,7 +5499,7 @@ sub_8141C30: @ 8141C30
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]

60
asm/current.s
View File

@@ -21,7 +21,7 @@ sub_80D648C: @ 80D648C
ldr r6, _080D6504 @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -29,7 +29,7 @@ sub_80D648C: @ 80D648C
strh r0, [r4, 0x34]
ldrb r0, [r6]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -201,7 +201,7 @@ _080D6606:
ldr r5, _080D664C @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080D6650 @ =gBattleAnimArgs
lsrs r0, 24
@@ -210,7 +210,7 @@ _080D6606:
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -278,7 +278,7 @@ _080D669C:
_080D66A4:
adds r0, r6, 0
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080D6718 @ =gBattleAnimArgs
lsrs r0, 24
@@ -287,7 +287,7 @@ _080D66A4:
strh r0, [r5, 0x20]
adds r0, r6, 0
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r4, 0x2]
@@ -465,7 +465,7 @@ sub_80D681C: @ 80D681C
ldr r6, _080D6864 @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
ldr r1, _080D6868 @ =gTasks
lsls r4, r5, 2
adds r4, r5
@@ -479,7 +479,7 @@ sub_80D681C: @ 80D681C
strh r0, [r4, 0x8]
ldrb r0, [r6]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r5, 0x2]
@@ -887,13 +887,13 @@ _080D6B68:
_080D6B6A:
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x26]
@@ -1120,13 +1120,13 @@ _080D6D34:
_080D6D36:
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1163,13 +1163,13 @@ _080D6D8C:
_080D6D8E:
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1202,18 +1202,18 @@ sub_80D6DD8: @ 80D6DD8
ldr r4, _080D6E30 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x3A]
@@ -1326,7 +1326,7 @@ _080D6ECE:
b _080D7000
_080D6ED0:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r6, 0
@@ -1334,7 +1334,7 @@ _080D6ED0:
ldr r4, _080D6F04 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
@@ -1551,13 +1551,13 @@ _080D7084: .4byte 0x0000fff0
_080D7088:
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
@@ -1577,13 +1577,13 @@ _080D70B0:
ldr r4, _080D70E4 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r2, 0xA
@@ -1829,13 +1829,13 @@ _080D728E:
ldr r4, _080D72BC @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1899,13 +1899,13 @@ _080D731C:
ldr r4, _080D73A0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x16]
@@ -1914,7 +1914,7 @@ _080D731C:
ldr r0, _080D73A4 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x1C]
@@ -2257,7 +2257,7 @@ _080D75CA:
ldr r0, _080D7614 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -2279,7 +2279,7 @@ _080D75F4:
ldr r4, _080D7614 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]

62
asm/flying.s
View File

@@ -194,7 +194,7 @@ _080DA18C:
ldr r5, _080DA1E0 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -204,7 +204,7 @@ _080DA18C:
strh r0, [r6, 0x34]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -282,13 +282,13 @@ _080DA234:
_080DA24C:
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r2, _080DA2A8 @ =gBattleAnimArgs
ldrh r1, [r2]
@@ -308,13 +308,13 @@ _080DA24C:
ldr r4, _080DA2AC @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -374,7 +374,7 @@ sub_80DA300: @ 80DA300
ldr r0, _080DA340 @ =sub_80DA348
str r0, [r4, 0x1C]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080DA344 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -470,7 +470,7 @@ _080DA3C2:
ldr r4, _080DA408 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -478,7 +478,7 @@ _080DA3C2:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -537,7 +537,7 @@ _080DA438:
ble _080DA480
_080DA45A:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080DA488 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -638,7 +638,7 @@ _080DA502:
_080DA518:
adds r0, r6, 0
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080DA5B4 @ =gBattleAnimArgs
lsrs r0, 24
@@ -647,7 +647,7 @@ _080DA518:
strh r0, [r7, 0x20]
adds r0, r6, 0
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
ldrh r1, [r4, 0x2]
lsrs r0, 24
@@ -1733,13 +1733,13 @@ sub_80DAD30: @ 80DAD30
ldr r5, _080DAD7C @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -1784,7 +1784,7 @@ sub_80DAD84: @ 80DAD84
beq _080DADE0
adds r0, r2, 0
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -1799,7 +1799,7 @@ _080DADDC: .4byte gAnimBankTarget
_080DADE0:
adds r0, r2, 0
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x28
@@ -1849,7 +1849,7 @@ _080DAE44:
ldr r0, _080DAEFC @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -2239,13 +2239,13 @@ sub_80DB0E8: @ 80DB0E8
ldr r5, _080DB190 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -2293,7 +2293,7 @@ _080DB1A6:
movs r1, 0x1
bl InitAnimSpritePos
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080DB1D4 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2349,7 +2349,7 @@ _080DB210:
ldr r0, _080DB228 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -2385,7 +2385,7 @@ _080DB240:
cmp r0, r1
bge _080DB27E
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080DB284 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2423,7 +2423,7 @@ sub_80DB288: @ 80DB288
ldr r0, _080DB2C8 @ =sub_80DB2D0
str r0, [r4, 0x1C]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080DB2CC @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2566,13 +2566,13 @@ _080DB3A0:
_080DB3A2:
ldrb r0, [r4]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2726,13 +2726,13 @@ _080DB4D4:
_080DB4D6:
ldrb r0, [r4]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -2885,14 +2885,14 @@ sub_80DB5E4: @ 80DB5E4
ldr r6, _080DB698 @ =gAnimBankAttacker
ldrb r0, [r6]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x20]
ldrb r0, [r6]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -3012,7 +3012,7 @@ unref_sub_80DB6E4: @ 80DB6E4
cmp r0, 0
bne _080DB71C
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080DB718 @ =gSprites
@@ -3030,7 +3030,7 @@ _080DB714: .4byte gBattleAnimArgs
_080DB718: .4byte gSprites
_080DB71C:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080DB748 @ =gSprites

42
asm/ghost.s
View File

@@ -21,7 +21,7 @@ sub_80DDB6C: @ 80DDB6C
ldr r5, _080DDBCC @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -29,7 +29,7 @@ sub_80DDB6C: @ 80DDB6C
strh r0, [r4, 0x34]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -358,7 +358,7 @@ sub_80DDDF0: @ 80DDDF0
adds r0, r2, 0
strh r0, [r1]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -475,7 +475,7 @@ sub_80DDED0: @ 80DDED0
_080DDEF4: .4byte gTasks
_080DDEF8:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r1, r0, 24
ldrh r0, [r4, 0x8]
@@ -524,7 +524,7 @@ sub_80DDF40: @ 80DDF40
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -533,7 +533,7 @@ sub_80DDF40: @ 80DDF40
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -643,13 +643,13 @@ _080DE032:
ldr r4, _080DE098 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x30]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -706,13 +706,13 @@ _080DE09C:
ldr r4, _080DE0EC @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1219,7 +1219,7 @@ _080DE464:
movs r0, 0x10
strh r0, [r5, 0xE]
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1511,7 +1511,7 @@ _080DE6EE:
movs r0, 0x3
strb r0, [r1, 0x15]
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x24]
@@ -1620,12 +1620,12 @@ sub_80DE7B8: @ 80DE7B8
ldr r4, _080DE7F8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r2, 0xE0
@@ -1642,12 +1642,12 @@ _080DE800:
ldr r4, _080DE8C8 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r2, 0xE0
@@ -1658,13 +1658,13 @@ _080DE800:
_080DE824:
ldrb r0, [r4]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldrb r0, [r4]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r1, 0xE0
@@ -1816,7 +1816,7 @@ sub_80DE918: @ 80DE918
ldr r4, _080DEA74 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -1868,7 +1868,7 @@ _080DE98A:
beq _080DEA56
adds r0, r4, 0
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -2880,7 +2880,7 @@ sub_80DF1A4: @ 80DF1A4
ldr r5, _080DF240 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1A]

38
asm/ground.s
View File

@@ -14,13 +14,13 @@ sub_80E0F1C: @ 80E0F1C
ldr r5, _080E0F74 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -29,13 +29,13 @@ sub_80E0F1C: @ 80E0F1C
ldr r5, _080E0F78 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -79,13 +79,13 @@ sub_80E0F84: @ 80E0F84
ldr r4, _080E0FE0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -143,7 +143,7 @@ _080E1024:
ldr r5, _080E106C @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -151,7 +151,7 @@ _080E1024:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -264,7 +264,7 @@ sub_80E1108: @ 80E1108
ldr r4, _080E1174 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r6, 0x2]
@@ -272,7 +272,7 @@ sub_80E1108: @ 80E1108
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r3, [r6, 0x4]
@@ -475,7 +475,7 @@ _080E12B0:
.4byte _080E1414
_080E12C4:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -670,7 +670,7 @@ sub_80E143C: @ 80E143C
lsls r0, 24
lsrs r5, r0, 24
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080E147C @ =gSprites
@@ -768,7 +768,7 @@ sub_80E14DC: @ 80E14DC
_080E14FC: .4byte gTasks
_080E1500:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -848,7 +848,7 @@ _080E158C:
.4byte _080E165C
_080E15A0:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -1082,7 +1082,7 @@ _080E1746:
_080E1762:
adds r0, r4, 0
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
@@ -1152,7 +1152,7 @@ _080E17EA:
ldrb r5, [r0]
adds r0, r5, 0
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldr r2, _080E184C @ =0x0000fff0
@@ -1288,7 +1288,7 @@ _080E18F8:
_080E1904: .4byte gBankSpriteIds
_080E1908:
ldrb r0, [r6]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1A]
@@ -1700,7 +1700,7 @@ _080E1BE2:
adds r4, r0
adds r0, r5, 0
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0x20
@@ -1711,7 +1711,7 @@ _080E1BE2:
strh r1, [r4, 0xA]
adds r0, r5, 0
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0x40

50
asm/ice.s
View File

@@ -65,26 +65,26 @@ sub_80D7704: @ 80D7704
ldr r4, _080D7814 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r4, _080D7818 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r3, r0, 24
ldrb r0, [r4]
movs r1, 0x3
str r3, [sp]
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _080D781C @ =gBattleAnimArgs
@@ -329,7 +329,7 @@ sub_80D792C: @ 80D792C
ldr r0, _080D7960 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -359,7 +359,7 @@ _080D7976:
ldr r0, _080D79A8 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r1, _080D79A4 @ =gBattleAnimArgs
lsrs r0, 24
@@ -495,13 +495,13 @@ sub_80D7A64: @ 80D7A64
ldr r4, _080D7AB0 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -810,13 +810,13 @@ sub_80D7CD4: @ 80D7CD4
ldr r4, _080D7D1C @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -1686,13 +1686,13 @@ sub_80D83E0: @ 80D83E0
ldr r5, _080D840C @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -2074,12 +2074,12 @@ sub_80D8700: @ 80D8700
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r4, r0, 0
ldr r7, _080D87F0 @ =gAnimBankTarget
ldrb r0, [r7]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -2119,7 +2119,7 @@ _080D8734:
cmp r0, 0
bne _080D8790
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080D87F8 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2140,13 +2140,13 @@ _080D8794:
ldr r4, _080D87EC @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2162,7 +2162,7 @@ _080D8794:
ldr r4, _080D87F0 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -2189,7 +2189,7 @@ _080D87FC:
ldr r4, _080D886C @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -2202,7 +2202,7 @@ _080D87FC:
ldrb r0, [r4]
movs r1, 0x1
_080D8824:
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x8]
@@ -2301,7 +2301,7 @@ _080D88D6:
ldr r6, _080D8928 @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
@@ -2713,12 +2713,12 @@ sub_80D8BA8: @ 80D8BA8
str r0, [sp, 0x4]
adds r0, r5, 0
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r7, r0, 24
adds r0, r5, 0
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
mov r1, r8
@@ -3043,7 +3043,7 @@ _080D8E92:
ldr r4, _080D8ED8 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -3051,7 +3051,7 @@ _080D8E92:
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]

10
asm/normal.s
View File

@@ -1208,7 +1208,7 @@ _080E25A0:
cmp r0, 0x1
bhi _080E25F4
movs r4, 0
ldr r5, _080E2600 @ =gNoOfAllBanks
ldr r5, _080E2600 @ =gBattlersCount
ldrb r0, [r5]
cmp r4, r0
bcs _080E25F4
@@ -1243,7 +1243,7 @@ _080E25FA:
pop {r0}
bx r0
.align 2, 0
_080E2600: .4byte gNoOfAllBanks
_080E2600: .4byte gBattlersCount
_080E2604: .4byte gSprites
_080E2608: .4byte gBankSpriteIds
thumb_func_end sub_80E255C
@@ -1636,7 +1636,7 @@ sub_80E2908: @ 80E2908
adds r4, r0, 0
ldr r5, _080E2968 @ =gBattleAnimArgs
ldrb r0, [r5]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
@@ -2619,7 +2619,7 @@ _080E30A8:
lsrs r4, r0, 16
_080E30B4:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080E3168 @ =gAnimBankAttacker
@@ -2784,7 +2784,7 @@ _080E3208:
adds r0, 0x2
strh r5, [r0]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r0, _080E32CC @ =gSprites
mov r8, r0
movs r2, 0x8

14
asm/water.s
View File

@@ -757,7 +757,7 @@ sub_80D40F4: @ 80D40F4
ldr r0, _080D4144 @ =gTasks
adds r4, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -1163,13 +1163,13 @@ sub_80D4418: @ 80D4418
ldr r4, _080D4520 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0xAC
@@ -1791,14 +1791,14 @@ sub_80D48F4: @ 80D48F4
ldr r4, _080D497C @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r6, 0
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
@@ -2268,13 +2268,13 @@ sub_80D4CA4: @ 80D4CA4
ldr r5, _080D4CE0 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x30]
ldrb r0, [r5]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]

10
data/battle_scripts_1.s vendored
View File

@@ -1653,7 +1653,7 @@ BattleScript_PerishSongLoop: @ 81D7E53
BattleScript_PerishSongLoopIncrement: @ 81D7E5A
addbyte sBANK, 1
jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_PerishSongLoop
jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop
goto BattleScript_MoveEnd
BattleScript_1D7E73: @ 81D7E73
@@ -2701,7 +2701,7 @@ BattleScript_TeeterDanceDoMoveEndIncrement: @ 81D8978
setbyte sMOVEEND_STATE, 0
moveend 2, 16
addbyte gBankTarget, 1
jumpifbytenotequal gBankTarget, gNoOfAllBanks, BattleScript_TeeterDanceLoop
jumpifbytenotequal gBankTarget, gBattlersCount, BattleScript_TeeterDanceLoop
end
BattleScript_TeeterDanceLoopIncrement: @ 81D8996
@@ -3034,7 +3034,7 @@ BattleScript_1D8D99: @ 81D8D99
switchinanim 3, 0
waitstate
switchineffects 5
jumpifbytenotequal gBank1, gNoOfAllBanks, BattleScript_1D8D99
jumpifbytenotequal gBank1, gBattlersCount, BattleScript_1D8D99
BattleScript_1D8DBD: @ 81D8DBD
end2
@@ -3264,7 +3264,7 @@ BattleScript_DamagingWeatherLoop: @ 81D8F95
BattleScript_DamagingWeatherLoopIncrement: @ 81D8FD6
jumpifbyte NOT_EQUAL, gBattleOutcome, 0, BattleScript_DamagingWeatherContinuesEnd
addbyte gBattleCommunication, 1
jumpifbytenotequal gBattleCommunication, gNoOfAllBanks, BattleScript_DamagingWeatherLoop
jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_DamagingWeatherLoop
BattleScript_DamagingWeatherContinuesEnd: @ 81D8FF5
bicword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
@@ -4042,7 +4042,7 @@ BattleScript_WeatherFormChanges: @ 81D9761
BattleScript_WeatherFormChangesLoop: @ 81D9767
trycastformdatachange
addbyte sBANK, 1
jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_WeatherFormChangesLoop
jumpifbytenotequal sBANK, gBattlersCount, BattleScript_WeatherFormChangesLoop
return
BattleScript_CastformChange:: @ 81D977D

16
include/battle.h
View File

@@ -4,21 +4,7 @@
#include "sprite.h"
#include "constants/battle_constants.h"
/*
Banks are a name given to what could be called a 'battlerId' or 'monControllerId'.
Each bank has a value consisting of two bits.
0x1 bit is responsible for the side, 0 = player's side, 1 = opponent's side.
0x2 bit is responsible for the id of sent out pokemon. 0 means it's the first sent out pokemon, 1 it's the second one. (Triple battle didn't exist at the time yet.)
*/
#define BATTLE_BANKS_COUNT 4
#define B_POSITION_PLAYER_LEFT 0
#define B_POSITION_OPPONENT_LEFT 1
#define B_POSITION_PLAYER_RIGHT 2
#define B_POSITION_OPPONENT_RIGHT 3
#define GET_BATTLER_POSITION(bank)((gBanksByIdentity[bank]))
#define GET_BATTLER_POSITION(bank)((gBattlerPositions[bank]))
#define GET_BATTLER_SIDE(bank)((GetBattlerPosition(bank) & BIT_SIDE))
#define GET_BATTLER_SIDE2(bank)((GET_BATTLER_POSITION(bank) & BIT_SIDE))

36
include/ewram.h
View File

@@ -98,13 +98,13 @@ extern u8 gSharedMem[];
#define ewram16001 (gSharedMem[0x16001])
#define ewram16002 (gSharedMem[0x16002])
#define ewram16003 (gSharedMem[0x16003])
#define ewram16004arr(i, bank) (gSharedMem[0x16004 + i + bank * 2])
#define ewram16004arr(i, battler) (gSharedMem[0x16004 + i + battler * 2])
#define ewram1600C (gSharedMem[0x1600C])
#define ewram1600E (gSharedMem[0x1600E])
#define ewram16010arr(bank) (gSharedMem[0x16010 + bank])
#define ewram16010arr(battler) (gSharedMem[0x16010 + battler])
#define ewram1601B (gSharedMem[0x1601B])
#define eDynamicMoveType (gSharedMem[0x1601C])
#define eFocusPunchBank (gSharedMem[0x1601D])
#define eFocusPunchBattler (gSharedMem[0x1601D])
#define eDmgMultiplier (gSharedMem[0x1601F])
#define ewram16020 ((u8 *)(gSharedMem + 0x16020))
#define ewram16020arr(i) (gSharedMem[0x16020 + i])
@@ -112,10 +112,10 @@ extern u8 gSharedMem[];
#define ewram16056 (gSharedMem[0x16056])
#define ewram16058 (gSharedMem[0x16058])
#define ewram16059 (gSharedMem[0x16059])
#define ewram16060(bank) (gSharedMem[0x16060 + bank])
#define BATTLE_PARTY_ID(bank) (gSharedMem[0x16064 + bank])
#define ewram16060(battler) (gSharedMem[0x16060 + battler])
#define BATTLE_PARTY_ID(battler) (gSharedMem[0x16064 + battler])
#define ewram16064 (&gSharedMem[0x16064])
#define ewram16064arr(bank) (gSharedMem[0x16064 + bank])
#define ewram16064arr(battler) (gSharedMem[0x16064 + battler])
#define ewram16068arr(i) (gSharedMem[0x16068 + i])
#define UNK_201606C_ARRAY (gSharedMem + 0x1606C) // lazy define but whatever.
#define ewram1606Carr(i, a) (gSharedMem[0x1606C + i + a * 3])
@@ -132,7 +132,7 @@ extern u8 gSharedMem[];
#define ewram1608A gSharedMem[0x1608A]
#define ewram1608B gSharedMem[0x1608B]
#define ewram1608Carr(bank) (gSharedMem[0x1608C + bank])
#define ewram1608Carr(battler) (gSharedMem[0x1608C + battler])
#define EWRAM_1609D (gSharedMem[0x1609D])
#define ewram160A1 (gSharedMem[0x160A1])
#define ewram160A4 (gSharedMem[0x160A4])
@@ -144,31 +144,31 @@ extern u8 gSharedMem[];
#define ewram160AB (gSharedMem[0x160AB])
#define ewram160AC ((u8 *)(gSharedMem + 0x160AC))
#define ewram160ACarr(i) (gSharedMem[0x160AC + i])
#define ewram160ACarr2(i, bank) (gSharedMem[0x160AC + i + bank * 2])
#define ewram160ACarr2(i, battler) (gSharedMem[0x160AC + i + battler * 2])
#define ewram160BC ((u16 *)(gSharedMem + 0x160BC)) // hp
#define ewram160BCarr(bank) (gSharedMem[0x160BC + bank * 2])
#define ewram160BCarr(battler) (gSharedMem[0x160BC + battler * 2])
#define ewram160C0 (gSharedMem[0x160C0])
#define ewram160C2_Flags ((u16 *)(gSharedMem + 0x160C2))
#define ewram160C4_Callback ((MainCallback *)(gSharedMem + 0x160C4))
#define ewram160C8 (gSharedMem[0x160C8])
#define ewram160C8arr(bank) (gSharedMem[0x160C8 + (bank / 2)])
#define ewram160C8arr(battler) (gSharedMem[0x160C8 + (battler / 2)])
#define ewram160C9 (gSharedMem[0x160C9])
#define ewram160CB (gSharedMem[0x160CB])
#define ewram160CC ((u8 *)(gSharedMem + 0x160CC))
#define ewram160CCarr(i) (gSharedMem[0x160CC + i])
#define USED_HELD_ITEM(bank) ((((u16*)(&gSharedMem[0x160CC + bank * 2]))))
#define USED_HELD_ITEMS(bank) (*(u16 *)&gSharedMem[0x160CC + 2 * (bank)])
#define ewram160D4(bank) (gSharedMem[0x160D4 + (bank / 2) * 2])
#define ewram160D8(bank) (gSharedMem[0x160D8 + (bank / 2)])
#define ewram160DA(bank) (gSharedMem[0x160DA + (bank / 2)])
#define USED_HELD_ITEM(battler) ((((u16*)(&gSharedMem[0x160CC + battler * 2]))))
#define USED_HELD_ITEMS(battler) (*(u16 *)&gSharedMem[0x160CC + 2 * (battler)])
#define ewram160D4(battler) (gSharedMem[0x160D4 + (battler / 2) * 2])
#define ewram160D8(battler) (gSharedMem[0x160D8 + (battler / 2)])
#define ewram160DA(battler) (gSharedMem[0x160DA + (battler / 2)])
#define ewram160DD (gSharedMem[0x160DD])
#define ewram160E0(i) (gSharedMem[0x160E0 + i])
#define ewram160E6 (gSharedMem[0x160E6])
#define ewram160E7 (gSharedMem[0x160E7])
#define CHOICED_MOVE(bank) (((u16*)(&gSharedMem[0x160E8 + bank * 2])))
#define CHOICED_MOVE(battler) (((u16*)(&gSharedMem[0x160E8 + battler * 2])))
#define ewram160E8 ((u8 *)(gSharedMem + 0x160E8))
#define ewram160E8arr(i) (gSharedMem[0x160E8 + i])
#define ewram160E8arr2(i, bank) (gSharedMem[0x160E8 + i + bank * 2])
#define ewram160E8arr2(i, battler) (gSharedMem[0x160E8 + i + battler * 2])
#define ewram160F0 ((u8 *)(gSharedMem + 0x160F0))
#define ewram160F0arr(i) (gSharedMem[0x160F0 + i])
#define ewram160F8 (gSharedMem[0x160F8])
@@ -177,7 +177,7 @@ extern u8 gSharedMem[];
#define ewram160FB (gSharedMem[0x160FB])
#define ewram16100 ((u8 *)(gSharedMem + 0x16100))
#define ewram16100arr(i) (gSharedMem[0x16100 + i])
#define ewram16100arr2(i, bank) (gSharedMem[0x16100 + i + bank * 4])
#define ewram16100arr2(i, battler) (gSharedMem[0x16100 + i + battler * 4])
#define ewram16108 ((u8 *)(gSharedMem + 0x16108))
#define ewram16108arr(i) (gSharedMem[0x16108 + i])
#define ewram16110 (gSharedMem[0x16110])

4
include/rom_8077ABC.h
View File

@@ -10,9 +10,9 @@ struct Struct_sub_8078914 {
u8 field_8;
};
u8 GetBankPosition(u8, u8);
u8 GetBattlerSpriteCoord(u8, u8);
u8 sub_8077E44(u8 slot, u16 species, u8 a3);
u8 GetAnimBankSpriteId(u8 bank);
u8 GetAnimBattlerSpriteId(u8 bank);
void StoreSpriteCallbackInData(struct Sprite *sprite, void(*callback)(struct Sprite *));
void sub_8078314(struct Sprite *sprite);
void TranslateSpriteOverDuration(struct Sprite *sprite);

4
src/battle/anim/anger.c
View File

@@ -24,8 +24,8 @@ void sub_80D09C0(struct Sprite* sprite)
gBattleAnimArgs[1] *= -1;
}
sprite->pos1.x = GetBankPosition(bank, 2) + gBattleAnimArgs[1];
sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[2];
sprite->pos1.x = GetBattlerSpriteCoord(bank, 2) + gBattleAnimArgs[1];
sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[2];
if (sprite->pos1.y <= 7)
sprite->pos1.y = 8;

4
src/battle/anim/aurora.c
View File

@@ -23,9 +23,9 @@ void sub_80D33B4(struct Sprite *sprite)
r6 = gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r6;
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r6;
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
InitAnimSpriteTranslationDeltas(sprite);
sprite->callback = sub_80D344C;
sprite->affineAnimPaused = TRUE;

4
src/battle/anim/blow_kiss.c
View File

@@ -18,9 +18,9 @@ void sub_80D1F58(struct Sprite* sprite)
InitAnimSpritePos(sprite, 1);
sprite->data[0] = 0x5F;
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
InitAnimSpriteTranslationDeltas(sprite);
sprite->callback = sub_80D1FA4;
}

4
src/battle/anim/bottle.c
View File

@@ -16,8 +16,8 @@ static void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2);
void sub_80CCF04(struct Sprite* sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + 0xFFE8;
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + 0xFFE8;
sprite->data[0] = 0;
sprite->data[1] = 0;
sprite->data[2] = 0;

8
src/battle/anim/brace.c
View File

@@ -17,13 +17,13 @@ void sub_80CDF0C(struct Sprite* sprite)
{
if (gBattleAnimArgs[0] == 0)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[1];
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[2];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[1];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[2];
}
else
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[1];
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[2];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[1];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[2];
}
sprite->data[0] = 0;

6
src/battle/anim/breath.c
View File

@@ -16,17 +16,17 @@ void sub_80D0930(struct Sprite* sprite)
if (GetBattlerSide(gAnimBankAttacker) == 0)
{
StartSpriteAnim(sprite, 0);
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + 32;
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + 32;
sprite->data[1] = 0x40;
}
else
{
StartSpriteAnim(sprite, 1);
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - 32;
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - 32;
sprite->data[1] = -0x40;
}
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->data[0] = 0x34;
sprite->data[2] = 0;
sprite->data[3] = 0;

12
src/battle/anim/bubble.c
View File

@@ -21,13 +21,13 @@ void sub_80D31C8(struct Sprite* sprite)
if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - gBattleAnimArgs[0];
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - gBattleAnimArgs[0];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
}
else
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
}
sprite->animPaused = 1;
@@ -39,9 +39,9 @@ void sub_80D31C8(struct Sprite* sprite)
sprite->data[0] = gBattleAnimArgs[6];
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
InitAnimSpriteTranslationDeltas(sprite);

28
src/battle/anim/bug.c
View File

@@ -37,8 +37,8 @@ void sub_80DC824(struct Sprite *sprite)
sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1];
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
@@ -62,8 +62,8 @@ void sub_80DC8F4(struct Sprite *sprite)
sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1];
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
@@ -83,8 +83,8 @@ void sub_80DC9A0(struct Sprite *sprite)
if (!gBattleAnimArgs[4])
{
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
}
else
{
@@ -220,8 +220,8 @@ void AnimTranslateStinger(struct Sprite *sprite)
InitAnimSpritePos(sprite, 1);
lVarX = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
lVarY = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
lVarX = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
lVarY = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
rot = ArcTan2Neg(lVarX - sprite->pos1.x, lVarY - sprite->pos1.y);
rot += 0xC000;
sub_8078FDC(sprite, FALSE, 0x100, 0x100, rot);
@@ -251,8 +251,8 @@ void AnimMissileArc(struct Sprite *sprite)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
sprite->data[5] = gBattleAnimArgs[5];
InitAnimSpriteTranslationOverDuration(sprite);
@@ -301,13 +301,13 @@ void sub_80DCE40(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + 18;
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + 18;
}
else
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + 18;
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + 18;
}
StoreSpriteCallbackInData(sprite, move_anim_8074EE0);

4
src/battle/anim/bullet.c
View File

@@ -19,8 +19,8 @@ void sub_80CFFD8(struct Sprite* sprite)
{
InitAnimSpritePos(sprite, 1);
sprite->data[0] = 20;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sprite->callback = StartTranslateAnimSpriteByDeltas;
sprite->affineAnimPaused = 1;
StoreSpriteCallbackInData(sprite, sub_80D0030);

8
src/battle/anim/copy_orb.c
View File

@@ -22,8 +22,8 @@ void sub_80CB4CC(struct Sprite* sprite)
gBattleAnimArgs[0] = -a;
}
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[0];
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[1];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[0];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[1];
sprite->invisible = 1;
sprite->data[0]++;
break;
@@ -35,8 +35,8 @@ void sub_80CB4CC(struct Sprite* sprite)
{
ChangeSpriteAffineAnim(sprite, 1);
sprite->data[0] = 25;
sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->callback = sub_8078CC0;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
break;

4
src/battle/anim/cube.c
View File

@@ -16,8 +16,8 @@ static void sub_80CE000(struct Sprite* sprite);
void sub_80CDFB0(struct Sprite* sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) - 12;
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) - 12;
sprite->data[0] = 0;
sprite->data[1] = 2;
sprite->data[2] = 0;

4
src/battle/anim/cutter.c
View File

@@ -32,8 +32,8 @@ void AnimTranslateLinearSingleSineWave(struct Sprite* sprite)
sprite->data[0] = gBattleAnimArgs[4];
if (!gBattleAnimArgs[6])
{
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
}
else
{

24
src/battle/anim/dark.c
View File

@@ -123,10 +123,10 @@ void sub_80DFDC0(u8 taskId)
void sub_80DFE14(struct Sprite *sprite)
{
sprite->data[1] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
sprite->data[3] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
sprite->data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->data[3] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->data[0] = 0x7E;
InitSpriteDataForLinearTranslation(sprite);
sprite->data[3] = -sprite->data[1];
@@ -257,13 +257,13 @@ void sub_80E00EC(u8 taskId)
int var0;
struct Task *task = &gTasks[taskId];
task->data[7] = GetBankPosition(gAnimBankAttacker, 1) + 31;
task->data[7] = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 31;
task->data[6] = sub_807A100(gAnimBankAttacker, 2) - 7;
task->data[5] = task->data[7];
task->data[4] = task->data[6];
task->data[13] = (task->data[7] - task->data[6]) << 8;
pos = GetBankPosition(gAnimBankAttacker, 0);
pos = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
task->data[14] = pos - 32;
task->data[15] = pos + 32;
@@ -435,10 +435,10 @@ void sub_80E03BC(u8 taskId)
task->data[0]++;
break;
case 2:
task->data[7] = GetBankPosition(gAnimBankTarget, 1) + 31;
task->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 31;
task->data[6] = sub_807A100(gAnimBankTarget, 2) - 7;
task->data[13] = (task->data[7] - task->data[6]) << 8;
pos = GetBankPosition(gAnimBankTarget, 0);
pos = GetBattlerSpriteCoord(gAnimBankTarget, 0);
task->data[14] = pos - 4;
task->data[15] = pos + 4;
@@ -783,7 +783,7 @@ static void sub_80E08CC(u8 priority)
for (i = 0; i < 4; i++)
{
u8 spriteId = GetAnimBankSpriteId(i);
u8 spriteId = GetAnimBattlerSpriteId(i);
if (spriteId != 0xFF)
gSprites[spriteId].oam.priority = priority;
}
@@ -870,7 +870,7 @@ void sub_80E0A4C(u8 taskId)
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
}
spriteId = GetAnimBankSpriteId(0);
spriteId = GetAnimBattlerSpriteId(0);
newSpriteId = sub_807A4A0(gAnimBankAttacker, spriteId, species);
sub_8078914(&subStruct);
@@ -926,7 +926,7 @@ static void sub_80E0CD0(u8 taskId)
REG_BLDCNT = 0;
REG_BLDALPHA = 0;
spriteId = GetAnimBankSpriteId(0);
spriteId = GetAnimBattlerSpriteId(0);
paletteNum = 16 + gSprites[spriteId].oam.paletteNum;
if (gTasks[taskIdCopy].data[1] == 0)
sub_8079108(paletteNum, 1);
@@ -958,7 +958,7 @@ void sub_80E0E24(u8 taskId)
case 1:
case 2:
case 3:
spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
break;
case 4:
identity = B_POSITION_PLAYER_LEFT;

24
src/battle/anim/dragon.c
View File

@@ -25,8 +25,8 @@ extern u8 gBankSpriteIds[];
void sub_80DF5A0(struct Sprite *sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos1.x -= gBattleAnimArgs[0];
@@ -50,8 +50,8 @@ void sub_80DF5A0(struct Sprite *sprite)
void sub_80DF63C(struct Sprite *sprite)
{
sub_8078650(sprite);
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos1.x -= gBattleAnimArgs[1];
@@ -78,13 +78,13 @@ void sub_80DF6F0(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
}
else
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
}
sub_807867C(sprite, gBattleAnimArgs[1]);
sprite->pos1.y += gBattleAnimArgs[2];
@@ -107,8 +107,8 @@ void sub_80DF78C(struct Sprite *sprite)
{
u16 r5;
u16 r0;
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->data[4] = 0;
sprite->data[5] = 1;
sprite->data[6] = gBattleAnimArgs[0];
@@ -252,8 +252,8 @@ void sub_80DFB28(struct Sprite *sprite)
{
int r6 = (gBattleAnimArgs[2] * 3) / 5;
int i;
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[4];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[4];
sprite->data[1] = Cos(gBattleAnimArgs[1], gBattleAnimArgs[2]);
sprite->data[2] = Sin(gBattleAnimArgs[1], r6);
sprite->pos1.x += sprite->data[1] * gBattleAnimArgs[0];

2
src/battle/anim/draw.c
View File

@@ -108,7 +108,7 @@ void sub_80D0D68(u8 taskId)
void sub_80D0E30(struct Sprite* sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) - 16;
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) - 16;
sprite->pos1.y = sub_8077FC0(gAnimBankTarget) + 16;
sprite->data[0] = 0;
sprite->data[1] = 0;

4
src/battle/anim/drum.c
View File

@@ -24,8 +24,8 @@ void sub_80CEDF0(struct Sprite* sprite)
a = -16;
}
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + a;
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + 8;
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + a;
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + 8;
sprite->data[0] = 8;
sprite->callback = WaitAnimForDuration;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);

12
src/battle/anim/energy_wave.c
View File

@@ -24,9 +24,9 @@ void sub_80D3554(struct Sprite *sprite)
sprite->data[0] = 30;
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
InitAnimSpriteTranslationDeltas(sprite);
@@ -86,8 +86,8 @@ void sub_80D3698(struct Sprite *sprite)
{
u8 subpriority;
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
sprite->pos2.y = -10;
subpriority = sub_8079E90(gAnimBankAttacker);
@@ -155,8 +155,8 @@ void sub_80D3728(struct Sprite *sprite)
}
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
sprite->data[4] = GetBankPosition(gAnimBankTarget, var2) + gBattleAnimArgs[3];
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, var2) + gBattleAnimArgs[3];
sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
}

10
src/battle/anim/espeed.c
View File

@@ -25,7 +25,7 @@ static void sub_80D1930(u8 taskId);
void sub_80D15A4(u8 taskId)
{
struct Task* task = &gTasks[taskId];
u8 spriteId = GetAnimBankSpriteId(0);
u8 spriteId = GetAnimBattlerSpriteId(0);
task->data[0] = spriteId;
sub_80798F4(task, spriteId, &gUnknown_083D79BC);
task->func = sub_80D15E0;
@@ -62,7 +62,7 @@ void sub_80D1638(u8 taskId)
task->data[14] = -8;
}
task->data[15] = GetAnimBankSpriteId(1);
task->data[15] = GetAnimBattlerSpriteId(1);
task->func = sub_80D16A0;
}
@@ -123,7 +123,7 @@ void sub_80D17C4(u8 taskId)
task->data[4] = 1;
task->data[13] = 14;
task->data[14] = 2;
task->data[15] = GetAnimBankSpriteId(0);
task->data[15] = GetAnimBattlerSpriteId(0);
task->func = sub_80D1808;
}
@@ -169,8 +169,8 @@ void sub_80D18D4(u8 taskId)
task->data[7] = 0;
task->data[8] = 0;
task->data[13] = 0;
task->data[14] = GetBankPosition(gAnimBankAttacker, 0);
task->data[15] = GetBankPosition(gAnimBankAttacker, 1);
task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
task->data[15] = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
task->func = sub_80D1930;
}

2
src/battle/anim/evasion.c
View File

@@ -23,7 +23,7 @@ void sub_80CE7E0(u8 taskId)
u16 r3;
u16 r4;
struct Task* task = &gTasks[taskId];
task->data[0] = GetAnimBankSpriteId(0);
task->data[0] = GetAnimBattlerSpriteId(0);
task->data[1] = AllocSpritePalette(0x2771);
r3 = (task->data[1] * 16) + 0x100;
r4 = (gSprites[task->data[0]].oam.paletteNum + 16) << 4;

52
src/battle/anim/fight.c
View File

@@ -108,8 +108,8 @@ void sub_80D90F4(struct Sprite *sprite)
gBattleAnimArgs[2] = Random() % 5;
StartSpriteAnim(sprite, gBattleAnimArgs[2]);
sprite->pos1.x = GetBankPosition(bank, 2);
sprite->pos1.y = GetBankPosition(bank, 3);
sprite->pos1.x = GetBattlerSpriteCoord(bank, 2);
sprite->pos1.y = GetBattlerSpriteCoord(bank, 3);
xMod = sub_807A100(bank, 1) / 2;
yMod = sub_807A100(bank, 0) / 4;
@@ -275,8 +275,8 @@ static void AnimStompFootStep(struct Sprite *sprite)
if (--sprite->data[0] == -1)
{
sprite->data[0] = 6;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, AnimStompFootEnd);
@@ -319,13 +319,13 @@ void sub_80D95D0(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
}
else
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
}
sprite->pos1.x += gBattleAnimArgs[1];
@@ -372,13 +372,13 @@ void sub_80D96B8(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
}
else
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[2];
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[3];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[2];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3];
}
sprite->oam.tileNum += gBattleAnimArgs[1] * 16;
@@ -423,8 +423,8 @@ void sub_80D97CC(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
sprite->pos1.x = GetBankPosition(gBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
sprite->oam.priority = sub_8079ED4(gAnimBankAttacker);
sprite->data[7] = gAnimBankTarget;
}
@@ -448,9 +448,9 @@ static void sub_80D986C(struct Sprite *sprite)
sprite->data[0] = 16;
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBankPosition(sprite->data[7], 2);
sprite->data[2] = GetBattlerSpriteCoord(sprite->data[7], 2);
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(sprite->data[7], 3);
sprite->data[4] = GetBattlerSpriteCoord(sprite->data[7], 3);
InitAnimSpriteTranslationDeltas(sprite);
StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
@@ -491,10 +491,10 @@ static void sub_80D9934(struct Sprite *sprite)
}
else
{
s16 pos0 = GetBankPosition(gAnimBankAttacker, 2);
s16 pos1 = GetBankPosition(gAnimBankAttacker, 3);
s16 pos2 = GetBankPosition(gAnimBankTarget, 2);
s16 pos3 = GetBankPosition(gAnimBankTarget, 3);
s16 pos0 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
s16 pos1 = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
s16 pos2 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
s16 pos3 = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sprite->data[0] = pos2 - pos0;
sprite->data[1] = pos3 - pos1;
@@ -525,8 +525,8 @@ void sub_80D9A38(struct Sprite *sprite)
if (gBattleAnimArgs[0] == 0)
{
sprite->pos1.x = GetBankPosition(gBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
bank = gAnimBankTarget;
sprite->oam.priority = sub_8079ED4(gAnimBankAttacker);
}
@@ -543,9 +543,9 @@ void sub_80D9A38(struct Sprite *sprite)
sprite->data[0] = 16;
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBankPosition(bank, 2);
sprite->data[2] = GetBattlerSpriteCoord(bank, 2);
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(bank, 3);
sprite->data[4] = GetBattlerSpriteCoord(bank, 3);
InitAnimSpriteTranslationDeltas(sprite);
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
@@ -564,8 +564,8 @@ void sub_80D9B48(struct Sprite *sprite)
{
u8 turn;
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sprite->data[1] = gBattleAnimArgs[3];
sprite->data[2] = gBattleAnimArgs[0];
sprite->data[3] = gBattleAnimArgs[1];

10
src/battle/anim/fire_2.c
View File

@@ -76,9 +76,9 @@ static void AnimFireRingStep1(struct Sprite *sprite)
{
sprite->data[0] = 0x19;
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
InitAnimSpriteTranslationDeltas(sprite);
@@ -92,8 +92,8 @@ static void AnimFireRingStep2(struct Sprite *sprite)
{
sprite->data[0] = 0;
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sprite->pos2.y = 0;
sprite->pos2.x = 0;
@@ -184,7 +184,7 @@ void sub_80D5470(u8 taskId) // initialize animation task for Move_ERUPTION?
{
struct Task *task = &gTasks[taskId];
task->data[15] = GetAnimBankSpriteId(0);
task->data[15] = GetAnimBattlerSpriteId(0);
task->data[0] = 0;
task->data[1] = 0;

4
src/battle/anim/flying_path.c
View File

@@ -23,8 +23,8 @@ void sub_80CBDF4(u8 taskId)
struct Task *task = &gTasks[taskId];
task->data[4] = sub_8079E90(gAnimBankTarget) - 1;
task->data[6] = GetBankPosition(gAnimBankTarget, 2);
task->data[7] = GetBankPosition(gAnimBankTarget, 3);
task->data[6] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
task->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
task->data[10] = sub_807A100(gAnimBankTarget, 1);
task->data[11] = sub_807A100(gAnimBankTarget, 0);
task->data[5] = (GetBattlerSide(gAnimBankTarget) == 1) ? 1 : -1;

6
src/battle/anim/flying_petals.c
View File

@@ -48,12 +48,12 @@ void sub_80CC474(struct Sprite* sprite)
sprite->oam.priority = sub_8079ED4(bank) + 1;
break;
case 2:
sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[0];
sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[0];
sprite->oam.priority = sub_8079ED4(bank);
break;
case 3:
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[0];
GetAnimBankSpriteId(1);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[0];
GetAnimBattlerSpriteId(1);
sprite->oam.priority = sub_8079ED4(bank) + 1;
break;
}

8
src/battle/anim/glitter.c
View File

@@ -43,13 +43,13 @@ void sub_80CD190(struct Sprite* sprite)
{
if (!gBattleAnimArgs[6])
{
sprite->pos1.x = GetBankPosition(bank, 0);
sprite->pos1.y = GetBankPosition(bank, 1) + gBattleAnimArgs[1];
sprite->pos1.x = GetBattlerSpriteCoord(bank, 0);
sprite->pos1.y = GetBattlerSpriteCoord(bank, 1) + gBattleAnimArgs[1];
}
else
{
sprite->pos1.x = GetBankPosition(bank, 2);
sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[1];
sprite->pos1.x = GetBattlerSpriteCoord(bank, 2);
sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[1];
}
sub_807867C(sprite, gBattleAnimArgs[0]);

4
src/battle/anim/grip.c
View File

@@ -31,8 +31,8 @@ void sub_80D0178(struct Sprite* sprite)
sprite->pos1.x += r7;
sprite->pos1.y += r4;
sprite->data[0] = 6;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r8;
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6;
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r8;
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + r6;
sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, sub_80D020C);
}

2
src/battle/anim/grow.c
View File

@@ -18,7 +18,7 @@ static void sub_80D0904(u8 taskId);
void sub_80D08C8(u8 taskId)
{
struct Task* task = &gTasks[taskId];
u8 spriteId = GetAnimBankSpriteId(0);
u8 spriteId = GetAnimBattlerSpriteId(0);
sub_80798F4(task, spriteId, &gUnknown_083D7714);
task->func = sub_80D0904;
}

4
src/battle/anim/guard.c
View File

@@ -22,8 +22,8 @@ void sub_80D3014(struct Sprite *sprite)
}
else
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + 40;
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 40;
}
sprite->data[0] = 13;

4
src/battle/anim/guillotine.c
View File

@@ -34,9 +34,9 @@ void sub_80D0228(struct Sprite* sprite)
sprite->pos1.y += r4;
sprite->data[0] = 6;
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r9;
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r9;
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6;
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + r6;
InitAnimSpriteTranslationDeltas(sprite);
sprite->data[5] = gBattleAnimArgs[0];
sprite->data[6] = sprite->data[0];

8
src/battle/anim/homing.c
View File

@@ -29,13 +29,13 @@ void sub_80CC6CC(struct Sprite* sprite)
{
if (gBattleAnimArgs[0] == 0)
{
a = GetBankPosition(gAnimBankAttacker, 2);
b = GetBankPosition(gAnimBankAttacker, 3);
a = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
b = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
}
else
{
a = GetBankPosition(gAnimBankTarget, 2);
b = GetBankPosition(gAnimBankTarget, 3);
a = GetBattlerSpriteCoord(gAnimBankTarget, 2);
b = GetBattlerSpriteCoord(gAnimBankTarget, 3);
}
sprite->data[0] = gBattleAnimArgs[4];

6
src/battle/anim/hop.c
View File

@@ -92,8 +92,8 @@ void sub_80CB94C(struct Sprite* sprite)
s16 e1;
s16 e2;
InitAnimSpritePos(sprite, 0);
e1 = GetBankPosition(gAnimBankTarget, 0);
e2 = GetBankPosition(gAnimBankTarget, 1);
e1 = GetBattlerSpriteCoord(gAnimBankTarget, 0);
e2 = GetBattlerSpriteCoord(gAnimBankTarget, 1);
if ((gAnimBankAttacker ^ 2) == gAnimBankTarget)
{
sprite->data[6] = e1;
@@ -135,7 +135,7 @@ void sub_80CB9C4(struct Sprite* sprite)
void sub_80CBA28(struct Sprite* sprite)
{
s16 e = GetBankPosition(gAnimBankTarget, 1);
s16 e = GetBattlerSpriteCoord(gAnimBankTarget, 1);
if (GetBattlerSide(gAnimBankTarget) == 0)
{
sprite->data[6] = 0;

4
src/battle/anim/hop_2.c
View File

@@ -22,8 +22,8 @@ void sub_80CBAE8(struct Sprite* sprite)
s16 p1;
s16 p2;
sub_8078764(sprite, 0);
p1 = GetBankPosition(gAnimBankAttacker, 0);
p2 = GetBankPosition(gAnimBankAttacker, 1);
p1 = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
p2 = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
if ((gAnimBankTarget ^ 2) == gAnimBankAttacker)
{
sprite->data[6] = p1;

4
src/battle/anim/leaf.c
View File

@@ -15,8 +15,8 @@ static void sub_80CAF6C(struct Sprite* sprite);
void sub_80CAED8(struct Sprite* sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->data[0] = gBattleAnimArgs[0];
sprite->data[1] = gBattleAnimArgs[1];
sprite->data[2] = gBattleAnimArgs[2];

4
src/battle/anim/money.c
View File

@@ -20,8 +20,8 @@ void sub_80CFE9C(struct Sprite* sprite)
u16 var;
InitAnimSpritePos(sprite, 1);
r6 = GetBankPosition(gAnimBankTarget, 2);
r7 = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
r6 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
r7 = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
if (GetBattlerSide(gAnimBankAttacker) != 0)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];

4
src/battle/anim/noise.c
View File

@@ -21,8 +21,8 @@ void sub_80D2D68(struct Sprite* sprite)
gBattleAnimArgs[1] *= -1;
}
sprite->pos1.x = GetBankPosition(slot, 2) + gBattleAnimArgs[1];
sprite->pos1.y = GetBankPosition(slot, 3) + gBattleAnimArgs[2];
sprite->pos1.x = GetBattlerSpriteCoord(slot, 2) + gBattleAnimArgs[1];
sprite->pos1.y = GetBattlerSpriteCoord(slot, 3) + gBattleAnimArgs[2];
sprite->data[0] = 0;
sprite->data[1] = (u16)sprite->pos1.x << 3;
sprite->data[2] = (u16)sprite->pos1.y << 3;

4
src/battle/anim/note_rain.c
View File

@@ -29,8 +29,8 @@ void sub_80D1C08(struct Sprite* sprite)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[2] = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
sprite->data[4] = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]);

4
src/battle/anim/note_scatter.c
View File

@@ -22,8 +22,8 @@ void sub_80CECE8(struct Sprite* sprite)
(u16)gBattleAnimArgs[1] = -a;
}
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
StartSpriteAnim(sprite, gBattleAnimArgs[0]);
sprite->data[2] = 0;
sprite->data[3] = 0;

4
src/battle/anim/note_wave.c
View File

@@ -81,8 +81,8 @@ void sub_80CEB0C(struct Sprite* sprite)
}
else
{
a = GetBankPosition(gAnimBankTarget, 2);
b = GetBankPosition(gAnimBankTarget, 3);
a = GetBattlerSpriteCoord(gAnimBankTarget, 2);
b = GetBattlerSpriteCoord(gAnimBankTarget, 3);
}
sprite->data[4] = sprite->pos1.x << 4;

4
src/battle/anim/orbit.c
View File

@@ -84,7 +84,7 @@ void sub_80CAD54(struct Sprite* sprite)
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = sprite->pos1.x;
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
InitAnimSpriteTranslationDeltas(sprite);
sprite->data[5] = 0x40;
sprite->callback = sub_80CADA8;
@@ -121,7 +121,7 @@ void sub_80CAE20(struct Sprite* sprite)
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = sprite->pos1.x;
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
InitAnimSpriteTranslationDeltas(sprite);
sprite->data[5] = 0x40;
sprite->callback = sub_80CAE74;

4
src/battle/anim/orbit_fast.c
View File

@@ -16,8 +16,8 @@ static void AnimOrbitFastStep(struct Sprite* sprite);
// arg 1: initial wave offset
void AnimOrbitFast(struct Sprite* sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->affineAnimPaused = 1;
sprite->data[0] = gBattleAnimArgs[0];
sprite->data[1] = gBattleAnimArgs[1];

4
src/battle/anim/orbit_scatter.c
View File

@@ -15,8 +15,8 @@ static void AnimOrbitScatterStep(struct Sprite* sprite);
// arg 0: initial wave offset
void AnimOrbitScatter(struct Sprite* sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
sprite->callback = AnimOrbitScatterStep;

24
src/battle/anim/orbs.c
View File

@@ -21,8 +21,8 @@ void sub_80CA7B0(struct Sprite* sprite)
{
InitAnimSpritePos(sprite, 1);
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
}
@@ -32,8 +32,8 @@ void sub_80CA800(struct Sprite* sprite)
InitAnimSpritePos(sprite, 1);
StartSpriteAnim(sprite, gBattleAnimArgs[3]);
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
}
@@ -43,9 +43,9 @@ void sub_80CA858(struct Sprite* sprite)
InitAnimSpritePos(sprite, 1);
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
InitAnimSpriteTranslationDeltas(sprite);
sprite->data[5] = gBattleAnimArgs[3];
sprite->callback = sub_80CA8B4;
@@ -96,8 +96,8 @@ void sub_80CA9A8(struct Sprite* sprite)
{
sub_8078764(sprite, 1);
sprite->data[0] = gBattleAnimArgs[3];
sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->data[5] = gBattleAnimArgs[2];
InitAnimSpriteTranslationOverDuration(sprite);
sprite->callback = sub_80CA9F8;
@@ -115,8 +115,8 @@ void sub_80CAA14(struct Sprite* sprite)
u16 b;
StartSpriteAnim(sprite, a & 7);
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos1.x -= 20;
@@ -129,9 +129,9 @@ void sub_80CAA14(struct Sprite* sprite)
b = Random();
sprite->data[0] = (b & 31) + 64;
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sub_8078D60(sprite);
sprite->data[5] = Random() & 0xFF;
sprite->data[6] = sprite->subpriority;

4
src/battle/anim/osmose.c
View File

@@ -14,8 +14,8 @@ void sub_80CB768(struct Sprite* sprite)
{
if (!sprite->data[0])
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
sprite->data[1] = gBattleAnimArgs[2];
sprite->data[2] = gBattleAnimArgs[3];
sprite->data[3] = gBattleAnimArgs[4];

4
src/battle/anim/poison.c
View File

@@ -20,8 +20,8 @@ void sub_80D9D70(struct Sprite *sprite)
InitAnimSpritePos(sprite, 1);
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sprite->data[5] = -30;
InitAnimSpriteTranslationOverDuration(sprite);

32
src/battle/anim/psychic.c
View File

@@ -78,8 +78,8 @@ void sub_80DB74C(struct Sprite *sprite)
if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
}
if (IsContest())
@@ -208,8 +208,8 @@ void sub_80DBA4C(struct Sprite *sprite)
void sub_80DBAF4(struct Sprite *sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
{
@@ -239,8 +239,8 @@ void sub_80DBB70(struct Sprite *sprite)
x = -x;
}
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + x;
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + y;
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + x;
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + y;
if (sprite->pos1.y < 16)
{
@@ -285,7 +285,7 @@ static void sub_80DBC34(struct Sprite *sprite)
void sub_80DBC94(u8 taskId)
{
struct Task *task = &gTasks[taskId];
u8 spriteId = GetAnimBankSpriteId(0);
u8 spriteId = GetAnimBattlerSpriteId(0);
task->data[0] = spriteId;
sub_80798F4(task, spriteId, &gUnknown_083DA8A4);
task->func = sub_80DBCD0;
@@ -302,7 +302,7 @@ static void sub_80DBCD0(u8 taskId)
void sub_80DBCFC(u8 taskId)
{
struct Task *task = &gTasks[taskId];
u8 spriteId = GetAnimBankSpriteId(0);
u8 spriteId = GetAnimBattlerSpriteId(0);
task->data[0] = spriteId;
task->data[1] = 0;
task->data[2] = 0;
@@ -348,8 +348,8 @@ void sub_80DBE00(u8 taskId)
task->data[3] = 16;
task->data[4] = 0;
task->data[13] = GetBankPosition(gAnimBankAttacker, 2);
task->data[14] = GetBankPosition(gAnimBankAttacker, 3);
task->data[13] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
var0 = sub_807A100(gAnimBankAttacker, 1) / 3;
var1 = sub_807A100(gAnimBankAttacker, 0) / 3;
@@ -448,8 +448,8 @@ void sub_80DC068(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
}
sprite->data[0] = gBattleAnimArgs[1];
@@ -684,7 +684,7 @@ void sub_80DC4F4(u8 taskId)
obj_id_set_rotscale(spriteId, 256, 256, 0);
CalcCenterToCornerVec(&gSprites[spriteId], gSprites[spriteId].oam.shape, gSprites[spriteId].oam.size, gSprites[spriteId].oam.affineMode);
task->data[13] = GetAnimBankSpriteId(gBattleAnimArgs[0]);
task->data[13] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
task->data[14] = matrixNum;
task->data[15] = spriteId;
task->func = sub_80DC5F4;
@@ -789,7 +789,7 @@ _080DC554:\n\
bl CalcCenterToCornerVec\n\
ldr r1, _080DC5EC @ =gBattleAnimArgs\n\
ldrb r0, [r1]\n\
bl GetAnimBankSpriteId\n\
bl GetAnimBattlerSpriteId\n\
lsls r0, 24\n\
lsrs r0, 24\n\
strh r0, [r7, 0x22]\n\
@@ -854,8 +854,8 @@ void sub_80DC700(struct Sprite *sprite)
switch (sprite->data[0])
{
case 0:
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
if (IsContest())
sprite->pos1.y += 12;

14
src/battle/anim/ring.c
View File

@@ -34,9 +34,9 @@ void sub_80D0FD8(struct Sprite* sprite)
{
SetAverageBattlerPositions(bank, r4, &sp0, &sp1);
if (r4 == 0)
r4 = GetBankPosition(bank, 0);
r4 = GetBattlerSpriteCoord(bank, 0);
else
r4 = GetBankPosition(bank, 2);
r4 = GetBattlerSpriteCoord(bank, 2);
if (GetBattlerSide(bank) != 0)
gBattleAnimArgs[0] -= (sp0 - r4) - gBattleAnimArgs[0]; // This is weird.
@@ -92,7 +92,7 @@ void sub_80D10B8(struct Sprite* sprite)
if (GetBattlerSide(bankr7) != 0)
{
r9 = GetBankPosition(bankr7, r10) + gBattleAnimArgs[0];
r9 = GetBattlerSpriteCoord(bankr7, r10) + gBattleAnimArgs[0];
if (IsAnimBankSpriteVisible(bankr8 ^ 2))
sprite->subpriority = gSprites[gBankSpriteIds[bankr8 ^ 2]].subpriority - 1;
else
@@ -100,7 +100,7 @@ void sub_80D10B8(struct Sprite* sprite)
}
else
{
r9 = GetBankPosition(bankr7, r10) - gBattleAnimArgs[0];
r9 = GetBattlerSpriteCoord(bankr7, r10) - gBattleAnimArgs[0];
if (gMain.inBattle && IsAnimBankSpriteVisible(bankr7 ^ 2))
{
if (gSprites[gBankSpriteIds[bankr7]].pos1.x < gSprites[gBankSpriteIds[bankr7 ^ 2]].pos1.x)
@@ -115,15 +115,15 @@ void sub_80D10B8(struct Sprite* sprite)
}
r6 = GetBankPosition(bankr7, sp4) + gBattleAnimArgs[1];
r6 = GetBattlerSpriteCoord(bankr7, sp4) + gBattleAnimArgs[1];
if (gMain.inBattle && IsAnimBankSpriteVisible(bankr8 ^ 2))
{
SetAverageBattlerPositions(bankr8, gBattleAnimArgs[6], &sp0, &sp1);
}
else
{
sp0 = GetBankPosition(bankr8, r10);
sp1 = GetBankPosition(bankr8, sp4);
sp0 = GetBattlerSpriteCoord(bankr8, r10);
sp1 = GetBattlerSpriteCoord(bankr8, sp4);
}
if (GetBattlerSide(bankr8))

14
src/battle/anim/rock.c
View File

@@ -295,10 +295,10 @@ void sub_80DD4D4(u8 taskId)
task = &gTasks[taskId];
var0 = GetBankPosition(gAnimBankAttacker, 2);
var1 = GetBankPosition(gAnimBankAttacker, 1) + 24;
var2 = GetBankPosition(gAnimBankTarget, 2);
var3 = GetBankPosition(gAnimBankTarget, 1) + 24;
var0 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
var1 = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 24;
var2 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
var3 = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 24;
if ((gAnimBankAttacker ^ 2) == gAnimBankTarget)
var3 = var1;
@@ -333,7 +333,7 @@ void sub_80DD4D4(u8 taskId)
task->data[13] = pan1;
task->data[14] = (pan2 - pan1) / task->data[8];
task->data[1] = var4;
task->data[15] = GetAnimBankSpriteId(0);
task->data[15] = GetAnimBattlerSpriteId(0);
task->func = sub_80DD604;
}
@@ -522,8 +522,8 @@ void sub_80DD978(struct Sprite *sprite)
void sub_80DD9A4(struct Sprite *sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];

12
src/battle/anim/roots.c
View File

@@ -18,8 +18,8 @@ void sub_80CB59C(struct Sprite* sprite)
{
if (!sprite->data[0])
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
sprite->pos2.x = gBattleAnimArgs[0];
sprite->pos2.y = gBattleAnimArgs[1];
sprite->subpriority = gBattleAnimArgs[2] + 30;
@@ -36,10 +36,10 @@ void sub_80CB59C(struct Sprite* sprite)
void sub_80CB620(struct Sprite *sprite)
{
s16 p1 = GetBankPosition(gAnimBankAttacker, 2);
s16 p2 = GetBankPosition(gAnimBankAttacker, 3);
s16 e1 = GetBankPosition(gAnimBankTarget, 2);
s16 e2 = GetBankPosition(gAnimBankTarget, 3);
s16 p1 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
s16 p2 = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
s16 e1 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
s16 e2 = GetBattlerSpriteCoord(gAnimBankTarget, 3);
e1 -= p1;
e2 -= p2;

4
src/battle/anim/scan.c
View File

@@ -110,8 +110,8 @@ void sub_80CD4EC(struct Sprite* sprite)
sprite->pos2.y = 0;
sprite->pos2.x = 0;
sprite->data[0] = 6;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + a;
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + b;
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + a;
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + b;
sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, sub_80CD654);
}

4
src/battle/anim/seed.c
View File

@@ -27,8 +27,8 @@ void AnimLeechSeed(struct Sprite* sprite)
}
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[2] = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[2];
sprite->data[4] = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[3];
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3];
sprite->data[5] = gBattleAnimArgs[5];
InitAnimSpriteTranslationOverDuration(sprite);
sprite->callback = AnimLeechSeedStep;

4
src/battle/anim/shadow_enlarge.c
View File

@@ -15,7 +15,7 @@ static void sub_80D0428(u8 taskId);
void sub_80D03C4(u8 taskId)
{
u8 spriteId = GetAnimBankSpriteId(1);
u8 spriteId = GetAnimBattlerSpriteId(1);
sub_8078E70(spriteId, 1);
obj_id_set_rotscale(spriteId, 0xD0, 0xD0, 0);
sub_8079108(gSprites[spriteId].oam.paletteNum + 16, 0);
@@ -27,7 +27,7 @@ void sub_80D0428(u8 taskId)
{
if (--gTasks[taskId].data[0] == -1)
{
u8 spriteId = GetAnimBankSpriteId(1);
u8 spriteId = GetAnimBattlerSpriteId(1);
sub_8078F40(spriteId);
sub_8079108(gSprites[spriteId].oam.paletteNum + 16, 1);
DestroyAnimVisualTask(taskId);

2
src/battle/anim/shadow_minimize.c
View File

@@ -18,7 +18,7 @@ void sub_80D0704(struct Sprite* sprite);
void sub_80D0488(u8 taskId)
{
struct Task* task = &gTasks[taskId];
u8 spriteId = GetAnimBankSpriteId(0);
u8 spriteId = GetAnimBattlerSpriteId(0);
task->data[0] = spriteId;
sub_8078E70(spriteId, 0);
task->data[1] = 0;

12
src/battle/anim/shock.c
View File

@@ -15,8 +15,8 @@ extern void sub_80DA48C(struct Sprite *);
void sub_80D6294(struct Sprite *sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
if (GetBattlerSide(gAnimBankAttacker) != 0)
{
@@ -77,13 +77,13 @@ void sub_80D6328(struct Sprite *sprite)
if (gBattleAnimArgs[5] == 0)
{
sprite->pos1.x = GetBankPosition(slot, 0);
sprite->pos1.y = GetBankPosition(slot, 1);
sprite->pos1.x = GetBattlerSpriteCoord(slot, 0);
sprite->pos1.y = GetBattlerSpriteCoord(slot, 1);
}
else
{
sprite->pos1.x = GetBankPosition(slot, 2);
sprite->pos1.y = GetBankPosition(slot, 3);
sprite->pos1.x = GetBattlerSpriteCoord(slot, 2);
sprite->pos1.y = GetBattlerSpriteCoord(slot, 3);
}
sprite->pos2.x = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8;

6
src/battle/anim/silhouette.c
View File

@@ -15,7 +15,7 @@ static void sub_80CB438(u8 taskId);
void sub_80CB340(u8 taskId)
{
u8 spriteId = GetAnimBankSpriteId(1);
u8 spriteId = GetAnimBattlerSpriteId(1);
if (gSprites[spriteId].invisible)
{
DestroyAnimVisualTask(taskId);
@@ -32,7 +32,7 @@ void sub_80CB340(u8 taskId)
void sub_80CB3A8(u8 taskId)
{
u8 spriteId = GetAnimBankSpriteId(1);
u8 spriteId = GetAnimBattlerSpriteId(1);
gTasks[taskId].data[10] += gTasks[taskId].data[0];
gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8;
if (GetBattlerSide(gAnimBankTarget))
@@ -57,7 +57,7 @@ void sub_80CB438(u8 taskId)
{
if (gTasks[taskId].data[0] == 0)
{
u8 spriteId = GetAnimBankSpriteId(1);
u8 spriteId = GetAnimBattlerSpriteId(1);
sub_8078F40(spriteId);
gSprites[spriteId].pos2.x = 0;
gSprites[spriteId].pos2.y = 0;

16
src/battle/anim/slash.c
View File

@@ -19,13 +19,13 @@ void sub_80CDD74(struct Sprite* sprite)
{
if (gBattleAnimArgs[0] == 0)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
}
else
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[1];
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[2];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[1];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[2];
}
sprite->data[0] = 0;
@@ -36,16 +36,16 @@ void sub_80CDD74(struct Sprite* sprite)
void sub_80CDDDC(struct Sprite* sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0;
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + 0xFFD0;
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
StoreSpriteCallbackInData(sprite, sub_80CDE78);
sprite->callback = sub_8078600;
}
void sub_80CDE24(struct Sprite* sprite)
{
sprite->pos1.x = sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
sprite->pos1.x = sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
StartSpriteAnim(sprite, 1);
sprite->data[0] = 0;
sprite->data[1] = 0;

20
src/battle/anim/slice.c
View File

@@ -17,8 +17,8 @@ static void AnimSliceStep(struct Sprite* sprite);
// arg 2: slice direction; 0 = right-to-left, 1 = left-to-right
void AnimCuttingSlice(struct Sprite* sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
if (GetBattlerSide(gAnimBankTarget) == 0)
sprite->pos1.y += 8;
@@ -48,22 +48,22 @@ void sub_80CC9BC(struct Sprite* sprite)
switch (gBattleAnimArgs[3])
{
case 1:
a = GetBankPosition(gAnimBankTarget ^ 2, 0);
b = GetBankPosition(gAnimBankTarget ^ 2, 1);
a = GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 0);
b = GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 1);
break;
case 2:
a = GetBankPosition(gAnimBankTarget, 0);
b = GetBankPosition(gAnimBankTarget, 1);
a = GetBattlerSpriteCoord(gAnimBankTarget, 0);
b = GetBattlerSpriteCoord(gAnimBankTarget, 1);
if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
{
a = (GetBankPosition(gAnimBankTarget ^ 2, 0) + a) / 2;
b = (GetBankPosition(gAnimBankTarget ^ 2, 1) + b) / 2;
a = (GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 0) + a) / 2;
b = (GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 1) + b) / 2;
}
break;
case 0:
default:
a = GetBankPosition(gAnimBankTarget, 0);
b = GetBankPosition(gAnimBankTarget, 1);
a = GetBattlerSpriteCoord(gAnimBankTarget, 0);
b = GetBattlerSpriteCoord(gAnimBankTarget, 1);
break;
}

4
src/battle/anim/sonic.c
View File

@@ -34,8 +34,8 @@ void AnimSonicBoomProjectile(struct Sprite* sprite)
}
InitAnimSpritePos(sprite, 1);
targetXPos = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
targetYPos = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
targetXPos = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
targetYPos = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
rotation = ArcTan2Neg(targetXPos - sprite->pos1.x, targetYPos - sprite->pos1.y);
rotation += 0xF000;
if (IsContest())

8
src/battle/anim/sonic_task.c
View File

@@ -82,8 +82,8 @@ void sub_80CFB04(u8 taskId)
gBattleAnimArgs[2] |= 1;
}
}
r6 = gTasks[taskId].data[9] = GetBankPosition(gAnimBankAttacker, 0);
r9 = gTasks[taskId].data[10] = GetBankPosition(gAnimBankAttacker, 1);
r6 = gTasks[taskId].data[9] = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
r9 = gTasks[taskId].data[10] = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
&& IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
{
@@ -91,8 +91,8 @@ void sub_80CFB04(u8 taskId)
}
else
{
sp1 = GetBankPosition(gAnimBankTarget, 0);
sp2 = GetBankPosition(gAnimBankTarget, 1);
sp1 = GetBattlerSpriteCoord(gAnimBankTarget, 0);
sp2 = GetBattlerSpriteCoord(gAnimBankTarget, 1);
}
sp1 = gTasks[taskId].data[11] = sp1 + gBattleAnimArgs[0];

2
src/battle/anim/spin_finger.c
View File

@@ -23,7 +23,7 @@ void sub_80CF0BC(struct Sprite* sprite)
else
bank = gAnimBankTarget;
sprite->pos1.x = GetBankPosition(bank, 0);
sprite->pos1.x = GetBattlerSpriteCoord(bank, 0);
sprite->pos1.y = sub_807A100(bank, 2);
if (sprite->pos1.y <= 9)
sprite->pos1.y = 10;

4
src/battle/anim/spit.c
View File

@@ -21,8 +21,8 @@ void sub_80D287C(struct Sprite* sprite)
void sub_80D28AC(struct Sprite* sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
sprite->data[2] = gBattleAnimArgs[1];

2
src/battle/anim/splash.c
View File

@@ -24,7 +24,7 @@ void sub_80D074C(u8 taskId)
}
else
{
u8 spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
task->data[0] = spriteId;
task->data[1] = 0;
task->data[2] = gBattleAnimArgs[1];

8
src/battle/anim/startle.c
View File

@@ -16,10 +16,10 @@ extern struct AffineAnimFrameCmd gUnknown_083D7A98;
// opponent
void sub_80D1E38(u8 taskId)
{
u8 spriteId = GetAnimBankSpriteId(1);
u8 spriteId = GetAnimBattlerSpriteId(1);
if (++gTasks[taskId].data[0] == 1)
{
sub_80798F4(&gTasks[taskId], GetAnimBankSpriteId(1), &gUnknown_083D7A98);
sub_80798F4(&gTasks[taskId], GetAnimBattlerSpriteId(1), &gUnknown_083D7A98);
gSprites[spriteId].pos2.x = 4;
}
else
@@ -37,10 +37,10 @@ void sub_80D1E38(u8 taskId)
// player
void sub_80D1EC8(u8 taskId)
{
u8 spriteId = GetAnimBankSpriteId(0);
u8 spriteId = GetAnimBattlerSpriteId(0);
if (++gTasks[taskId].data[0] == 1)
{
sub_80798F4(&gTasks[taskId], GetAnimBankSpriteId(0), &gUnknown_083D7A98);
sub_80798F4(&gTasks[taskId], GetAnimBattlerSpriteId(0), &gUnknown_083D7A98);
gSprites[spriteId].pos2.x = 4;
}
else

4
src/battle/anim/strike.c
View File

@@ -23,8 +23,8 @@ void sub_80CE670(struct Sprite* sprite)
sprite->data[0] = 0;
sprite->data[1] = gBattleAnimArgs[2];
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[0];
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[1];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[0];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[1];
sprite->data[6] = sprite->pos1.x;
sprite->data[7] = sprite->pos1.y;
if (IsContest() != 0)

8
src/battle/anim/struggle.c
View File

@@ -19,13 +19,13 @@ void sub_80D2C38(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
}
else
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
}
if (gBattleAnimArgs[1] == 0)

4
src/battle/anim/tendrils.c
View File

@@ -28,7 +28,7 @@ void sub_80CB298(struct Sprite* sprite)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
{
sprite->affineAnimPaused = 0;
GetAnimBankSpriteId(1);
GetAnimBattlerSpriteId(1);
sprite->data[0] = 0x100;
sprite->callback = sub_80CB2D4;
}
@@ -36,7 +36,7 @@ void sub_80CB298(struct Sprite* sprite)
void sub_80CB2D4(struct Sprite* sprite)
{
GetAnimBankSpriteId(1);
GetAnimBattlerSpriteId(1);
if (!sprite->data[2])
{
sprite->data[0] += 11;

2
src/battle/anim/thought.c
View File

@@ -20,7 +20,7 @@ void sub_80CEF44(u8 bank, struct Sprite* sprite)
else
sprite->pos1.x = sub_807A100(bank, 4) - 8;
sprite->pos1.y = GetBankPosition(bank, 3) - (s16)sub_807A100(bank, 0) / 4;
sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) - (s16)sub_807A100(bank, 0) / 4;
}
void sub_80CEF9C(struct Sprite* sprite)

4
src/battle/anim/thrashing.c
View File

@@ -20,7 +20,7 @@ static void sub_80D0B3C(u8 taskId);
void sub_80D0A4C(u8 taskId)
{
struct Task* task = &gTasks[taskId];
u8 spriteId = GetAnimBankSpriteId(0);
u8 spriteId = GetAnimBattlerSpriteId(0);
task->data[0] = spriteId;
task->data[1] = 0;
sub_80798F4(task, spriteId, &gUnknown_083D77B0);
@@ -38,7 +38,7 @@ void sub_80D0A8C(u8 taskId)
void sub_80D0AB8(u8 taskId)
{
struct Task* task = &gTasks[taskId];
task->data[0] = GetAnimBankSpriteId(0);
task->data[0] = GetAnimBattlerSpriteId(0);
task->data[1] = 0;
task->data[2] = 4;
task->data[3] = 7;

4
src/battle/anim/tile_in.c
View File

@@ -15,8 +15,8 @@ void sub_80CE09C(struct Sprite* sprite)
{
if (sprite->data[0] == 0)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
if (IsContest())
sprite->pos1.y += 10;
sprite->data[0]++;

10
src/battle/anim/tile_out.c
View File

@@ -9,7 +9,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
extern u8 gNoOfAllBanks;
extern u8 gBattlersCount;
extern u8 gHealthboxIDs[];
static void sub_80CE1AC(struct Sprite* sprite);
@@ -35,8 +35,8 @@ void sub_80CE1AC(struct Sprite* sprite)
{
sprite->animPaused = 0;
sprite->data[0] = 30;
sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
}
@@ -57,7 +57,7 @@ void sub_80CE210(u8 taskId)
void unref_sub_80CE260(u8 taskId)
{
u8 i;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (gBattleAnimArgs[0] == 1 && GetBattlerSide(i) == 0)
sub_8043DB0(gHealthboxIDs[i]);
@@ -72,7 +72,7 @@ void unref_sub_80CE260(u8 taskId)
void unref_sub_80CE2D4(u8 taskId)
{
u8 i;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
sub_8043DFC(gHealthboxIDs[i]);
}

2
src/battle/anim/twinkle.c
View File

@@ -15,7 +15,7 @@ static void sub_80CE3B0(struct Sprite* sprite);
void sub_80CE36C(struct Sprite* sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
sprite->pos1.y = gBattleAnimArgs[1];
sprite->data[0] = 0;
sprite->data[1] = 0;

4
src/battle/anim/unused_7.c
View File

@@ -30,8 +30,8 @@ void sub_80CF374(struct Sprite* sprite)
void sub_80CF3C4(struct Sprite* sprite)
{
u8 a;
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
a = gBankSpriteIds[gAnimBankTarget];
if (GetBattlerSide(gAnimBankAttacker) != 0)
{

2
src/battle/anim/uproar.c
View File

@@ -12,7 +12,7 @@ void sub_80D2D3C(u8);
void sub_80D2CF8(u8 taskId)
{
u8 spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
sub_80798F4(&gTasks[taskId], spriteId, gUnknown_083D7CA8);
gTasks[taskId].func = sub_80D2D3C;

4
src/battle/anim/wisp_fire.c
View File

@@ -60,8 +60,8 @@ void sub_80D5DDC(u8 taskId)
task->data[12] = !GetBattlerSide(gAnimBankAttacker) ? 1 : -1;
task->data[13] = IsAnimBankSpriteVisible(gAnimBankTarget ^ 2) + 1;
task->data[14] = GetAnimBankSpriteId(1);
task->data[15] = GetAnimBankSpriteId(3);
task->data[14] = GetAnimBattlerSpriteId(1);
task->data[15] = GetAnimBattlerSpriteId(3);
task->func = sub_80D5E4C;
}

4
src/battle/anim/wisp_orb.c
View File

@@ -70,9 +70,9 @@ void sub_80D5B0C(struct Sprite *sprite)
sprite->data[0] = 256;
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
sub_8078BD4(sprite);
sprite->callback = sub_80D5C5C;

102
src/battle/battle_2.c
View File

@@ -86,7 +86,7 @@ extern struct UnknownPokemonStruct2 gUnknown_02023A00[];
extern u8 gBattleBufferB[][0x200];
extern u8 gActiveBattler;
extern u32 gBattleExecBuffer;
extern u8 gNoOfAllBanks;
extern u8 gBattlersCount;
extern u16 gBattlerPartyIndexes[];
extern u8 gCurrentActionFuncId;
extern u8 gBanksByTurnOrder[];
@@ -3604,17 +3604,17 @@ void sub_8010824(void)
#if DEBUG
if (gUnknown_02023A14_50 & 0x80)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
debug_sub_80138CC();
gBattleMainFunc();
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
gBattleBankFunc[gActiveBattler]();
}
else
#endif
{
gBattleMainFunc();
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
gBattleBankFunc[gActiveBattler]();
}
}
@@ -3735,7 +3735,7 @@ void SwitchInClearSetData(void)
{
for (i = 0; i < 8; i++)
gBattleMons[gActiveBattler].statStages[i] = 6;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
struct UnknownStruct12 *sp20 = &gUnknown_02024AD0[i];
@@ -3753,7 +3753,7 @@ void SwitchInClearSetData(void)
gBattleMons[gActiveBattler].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED);
gStatuses3[gActiveBattler] &= (STATUS3_LEECHSEED_BANK | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT);
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (GetBattlerSide(gActiveBattler) != GetBattlerSide(i)
&& (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
@@ -3770,7 +3770,7 @@ void SwitchInClearSetData(void)
gStatuses3[gActiveBattler] = 0;
}
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (gUnknown_02024AD0[i].unk0 & (gBitTable[gActiveBattler] << 16))
gUnknown_02024AD0[i].unk0 &= ~(gBitTable[gActiveBattler] << 16);
@@ -3822,7 +3822,7 @@ void UndoEffectsAfterFainting(void)
gBattleMons[gActiveBattler].statStages[i] = 6;
gBattleMons[gActiveBattler].status2 = 0;
gStatuses3[gActiveBattler] = 0;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBattler)
gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
@@ -3892,7 +3892,7 @@ void bc_8012FAC(void)
if (gBattleExecBuffer == 0)
{
gBattleCommunication[1]++;
if (gBattleCommunication[1] == gNoOfAllBanks)
if (gBattleCommunication[1] == gBattlersCount)
gBattleMainFunc = BattlePrepIntroSlide;
else
gBattleCommunication[0] = 0;
@@ -3921,7 +3921,7 @@ void sub_8011384(void)
if (gBattleExecBuffer == 0)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI)
&& GetBattlerSide(gActiveBattler) == 0)
@@ -4090,7 +4090,7 @@ void sub_8011834(void)
{
if (gBattleExecBuffer == 0)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (GetBattlerPosition(gActiveBattler) == 1)
{
@@ -4112,7 +4112,7 @@ void bc_801362C(void)
{
if (gBattleExecBuffer == 0)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (GetBattlerSide(gActiveBattler) == 1
&& !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)))
@@ -4142,7 +4142,7 @@ void sub_80119B4(void)
{
if (gBattleExecBuffer == 0)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (GetBattlerPosition(gActiveBattler) == 0)
{
@@ -4167,7 +4167,7 @@ void unref_sub_8011A68(void)
{
if (gBattleExecBuffer == 0)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (GetBattlerSide(gActiveBattler) == 0)
{
@@ -4192,11 +4192,11 @@ void BattleBeginFirstTurn(void)
{
if (ewram16058 == 0)
{
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
gBanksByTurnOrder[i] = i;
for (i = 0; i < gNoOfAllBanks - 1; i++)
for (i = 0; i < gBattlersCount - 1; i++)
{
for (j = i + 1; j < gNoOfAllBanks; j++)
for (j = i + 1; j < gBattlersCount; j++)
{
if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 1) != 0)
SwapTurnOrder(i, j);
@@ -4208,7 +4208,7 @@ void BattleBeginFirstTurn(void)
ewram160E6 = 1;
return;
}
while (ewram16058 < gNoOfAllBanks)
while (ewram16058 < gBattlersCount)
{
if (AbilityBattleEffects(0, gBanksByTurnOrder[ewram16058], 0, 0, 0) != 0)
r9++;
@@ -4220,7 +4220,7 @@ void BattleBeginFirstTurn(void)
return;
if (AbilityBattleEffects(11, 0, 0, 0, 0) != 0)
return;
while (ewram160F9 < gNoOfAllBanks)
while (ewram160F9 < gBattlersCount)
{
if (ItemBattleEffects(0, gBanksByTurnOrder[ewram160F9], 0) != 0)
r9++;
@@ -4229,7 +4229,7 @@ void BattleBeginFirstTurn(void)
return;
}
// Absolutely pointless for-loop that somehow doesn't get optimized out
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
;
for (i = 0; i < 4; i++)
{
@@ -4244,7 +4244,7 @@ void BattleBeginFirstTurn(void)
ResetSentPokesToOpponentValue();
for (i = 0; i < 8; i++)
gBattleCommunication[i] = 0;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
gBattleMons[i].status2 &= ~8;
ewram16000 = 0;
ewram16001 = 0;
@@ -4267,7 +4267,7 @@ void bc_8013B1C(void)
gBattleMainFunc = BattleTurnPassed;
for (i = 0; i < 8; i++)
gBattleCommunication[i] = 0;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
gBattleMons[i].status2 &= ~8;
if ((gBattleMons[i].status1 & 7) && (gBattleMons[i].status2 & 0x1000))
@@ -4319,7 +4319,7 @@ void BattleTurnPassed(void)
}
if (gBattleResults.battleTurnCounter < 0xFF)
gBattleResults.battleTurnCounter++;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
gActionForBanks[i] = 0xFF;
gChosenMovesByBanks[i] = 0;
@@ -4349,7 +4349,7 @@ u8 CanRunFromBattle(void)
if (gBattleMons[gActiveBattler].ability == ABILITY_RUN_AWAY)
return 0;
r6 = GetBattlerSide(gActiveBattler);
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (r6 != GetBattlerSide(i)
&& gBattleMons[i].ability == ABILITY_SHADOW_TAG)
@@ -4428,7 +4428,7 @@ void sub_8012324(void)
gBattleCommunication[4] = 0;
// inverted loop
//_0801234C
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
r5 = GetBattlerPosition(gActiveBattler);
switch (gBattleCommunication[gActiveBattler])
@@ -4485,12 +4485,12 @@ void sub_8012324(void)
strb r1, [r0, 0x4]\n\
ldr r0, _08012344 @ =gActiveBattler\n\
strb r1, [r0]\n\
ldr r0, _08012348 @ =gNoOfAllBanks\n\
ldr r0, _08012348 @ =gBattlersCount\n\
bl _08012F74\n\
.align 2, 0\n\
_08012340: .4byte gBattleCommunication\n\
_08012344: .4byte gActiveBattler\n\
_08012348: .4byte gNoOfAllBanks\n\
_08012348: .4byte gBattlersCount\n\
_0801234C:\n\
ldr r4, _08012374 @ =gActiveBattler\n\
ldrb r0, [r4]\n\
@@ -5914,7 +5914,7 @@ _08012F66:\n\
ldrb r1, [r0]\n\
adds r1, 0x1\n\
strb r1, [r0]\n\
ldr r0, _08012FB0 @ =gNoOfAllBanks\n\
ldr r0, _08012FB0 @ =gBattlersCount\n\
lsls r1, 24\n\
lsrs r1, 24\n\
_08012F74:\n\
@@ -5946,7 +5946,7 @@ _08012FA0: .4byte gBattleExecBuffer\n\
_08012FA4: .4byte gBitTable\n\
_08012FA8: .4byte gActiveBattler\n\
_08012FAC: .4byte gBattleCommunication\n\
_08012FB0: .4byte gNoOfAllBanks\n\
_08012FB0: .4byte gBattlersCount\n\
_08012FB4: .4byte gBattleMainFunc\n\
_08012FB8: .4byte SetActionsAndBanksTurnOrder\n\
.syntax divided\n");
@@ -6117,7 +6117,7 @@ void SetActionsAndBanksTurnOrder(void)
if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler];
gBanksByTurnOrder[var] = gActiveBattler;
@@ -6128,7 +6128,7 @@ void SetActionsAndBanksTurnOrder(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (gActionForBanks[gActiveBattler] == ACTION_RUN)
{
@@ -6151,7 +6151,7 @@ void SetActionsAndBanksTurnOrder(void)
gActionsByTurnOrder[0] = gActionForBanks[gActiveBattler];
gBanksByTurnOrder[0] = gActiveBattler;
var = 1;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (i != gActiveBattler)
{
@@ -6161,12 +6161,12 @@ void SetActionsAndBanksTurnOrder(void)
}
}
gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
eFocusPunchBank = 0;
eFocusPunchBattler = 0;
return;
}
else
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (gActionForBanks[gActiveBattler] == ACTION_USE_ITEM || gActionForBanks[gActiveBattler] == ACTION_SWITCH)
{
@@ -6175,7 +6175,7 @@ void SetActionsAndBanksTurnOrder(void)
var++;
}
}
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (gActionForBanks[gActiveBattler] != ACTION_USE_ITEM && gActionForBanks[gActiveBattler] != ACTION_SWITCH)
{
@@ -6184,9 +6184,9 @@ void SetActionsAndBanksTurnOrder(void)
var++;
}
}
for (i = 0; i < gNoOfAllBanks - 1; i++)
for (i = 0; i < gBattlersCount - 1; i++)
{
for (j = i + 1; j < gNoOfAllBanks; j++)
for (j = i + 1; j < gBattlersCount; j++)
{
u8 bank1 = gBanksByTurnOrder[i];
u8 bank2 = gBanksByTurnOrder[j];
@@ -6204,7 +6204,7 @@ void SetActionsAndBanksTurnOrder(void)
}
gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
eFocusPunchBank = 0;
eFocusPunchBattler = 0;
}
static void TurnValuesCleanUp(bool8 var0)
@@ -6212,7 +6212,7 @@ static void TurnValuesCleanUp(bool8 var0)
s32 i;
u8 *dataPtr;
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (var0)
{
@@ -6246,7 +6246,7 @@ static void TurnValuesCleanUp(bool8 var0)
void SpecialStatusesClear(void)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
s32 i;
u8 *dataPtr = (u8*)(&gSpecialStatuses[gActiveBattler]);
@@ -6260,10 +6260,10 @@ void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
{
if (!(gHitMarker & HITMARKER_RUN))
{
while (eFocusPunchBank < gNoOfAllBanks)
while (eFocusPunchBattler < gBattlersCount)
{
gActiveBattler = gBankAttacker = eFocusPunchBank;
eFocusPunchBank++;
gActiveBattler = gBankAttacker = eFocusPunchBattler;
eFocusPunchBattler++;
if (gChosenMovesByBanks[gActiveBattler] == MOVE_FOCUS_PUNCH
&& !(gBattleMons[gActiveBattler].status1 & STATUS_SLEEP)
&& !(gDisableStructs[gBankAttacker].truantCounter)
@@ -6300,7 +6300,7 @@ static void RunTurnActionsFunctions(void)
gBattleStruct->unk16057 = gCurrentTurnActionNumber;
gUnknown_081FA640[gCurrentActionFuncId]();
if (gCurrentTurnActionNumber >= gNoOfAllBanks) // everyone did their actions, turn finished
if (gCurrentTurnActionNumber >= gBattlersCount) // everyone did their actions, turn finished
{
gHitMarker &= ~(HITMARKER_x100000);
gBattleMainFunc = gUnknown_081FA678[gBattleOutcome & 0x7F];
@@ -6425,7 +6425,7 @@ void HandleEndTurn_FinishBattle(void)
| BATTLE_TYPE_WALLY_TUTORIAL
| BATTLE_TYPE_BATTLE_TOWER)))
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
{
@@ -6640,7 +6640,7 @@ void HandleAction_UseMove(void)
&& gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
{
side = GetBattlerSide(gBankAttacker);
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (side != GetBattlerSide(gActiveBattler)
&& ewram16010arr(gBankAttacker) != gActiveBattler
@@ -7255,7 +7255,7 @@ bool8 TryRunFromBattle(u8 bank)
if (effect)
{
gCurrentTurnActionNumber = gNoOfAllBanks;
gCurrentTurnActionNumber = gBattlersCount;
gBattleOutcome = BATTLE_RAN;
}
@@ -7268,9 +7268,9 @@ void HandleAction_Run(void)
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
gCurrentTurnActionNumber = gNoOfAllBanks;
gCurrentTurnActionNumber = gBattlersCount;
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
{
@@ -7308,7 +7308,7 @@ void HandleAction_Run(void)
}
else
{
gCurrentTurnActionNumber = gNoOfAllBanks;
gCurrentTurnActionNumber = gBattlersCount;
gBattleOutcome = BATTLE_POKE_FLED;
}
}
@@ -7388,7 +7388,7 @@ void HandleAction_SafriZoneRun(void)
{
gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
PlaySE(SE_NIGERU);
gCurrentTurnActionNumber = gNoOfAllBanks;
gCurrentTurnActionNumber = gBattlersCount;
gBattleOutcome = BATTLE_RAN;
}

128
src/battle/battle_4.c
View File

@@ -98,17 +98,17 @@ enum
extern u8 gUnknown_02023A14_50;
extern u8 gCritMultiplier;
extern s32 gBattleMoveDamage;
extern u32 gStatuses3[BATTLE_BANKS_COUNT];
extern u32 gStatuses3[MAX_BATTLERS_COUNT];
extern u16 gBattleTypeFlags;
extern const struct BaseStats gBaseStats[];
extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
extern u8 gActiveBattler;
extern u32 gBattleExecBuffer;
extern u8 gNoOfAllBanks;
extern u16 gBattlerPartyIndexes[BATTLE_BANKS_COUNT];
extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
extern u8 gBattlersCount;
extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
extern u8 gBanksByTurnOrder[MAX_BATTLERS_COUNT];
extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
extern u16 gCurrentMove;
extern u8 gLastUsedAbility;
extern u16 gBattleWeather;
@@ -142,8 +142,8 @@ extern const u8 gTypeEffectiveness[];
extern u16 gLastUsedItem;
extern u16 gBattleMovePower;
extern s32 gHpDealt;
extern s32 gTakenDmg[BATTLE_BANKS_COUNT];
extern u8 gTakenDmgBanks[BATTLE_BANKS_COUNT];
extern s32 gTakenDmg[MAX_BATTLERS_COUNT];
extern u8 gTakenDmgBanks[MAX_BATTLERS_COUNT];
extern const u16 gMissStringIds[];
extern u8 gSentPokesToOpponent[2];
extern u8 gBank1;
@@ -1152,7 +1152,7 @@ static void atk00_attackcanceler(void)
return;
}
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if ((gProtectStructs[gBanksByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED)
{
@@ -2352,7 +2352,7 @@ static void atk14_printselectionstringfromtable(void)
u8 BankGetTurnOrder(u8 bank)
{
int i;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (gBanksByTurnOrder[i] == bank)
break;
@@ -2406,12 +2406,12 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
//check active uproar
if (gBattleMons[gEffectBank].ability != ABILITY_SOUNDPROOF)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks && !(gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR); gActiveBattler++) {}
for (gActiveBattler = 0; gActiveBattler < gBattlersCount && !(gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR); gActiveBattler++) {}
}
else
gActiveBattler = gNoOfAllBanks;
gActiveBattler = gBattlersCount;
if (gBattleMons[gEffectBank].status1) {break;}
if (gActiveBattler != gNoOfAllBanks) {break;} //nice way of checking uproar...
if (gActiveBattler != gBattlersCount) {break;} //nice way of checking uproar...
if (gBattleMons[gEffectBank].ability == ABILITY_VITAL_SPIRIT) {break;}
if (gBattleMons[gEffectBank].ability == ABILITY_INSOMNIA) {break;}
@@ -3061,7 +3061,7 @@ _0801E57A:\n\
ldr r0, _0801E5D4 @ =gActiveBattler\n\
movs r1, 0\n\
strb r1, [r0]\n\
ldr r1, _0801E5D8 @ =gNoOfAllBanks\n\
ldr r1, _0801E5D8 @ =gBattlersCount\n\
ldrb r3, [r1]\n\
adds r7, r0, 0\n\
mov r12, r1\n\
@@ -3096,10 +3096,10 @@ _0801E5B4:\n\
b _0801E5E8\n\
.align 2, 0\n\
_0801E5D4: .4byte gActiveBattler\n\
_0801E5D8: .4byte gNoOfAllBanks\n\
_0801E5D8: .4byte gBattlersCount\n\
_0801E5DC:\n\
ldr r0, _0801E628 @ =gActiveBattler\n\
ldr r2, _0801E62C @ =gNoOfAllBanks\n\
ldr r2, _0801E62C @ =gBattlersCount\n\
ldrb r1, [r2]\n\
strb r1, [r0]\n\
adds r7, r0, 0\n\
@@ -3142,7 +3142,7 @@ _0801E620:\n\
b _0801EA04\n\
.align 2, 0\n\
_0801E628: .4byte gActiveBattler\n\
_0801E62C: .4byte gNoOfAllBanks\n\
_0801E62C: .4byte gBattlersCount\n\
_0801E630:\n\
mov r2, r8\n\
ldrb r1, [r2]\n\
@@ -5662,13 +5662,13 @@ static void atk24(void)
//I can't for the love of god decompile that part
for (found1 = 0, i = 0; i < gNoOfAllBanks; i += 2)
for (found1 = 0, i = 0; i < gBattlersCount; i += 2)
{
if ((gHitMarker & HITMARKER_UNK(i)) && !gSpecialStatuses[i].flag40)
found1++;
}
for (found2 = 0, i = 1; i < gNoOfAllBanks; i += 2)
for (found2 = 0, i = 1; i < gBattlersCount; i += 2)
{
if ((gHitMarker & HITMARKER_UNK(i)) && !gSpecialStatuses[i].flag40)
found2++;
@@ -5791,7 +5791,7 @@ _08020A54:\n\
beq _08020B3E\n\
movs r2, 0\n\
movs r5, 0\n\
ldr r0, _08020B04 @ =gNoOfAllBanks\n\
ldr r0, _08020B04 @ =gBattlersCount\n\
ldrb r3, [r0]\n\
mov r12, r0\n\
ldr r7, _08020B08 @ =gBattlescriptCurrInstr\n\
@@ -5868,7 +5868,7 @@ _08020AF4: .4byte gPlayerParty\n\
_08020AF8: .4byte gBattleOutcome\n\
_08020AFC: .4byte gEnemyParty\n\
_08020B00: .4byte gBattleTypeFlags\n\
_08020B04: .4byte gNoOfAllBanks\n\
_08020B04: .4byte gBattlersCount\n\
_08020B08: .4byte gBattlescriptCurrInstr\n\
_08020B0C: .4byte gHitMarker\n\
_08020B10: .4byte gSpecialStatuses\n\
@@ -6844,7 +6844,7 @@ static void atk49_moveend(void)
gBattleStruct->cmd49StateTracker++;
break;
case 7: //changed held items
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
#define CHANGED_ITEM (((*u16)(gSharedMem + 0x160F0)))
if (CHANGED_ITEM(i))
@@ -7408,7 +7408,7 @@ _08021C38: .4byte gBattleMons\n\
_08021C3C: .4byte gBankAttacker\n\
_08021C40:\n\
movs r4, 0\n\
ldr r0, _08021C6C @ =gNoOfAllBanks\n\
ldr r0, _08021C6C @ =gBattlersCount\n\
ldrb r2, [r0]\n\
cmp r4, r2\n\
blt _08021C4C\n\
@@ -7432,7 +7432,7 @@ _08021C5C:\n\
blt _08021C52\n\
b _08022244\n\
.align 2, 0\n\
_08021C6C: .4byte gNoOfAllBanks\n\
_08021C6C: .4byte gBattlersCount\n\
_08021C70: .4byte gSharedMem + 0x160F0\n\
_08021C74: .4byte gBattleMons\n\
_08021C78:\n\
@@ -7588,7 +7588,7 @@ _08021DAC:\n\
lsls r0, 29\n\
cmp r0, 0\n\
blt _08021DFA\n\
ldr r0, _08021E14 @ =gNoOfAllBanks\n\
ldr r0, _08021E14 @ =gBattlersCount\n\
ldrb r0, [r0]\n\
cmp r3, r0\n\
bcs _08021DFA\n\
@@ -7627,7 +7627,7 @@ _08021E00:\n\
.align 2, 0\n\
_08021E0C: .4byte gSpecialStatuses\n\
_08021E10: .4byte gBankTarget\n\
_08021E14: .4byte gNoOfAllBanks\n\
_08021E14: .4byte gBattlersCount\n\
_08021E18: .4byte gStatuses3\n\
_08021E1C: .4byte 0x000400c0\n\
_08021E20: .4byte gActiveBattler\n\
@@ -7636,7 +7636,7 @@ _08021E28: .4byte gSharedMem\n\
_08021E2C: .4byte 0x0001600c\n\
_08021E30:\n\
movs r4, 0\n\
ldr r0, _08021E60 @ =gNoOfAllBanks\n\
ldr r0, _08021E60 @ =gBattlersCount\n\
ldrb r5, [r0]\n\
cmp r4, r5\n\
blt _08021E3C\n\
@@ -7662,7 +7662,7 @@ _08021E50:\n\
blt _08021E44\n\
b _08022244\n\
.align 2, 0\n\
_08021E60: .4byte gNoOfAllBanks\n\
_08021E60: .4byte gBattlersCount\n\
_08021E64: .4byte gDisableStructs\n\
_08021E68: .4byte 0xfeffffff\n\
_08021E6C: .4byte gUnknown_02024AD0\n\
@@ -8456,7 +8456,7 @@ static void atk50_openpartyscreen(void)
{
if ((gBattleTypeFlags & (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_MULTI)) != BATTLE_TYPE_DOUBLE)
{
for (gActiveBattler = i; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
for (gActiveBattler = i; gActiveBattler < gBattlersCount; gActiveBattler++)
{
if (!(gHitMarker & HITMARKER_FAINTED(gActiveBattler)))
{
@@ -8538,7 +8538,7 @@ _08022ACE:\n\
beq _08022BBC\n\
ldr r1, _08022B4C @ =gActiveBattler\n\
strb r7, [r1]\n\
ldr r0, _08022B50 @ =gNoOfAllBanks\n\
ldr r0, _08022B50 @ =gBattlersCount\n\
ldrb r0, [r0]\n\
cmp r7, r0\n\
bcc _08022AE8\n\
@@ -8592,7 +8592,7 @@ _08022AF2:\n\
_08022B44: .4byte gBattlescriptCurrInstr\n\
_08022B48: .4byte gBattleTypeFlags\n\
_08022B4C: .4byte gActiveBattler\n\
_08022B50: .4byte gNoOfAllBanks\n\
_08022B50: .4byte gBattlersCount\n\
_08022B54: .4byte gHitMarker\n\
_08022B58: .4byte gBitTable\n\
_08022B5C: .4byte gAbsentBattlerFlags\n\
@@ -8631,7 +8631,7 @@ _08022BA2:\n\
ldrb r0, [r4]\n\
adds r0, 0x1\n\
strb r0, [r4]\n\
ldr r1, _08022BB8 @ =gNoOfAllBanks\n\
ldr r1, _08022BB8 @ =gBattlersCount\n\
lsls r0, 24\n\
lsrs r0, 24\n\
ldrb r1, [r1]\n\
@@ -8639,7 +8639,7 @@ _08022BA2:\n\
bcc _08022AF2\n\
b _08022F62\n\
.align 2, 0\n\
_08022BB8: .4byte gNoOfAllBanks\n\
_08022BB8: .4byte gBattlersCount\n\
_08022BBC:\n\
ands r1, r0\n\
cmp r1, 0\n\
@@ -9277,7 +9277,7 @@ _08023110:\n\
ldr r4, _08023168 @ =gBitTable\n\
ldr r2, [r4]\n\
ands r2, r5\n\
ldr r6, _0802316C @ =gNoOfAllBanks\n\
ldr r6, _0802316C @ =gBattlersCount\n\
cmp r2, 0\n\
bne _0802314C\n\
adds r7, r6, 0\n\
@@ -9314,7 +9314,7 @@ _08023156:\n\
_08023160: .4byte gHitMarker\n\
_08023164: .4byte gBank1\n\
_08023168: .4byte gBitTable\n\
_0802316C: .4byte gNoOfAllBanks\n\
_0802316C: .4byte gBattlersCount\n\
_08023170:\n\
movs r0, 0x80\n\
ands r0, r2\n\
@@ -9436,7 +9436,7 @@ _0802325A:\n\
ldr r1, _080232A0 @ =gActiveBattler\n\
movs r0, 0\n\
strb r0, [r1]\n\
ldr r0, _080232C0 @ =gNoOfAllBanks\n\
ldr r0, _080232C0 @ =gBattlersCount\n\
ldrb r0, [r0]\n\
cmp r0, 0\n\
beq _08023302\n\
@@ -9454,7 +9454,7 @@ _0802328A:\n\
ldrb r0, [r4]\n\
adds r0, 0x1\n\
strb r0, [r4]\n\
ldr r1, _080232C0 @ =gNoOfAllBanks\n\
ldr r1, _080232C0 @ =gBattlersCount\n\
lsls r0, 24\n\
lsrs r0, 24\n\
ldrb r1, [r1]\n\
@@ -9470,7 +9470,7 @@ _080232B0: .4byte 0x00016068\n\
_080232B4: .4byte 0x0001606c\n\
_080232B8: .4byte gBattleResults\n\
_080232BC: .4byte gBattleTypeFlags\n\
_080232C0: .4byte gNoOfAllBanks\n\
_080232C0: .4byte gBattlersCount\n\
_080232C4:\n\
adds r0, r7, 0\n\
bl GetBattlerPosition\n\
@@ -9525,7 +9525,7 @@ static void atk51_switchhandleorder(void)
switch (T2_READ_8(gBattlescriptCurrInstr + 2))
{
case 0:
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (gBattleBufferB[i][0] == 0x22)
ewram16068arr(i) = gBattleBufferB[i][1];
@@ -9608,13 +9608,13 @@ static void atk52_switchineffects(void)
{
gSideAffecting[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (gBanksByTurnOrder[i] == gActiveBattler)
gActionsByTurnOrder[i] = 0xC;
}
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
*(HP_ON_SWITCHOUT + GetBattlerSide(i)) = gBattleMons[i].hp;
}
@@ -9627,7 +9627,7 @@ static void atk52_switchineffects(void)
{
if (hitmark & gBitTable[gBank1] && !(gAbsentBattlerFlags & gBitTable[gBank1]))
break;
if (gBank1 >= gNoOfAllBanks)
if (gBank1 >= gBattlersCount)
break;
gBank1++;
}
@@ -10422,7 +10422,7 @@ static void atk67_yesnobox(void)
static void atk68_cancelallactions(void)
{
int i;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
gActionsByTurnOrder[i] = 0xC;
}
@@ -11100,7 +11100,7 @@ static void atk77_setprotectlike(void) //protect and endure
if (last_move != MOVE_PROTECT && last_move != MOVE_DETECT && last_move != MOVE_ENDURE)
gDisableStructs[gBankAttacker].protectUses = 0;
if (gCurrentTurnActionNumber == (gNoOfAllBanks - 1))
if (gCurrentTurnActionNumber == (gBattlersCount - 1))
not_last_turn = 0;
if (sProtectSuccessRates[gDisableStructs[gBankAttacker].protectUses] > Random() && not_last_turn)
@@ -11132,13 +11132,13 @@ static void atk78_faintifabilitynotdamp(void)
if (gBattleExecBuffer)
return;
for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
for (gBankTarget = 0; gBankTarget < gBattlersCount; gBankTarget++)
{
if (gBattleMons[gBankTarget].ability == ABILITY_DAMP)
break;
}
if (gBankTarget == gNoOfAllBanks)
if (gBankTarget == gBattlersCount)
{
gActiveBattler = gBankAttacker;
gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
@@ -11146,7 +11146,7 @@ static void atk78_faintifabilitynotdamp(void)
MarkBufferBankForExecution(gActiveBattler);
gBattlescriptCurrInstr++;
for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
for (gBankTarget = 0; gBankTarget < gBattlersCount; gBankTarget++)
{
if (gBankTarget == gBankAttacker)
continue;
@@ -11189,7 +11189,7 @@ static void atk7A_jumpifnexttargetvalid(void) //used by intimidate to loop throu
break;
}
if (gBankTarget >= gNoOfAllBanks)
if (gBankTarget >= gBattlersCount)
gBattlescriptCurrInstr += 5;
else
gBattlescriptCurrInstr = jump_loc;
@@ -11378,7 +11378,7 @@ static void atk83_nop(void)
bool8 UproarWakeUpCheck(u8 bank)
{
int i;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (!(gBattleMons[i].status2 & STATUS2_UPROAR) || gBattleMons[bank].ability == ABILITY_SOUNDPROOF) //wtf gamefreak, you should check this only once, not every time in a loop...
continue;
@@ -11391,7 +11391,7 @@ bool8 UproarWakeUpCheck(u8 bank)
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
break;
}
if (i == gNoOfAllBanks)
if (i == gBattlersCount)
return 0;
else
return 1;
@@ -11677,7 +11677,7 @@ static void atk89_statbuffchange(void)
static void atk8A_normalisebuffs(void) //haze
{
int i, j;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
for (j = 0; j < 8; j++)
{
@@ -13668,7 +13668,7 @@ static void atkB2_trysetperishsong(void)
{
int not_affected_pokes = 0, i;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (gStatuses3[i] & STATUS3_PERISH_SONG || gBattleMons[i].ability == ABILITY_SOUNDPROOF)
not_affected_pokes++;
@@ -13681,7 +13681,7 @@ static void atkB2_trysetperishsong(void)
}
PressurePPLoseOnUsingPerishSong(gBankAttacker);
if (not_affected_pokes == gNoOfAllBanks)
if (not_affected_pokes == gBattlersCount)
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
else
gBattlescriptCurrInstr += 5;
@@ -13846,7 +13846,7 @@ static void atkB9_magnitudedamagecalculation(void)
gBattleTextBuff1[4] = magnitude;
gBattleTextBuff1[5] = 0xFF;
for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
for (gBankTarget = 0; gBankTarget < gBattlersCount; gBankTarget++)
{
if (gBankTarget == gBankAttacker)
continue;
@@ -13877,7 +13877,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
&& gBattleMons[gBankAttacker].hp && !gDisableStructs[gBankTarget].truantCounter && gChosenMovesByBanks[gBankTarget] == MOVE_PURSUIT)
{
int i;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (gBanksByTurnOrder[i] == gBankTarget)
gActionsByTurnOrder[i] = 11;
@@ -14148,7 +14148,7 @@ _080298A8: .4byte gBattlescriptCurrInstr\n\
static void atkC2_selectfirstvalidtarget(void)
{
for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
for (gBankTarget = 0; gBankTarget < gBattlersCount; gBankTarget++)
{
if (gBankTarget == gBankAttacker)
continue;
@@ -15100,7 +15100,7 @@ static void atkDB_tryimprision(void)
{
u8 bank;
PressurePPLoseOnUsingImprision(gBankAttacker);
for (bank = 0; bank < gNoOfAllBanks; bank++)
for (bank = 0; bank < gBattlersCount; bank++)
{
if (r8 != GetBattlerSide(bank))
{
@@ -15124,7 +15124,7 @@ static void atkDB_tryimprision(void)
}
}
}
if (bank == gNoOfAllBanks)
if (bank == gBattlersCount)
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
}
}
@@ -15401,7 +15401,7 @@ static void atkDF_trysetmagiccoat(void)
{
gBankTarget = gBankAttacker;
gSpecialStatuses[gBankAttacker].flag20 = 1;
if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) //last turn
if (gCurrentTurnActionNumber == gBattlersCount - 1) //last turn
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
else
{
@@ -15413,7 +15413,7 @@ static void atkDF_trysetmagiccoat(void)
static void atkE0_trysetsnatch(void)
{
gSpecialStatuses[gBankAttacker].flag20 = 1;
if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) //last turn
if (gCurrentTurnActionNumber == gBattlersCount - 1) //last turn
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
else
{
@@ -15433,7 +15433,7 @@ static void atkE1_trygetintimidatetarget(void)
gBattleTextBuff1[2] = gBattleMons[gBattleStruct->scriptingActive].ability;
gBattleTextBuff1[3] = 0xFF;
for (;gBankTarget < gNoOfAllBanks; gBankTarget++)
for (;gBankTarget < gBattlersCount; gBankTarget++)
{
if (GetBattlerSide(gBankTarget) == side)
continue;
@@ -15441,7 +15441,7 @@ static void atkE1_trygetintimidatetarget(void)
break;
}
if (gBankTarget >= gNoOfAllBanks)
if (gBankTarget >= gBattlersCount)
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
else
gBattlescriptCurrInstr += 5;
@@ -16061,5 +16061,5 @@ static void atkF6_finishaction(void)
static void atkF7_finishturn(void)
{
gCurrentActionFuncId = 0xC;
gCurrentTurnActionNumber = gNoOfAllBanks;
gCurrentTurnActionNumber = gBattlersCount;
}

18
src/battle/battle_7.c
View File

@@ -24,7 +24,7 @@
extern u8 gBattleBufferA[][0x200];
extern u8 gActiveBattler;
extern u8 gNoOfAllBanks;
extern u8 gBattlersCount;
extern u16 gBattlerPartyIndexes[];
extern u8 gBanksBySide[];
extern u8 gBankSpriteIds[];
@@ -96,7 +96,7 @@ extern void c3_0802FDF4(u8);
extern void sub_80440EC();
extern void sub_804777C();
extern void sub_8141828();
extern u8 GetBankPosition();
extern u8 GetBattlerSpriteCoord();
extern u8 IsBankSpritePresent(u8);
extern u8 sub_8077F68(u8);
extern u8 sub_8077F7C(u8);
@@ -558,7 +558,7 @@ u8 battle_load_something(u8 *pState, u8 *b)
else
gHealthboxIDs[*b] = battle_make_oam_normal_battle(*b);
(*b)++;
if (*b == gNoOfAllBanks)
if (*b == gBattlersCount)
{
*b = 0;
(*pState)++;
@@ -571,7 +571,7 @@ u8 battle_load_something(u8 *pState, u8 *b)
else
nullsub_11(gHealthboxIDs[*b], 1);
(*b)++;
if (*b == gNoOfAllBanks)
if (*b == gBattlersCount)
{
*b = 0;
(*pState)++;
@@ -589,7 +589,7 @@ u8 battle_load_something(u8 *pState, u8 *b)
}
sub_8043DB0(gHealthboxIDs[*b]);
(*b)++;
if (*b == gNoOfAllBanks)
if (*b == gBattlersCount)
{
*b = 0;
(*pState)++;
@@ -620,7 +620,7 @@ void sub_8031F24(void)
{
s32 i;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
ewram17800[i].invisible = gSprites[gBankSpriteIds[i]].invisible;
}
@@ -858,7 +858,7 @@ void sub_80326EC(u8 a)
{
s32 i;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (IsBankSpritePresent(i) != 0)
{
@@ -882,12 +882,12 @@ void sub_80327CC(void)
LoadCompressedObjectPic(&gUnknown_081FAF24);
r5 = GetBattlerAtPosition(1);
ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8);
ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBattlerSpriteCoord(r5, 0), GetBattlerSpriteCoord(r5, 1) + 32, 0xC8);
gSprites[ewram17810[r5].unk7].data[0] = r5;
if (IsDoubleBattle())
{
r5 = GetBattlerAtPosition(3);
ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8);
ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBattlerSpriteCoord(r5, 0), GetBattlerSpriteCoord(r5, 1) + 32, 0xC8);
gSprites[ewram17810[r5].unk7].data[0] = r5;
}
}

162
src/battle/battle_ai_switch_items.c
View File

@@ -27,7 +27,7 @@ extern u16 gBattlerPartyIndexes[];
extern u16 gLastLandedMoves[];
extern const u8 gTypeEffectiveness[];
extern struct BattlePokemon gBattleMons[];
extern u32 gStatuses3[BATTLE_BANKS_COUNT];
extern u32 gStatuses3[MAX_BATTLERS_COUNT];
/*static*/ bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng);
/*static*/ bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent);
@@ -51,7 +51,7 @@ extern u32 gStatuses3[BATTLE_BANKS_COUNT];
#ifdef NONMATCHING
/*static*/ bool8 ShouldSwitchIfWonderGuard(void)
{
u8 opposingBank;
u8 opposingBattler;
u8 moveFlags;
s32 i, j;
@@ -62,14 +62,14 @@ extern u32 gStatuses3[BATTLE_BANKS_COUNT];
return FALSE;
// check if pokemon has a super effective move
opposingBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
opposingBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
for (i = 0; i < 4; i++)
{
u16 move = gBattleMons[gActiveBattler].moves[i];
if (move == MOVE_NONE)
continue;
moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability);
if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE)
return FALSE;
}
@@ -86,14 +86,14 @@ extern u32 gStatuses3[BATTLE_BANKS_COUNT];
GetMonData(&gEnemyParty[i], MON_DATA_SPECIES); // unused return value
GetMonData(&gEnemyParty[i], MON_DATA_ALT_ABILITY); // unused return value
opposingBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
opposingBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
for (j = 0; j < 4; j++)
{
u16 move = GetMonData(&gEnemyParty[i], MON_DATA_MOVE1 + j);
if (move == MOVE_NONE)
continue;
moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability);
if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && (Random() % 3) < 2)
{
// we found a mon
@@ -308,7 +308,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
/*static*/ bool8 FindMonThatAbsorbsOpponentsMove(void)
{
u8 bankIn1, bankIn2;
u8 battlerIn1, battlerIn2;
u8 absorbingTypeAbility;
s32 i;
@@ -323,16 +323,16 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
bankIn1 = gActiveBattler;
battlerIn1 = gActiveBattler;
if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))])
bankIn2 = gActiveBattler;
battlerIn2 = gActiveBattler;
else
bankIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)));
battlerIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)));
}
else
{
bankIn1 = gActiveBattler;
bankIn2 = gActiveBattler;
battlerIn1 = gActiveBattler;
battlerIn2 = gActiveBattler;
}
if (gBattleMoves[gLastLandedMoves[gActiveBattler]].type == TYPE_FIRE)
@@ -358,13 +358,13 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
continue;
if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
continue;
if (i == gBattlerPartyIndexes[bankIn1])
if (i == gBattlerPartyIndexes[battlerIn1])
continue;
if (i == gBattlerPartyIndexes[bankIn2])
if (i == gBattlerPartyIndexes[battlerIn2])
continue;
if (i == ewram16068arr(bankIn1))
if (i == ewram16068arr(battlerIn1))
continue;
if (i == ewram16068arr(bankIn2))
if (i == ewram16068arr(battlerIn2))
continue;
species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES);
@@ -423,13 +423,13 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
/*static*/ bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng)
{
u8 opposingBank;
u8 opposingBattler;
s32 i;
u8 moveFlags;
u16 move;
opposingBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
if (!(gAbsentBattlerFlags & gBitTable[opposingBank]))
opposingBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
if (!(gAbsentBattlerFlags & gBitTable[opposingBattler]))
{
for (i = 0; i < 4; i++)
{
@@ -437,7 +437,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
if (move == MOVE_NONE)
continue;
moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability);
if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE)
{
if (noRng)
@@ -450,8 +450,8 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
return FALSE;
opposingBank = GetBattlerAtPosition(BATTLE_PARTNER(B_POSITION_PLAYER_LEFT));
if (!(gAbsentBattlerFlags & gBitTable[opposingBank]))
opposingBattler = GetBattlerAtPosition(BATTLE_PARTNER(B_POSITION_PLAYER_LEFT));
if (!(gAbsentBattlerFlags & gBitTable[opposingBattler]))
{
for (i = 0; i < 4; i++)
{
@@ -459,7 +459,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
if (move == MOVE_NONE)
continue;
moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability);
if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE)
{
if (noRng)
@@ -489,7 +489,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
/*static*/ bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
{
u8 bankIn1, bankIn2;
u8 battlerIn1, battlerIn2;
s32 i, j;
u16 move;
u8 moveFlags;
@@ -505,16 +505,16 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
bankIn1 = gActiveBattler;
battlerIn1 = gActiveBattler;
if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))])
bankIn2 = gActiveBattler;
battlerIn2 = gActiveBattler;
else
bankIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)));
battlerIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)));
}
else
{
bankIn1 = gActiveBattler;
bankIn2 = gActiveBattler;
battlerIn1 = gActiveBattler;
battlerIn2 = gActiveBattler;
}
for (i = 0; i < 6; i++)
@@ -528,13 +528,13 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
continue;
if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
continue;
if (i == gBattlerPartyIndexes[bankIn1])
if (i == gBattlerPartyIndexes[battlerIn1])
continue;
if (i == gBattlerPartyIndexes[bankIn2])
if (i == gBattlerPartyIndexes[battlerIn2])
continue;
if (i == ewram16068arr(bankIn1))
if (i == ewram16068arr(battlerIn1))
continue;
if (i == ewram16068arr(bankIn2))
if (i == ewram16068arr(battlerIn2))
continue;
species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES);
@@ -546,7 +546,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
moveFlags = AI_TypeCalc(gLastLandedMoves[gActiveBattler], species, monAbility);
if (moveFlags & flags)
{
bankIn1 = gLastHitBy[gActiveBattler];
battlerIn1 = gLastHitBy[gActiveBattler];
for (j = 0; j < 4; j++)
{
@@ -554,7 +554,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
if (move == 0)
continue;
moveFlags = AI_TypeCalc(move, gBattleMons[bankIn1].species, gBattleMons[bankIn1].ability);
moveFlags = AI_TypeCalc(move, gBattleMons[battlerIn1].species, gBattleMons[battlerIn1].ability);
if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % moduloPercent == 0)
{
ewram160C8arr(GetBattlerPosition(gActiveBattler)) = i;
@@ -570,7 +570,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
/*static*/ bool8 ShouldSwitch(void)
{
u8 bankIn1, bankIn2;
u8 battlerIn1, battlerIn2;
s32 i;
s32 availableToSwitch;
@@ -593,16 +593,16 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
availableToSwitch = 0;
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
bankIn1 = gActiveBattler;
battlerIn1 = gActiveBattler;
if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)])
bankIn2 = gActiveBattler;
battlerIn2 = gActiveBattler;
else
bankIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK);
battlerIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK);
}
else
{
bankIn1 = gActiveBattler;
bankIn2 = gActiveBattler;
battlerIn1 = gActiveBattler;
battlerIn2 = gActiveBattler;
}
for (i = 0; i < 6; i++)
@@ -613,13 +613,13 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
continue;
if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
continue;
if (i == gBattlerPartyIndexes[bankIn1])
if (i == gBattlerPartyIndexes[battlerIn1])
continue;
if (i == gBattlerPartyIndexes[bankIn2])
if (i == gBattlerPartyIndexes[battlerIn2])
continue;
if (i == ewram16068arr(bankIn1))
if (i == ewram16068arr(battlerIn1))
continue;
if (i == ewram16068arr(bankIn2))
if (i == ewram16068arr(battlerIn2))
continue;
availableToSwitch++;
@@ -648,7 +648,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
void AI_TrySwitchOrUseItem(void)
{
u8 bankIn1, bankIn2;
u8 battlerIn1, battlerIn2;
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{
@@ -661,26 +661,26 @@ void AI_TrySwitchOrUseItem(void)
{
if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
{
bankIn1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
bankIn2 = bankIn1;
battlerIn1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
battlerIn2 = battlerIn1;
}
else
{
bankIn1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
bankIn2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
battlerIn1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
battlerIn2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
}
for (monToSwitchId = 0; monToSwitchId < 6; monToSwitchId++)
{
if (GetMonData(&gEnemyParty[monToSwitchId], MON_DATA_HP) == 0)
continue;
if (monToSwitchId == gBattlerPartyIndexes[bankIn1])
if (monToSwitchId == gBattlerPartyIndexes[battlerIn1])
continue;
if (monToSwitchId == gBattlerPartyIndexes[bankIn2])
if (monToSwitchId == gBattlerPartyIndexes[battlerIn2])
continue;
if (monToSwitchId == ewram16068arr(bankIn1))
if (monToSwitchId == ewram16068arr(battlerIn1))
continue;
if (monToSwitchId == ewram16068arr(bankIn2))
if (monToSwitchId == ewram16068arr(battlerIn2))
continue;
break;
@@ -734,32 +734,32 @@ void AI_TrySwitchOrUseItem(void)
u8 GetMostSuitableMonToSwitchInto(void)
{
u8 opposingBank;
u8 opposingBattler;
u8 bestDmg; // note : should be changed to s32
u8 bestMonId;
u8 bankIn1, bankIn2;
u8 battlerIn1, battlerIn2;
s32 i, j;
u8 invalidMons;
u16 move;
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
bankIn1 = gActiveBattler;
battlerIn1 = gActiveBattler;
if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)])
bankIn2 = gActiveBattler;
battlerIn2 = gActiveBattler;
else
bankIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK);
battlerIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK);
// UB: It considers the opponent only player's side even though it can battle alongside player;
opposingBank = Random() & BIT_FLANK;
if (gAbsentBattlerFlags & gBitTable[opposingBank])
opposingBank ^= BIT_FLANK;
opposingBattler = Random() & BIT_FLANK;
if (gAbsentBattlerFlags & gBitTable[opposingBattler])
opposingBattler ^= BIT_FLANK;
}
else
{
opposingBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
bankIn1 = gActiveBattler;
bankIn2 = gActiveBattler;
opposingBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
battlerIn1 = gActiveBattler;
battlerIn2 = gActiveBattler;
}
invalidMons = 0;
@@ -775,16 +775,16 @@ u8 GetMostSuitableMonToSwitchInto(void)
if (species != SPECIES_NONE
&& GetMonData(&gEnemyParty[i], MON_DATA_HP) != 0
&& !(gBitTable[i] & invalidMons)
&& gBattlerPartyIndexes[bankIn1] != i
&& gBattlerPartyIndexes[bankIn2] != i
&& i != ewram16068arr(bankIn1)
&& i != ewram16068arr(bankIn2))
&& gBattlerPartyIndexes[battlerIn1] != i
&& gBattlerPartyIndexes[battlerIn2] != i
&& i != ewram16068arr(battlerIn1)
&& i != ewram16068arr(battlerIn2))
{
u8 type1 = gBaseStats[species].type1;
u8 type2 = gBaseStats[species].type2;
u8 typeDmg = 10;
ModulateByTypeEffectiveness(gBattleMons[opposingBank].type1, type1, type2, &typeDmg);
ModulateByTypeEffectiveness(gBattleMons[opposingBank].type2, type1, type2, &typeDmg);
ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type1, type1, type2, &typeDmg);
ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type2, type1, type2, &typeDmg);
if (bestDmg < typeDmg)
{
bestDmg = typeDmg;
@@ -803,7 +803,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
for (i = 0; i < 4; i++)
{
move = GetMonData(&gEnemyParty[bestMonId], MON_DATA_MOVE1 + i);
if (move != MOVE_NONE && TypeCalc(move, gActiveBattler, opposingBank) & MOVE_RESULT_SUPER_EFFECTIVE)
if (move != MOVE_NONE && TypeCalc(move, gActiveBattler, opposingBattler) & MOVE_RESULT_SUPER_EFFECTIVE)
break;
}
@@ -833,13 +833,13 @@ u8 GetMostSuitableMonToSwitchInto(void)
continue;
if (GetMonData(&gEnemyParty[i], MON_DATA_HP) == 0)
continue;
if (gBattlerPartyIndexes[bankIn1] == i)
if (gBattlerPartyIndexes[battlerIn1] == i)
continue;
if (gBattlerPartyIndexes[bankIn2] == i)
if (gBattlerPartyIndexes[battlerIn2] == i)
continue;
if (i == ewram16068arr(bankIn1))
if (i == ewram16068arr(battlerIn1))
continue;
if (i == ewram16068arr(bankIn2))
if (i == ewram16068arr(battlerIn2))
continue;
for (j = 0; j < 4; j++)
@@ -848,8 +848,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
gBattleMoveDamage = 0;
if (move != MOVE_NONE && gBattleMoves[move].power != 1)
{
AI_CalcDmg(gActiveBattler, opposingBank);
TypeCalc(move, gActiveBattler, opposingBank);
AI_CalcDmg(gActiveBattler, opposingBattler);
TypeCalc(move, gActiveBattler, opposingBattler);
}
if (bestDmg < gBattleMoveDamage)
{
@@ -900,7 +900,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
u16 item;
const u8 *itemEffects;
u8 paramOffset;
u8 bankSide;
u8 battlerSide;
if (i != 0 && validMons > (AI_BATTLE_HISTORY->numItems - i) + 1)
continue;
@@ -987,8 +987,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
shouldUse = TRUE;
break;
case AI_ITEM_GUARD_SPECS:
bankSide = GetBattlerSide(gActiveBattler);
if (gDisableStructs[gActiveBattler].isFirstTurn != 0 && gSideTimers[bankSide].mistTimer == 0)
battlerSide = GetBattlerSide(gActiveBattler);
if (gDisableStructs[gActiveBattler].isFirstTurn != 0 && gSideTimers[battlerSide].mistTimer == 0)
shouldUse = TRUE;
break;
case AI_ITEM_NOT_RECOGNIZABLE:

14
src/battle/battle_anim.c
View File

@@ -1679,7 +1679,7 @@ static void ScriptCmd_createsprite(void)
if (subpriority < 3)
subpriority = 3;
CreateSpriteAndAnimate(template, GetBankPosition(gAnimBankTarget, 2), GetBankPosition(gAnimBankTarget, 3), subpriority);
CreateSpriteAndAnimate(template, GetBattlerSpriteCoord(gAnimBankTarget, 2), GetBattlerSpriteCoord(gAnimBankTarget, 3), subpriority);
gAnimVisualTaskCount++;
}
@@ -3097,7 +3097,7 @@ static void ScriptCmd_invisible(void)
{
u8 spriteId;
spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
spriteId = GetAnimBattlerSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
if (spriteId != 0xFF)
gSprites[spriteId].invisible = TRUE;
@@ -3108,7 +3108,7 @@ static void ScriptCmd_visible(void)
{
u8 spriteId;
spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
spriteId = GetAnimBattlerSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
if (spriteId != 0xFF)
gSprites[spriteId].invisible = FALSE;
@@ -3129,12 +3129,12 @@ static void ScriptCmd_doublebattle_2D(void)
if (wantedBank == 0)
{
r4 = GetBattlerPosition_permutated(gAnimBankAttacker);
spriteId = GetAnimBankSpriteId(0);
spriteId = GetAnimBattlerSpriteId(0);
}
else
{
r4 = GetBattlerPosition_permutated(gAnimBankTarget);
spriteId = GetAnimBankSpriteId(1);
spriteId = GetAnimBattlerSpriteId(1);
}
if (spriteId != 0xFF)
{
@@ -3163,12 +3163,12 @@ static void ScriptCmd_doublebattle_2E(void)
if (wantedBank == 0)
{
r4 = GetBattlerPosition_permutated(gAnimBankAttacker);
spriteId = GetAnimBankSpriteId(0);
spriteId = GetAnimBattlerSpriteId(0);
}
else
{
r4 = GetBattlerPosition_permutated(gAnimBankTarget);
spriteId = GetAnimBankSpriteId(1);
spriteId = GetAnimBattlerSpriteId(1);
}
if (spriteId != 0xFF && r4 == 2)
{

6
src/battle/battle_anim_807B69C.c
View File

@@ -22,7 +22,7 @@ extern const u8 *const gBattleAnims_StatusConditions[];
extern const struct OamData gOamData_837E05C;
extern const struct OamData gOamData_837DF24;
extern u8 GetBankPosition(u8, u8);
extern u8 GetBattlerSpriteCoord(u8, u8);
extern void sub_80E32E0(u8);
@@ -180,8 +180,8 @@ static void sub_807B8A4(struct Sprite *sprite)
void sub_807B920(u8 taskId)
{
s16 x = GetBankPosition(gAnimBankTarget, 2) - 32;
s16 y = GetBankPosition(gAnimBankTarget, 3) - 36;
s16 x = GetBattlerSpriteCoord(gAnimBankTarget, 2) - 32;
s16 y = GetBattlerSpriteCoord(gAnimBankTarget, 3) - 36;
u8 spriteId;
if (IsContest())

26
src/battle/battle_anim_80A7E7C.c
View File

@@ -102,7 +102,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83C2010 =
void AnimTask_ShakeMon(u8 taskId)
{
u8 spriteId;
spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
if (spriteId == 0xff)
{
DestroyAnimVisualTask(taskId);
@@ -170,7 +170,7 @@ void AnimTask_ShakeMon2(u8 taskId)
destroy = FALSE;
if (gBattleAnimArgs[0] < 4)
{
sprite = GetAnimBankSpriteId(gBattleAnimArgs[0]);
sprite = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
if (sprite == 0xff)
{
DestroyAnimVisualTask(taskId);
@@ -263,7 +263,7 @@ static void AnimTask_ShakeMon2Step(u8 taskId)
// arg 4: delay
void AnimTask_ShakeMonInPlace(u8 taskId)
{
u8 spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
if (spriteId == 0xff)
{
DestroyAnimVisualTask(taskId);
@@ -328,7 +328,7 @@ static void AnimTask_ShakeMonInPlaceStep(u8 taskId)
// arg 4: duration
void AnimTask_ShakeAndSinkMon(u8 taskId)
{
u8 sprite = GetAnimBankSpriteId(gBattleAnimArgs[0]);
u8 sprite = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
gSprites[sprite].pos2.x = gBattleAnimArgs[1];
TASK.data[0] = sprite;
TASK.data[1] = gBattleAnimArgs[1];
@@ -378,7 +378,7 @@ void AnimTask_TranslateMonElliptical(u8 taskId)
u8 wavePeriod;
wavePeriod = 1;
spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
if (gBattleAnimArgs[4] > 5)
gBattleAnimArgs[4] = 5;
@@ -470,7 +470,7 @@ static void DoVerticalDip(struct Sprite *sprite)
{
u8 spriteId;
sprite->invisible = TRUE;
spriteId = GetAnimBankSpriteId(gBattleAnimArgs[2]);
spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]);
sprite->data[0] = gBattleAnimArgs[0];
sprite->data[1] = 0;
sprite->data[2] = gBattleAnimArgs[1];
@@ -664,7 +664,7 @@ void AnimTask_WindUpLunge(u8 taskId)
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
gBattleAnimArgs[5] = -gBattleAnimArgs[5];
}
TASK.data[0] = GetAnimBankSpriteId(gBattleAnimArgs[0]);
TASK.data[0] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
TASK.data[1] = (gBattleAnimArgs[1] << 8) / gBattleAnimArgs[3];
TASK.data[2] = gBattleAnimArgs[2];
TASK.data[3] = gBattleAnimArgs[3];
@@ -718,7 +718,7 @@ void sub_80A8A80(u8 taskId)
{
case 0:
case 1:
spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
break;
case 2:
if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
@@ -777,7 +777,7 @@ void AnimTask_SwayMon(u8 taskId)
if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
spriteId = GetAnimBankSpriteId(gBattleAnimArgs[4]);
spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[4]);
TASK.data[0] = gBattleAnimArgs[0];
TASK.data[1] = gBattleAnimArgs[1];
TASK.data[2] = gBattleAnimArgs[2];
@@ -846,7 +846,7 @@ static void AnimTask_SwayMonStep(u8 taskId)
void AnimTask_ScaleMonAndRestore(u8 taskId)
{
u8 spriteId;
spriteId = GetAnimBankSpriteId(gBattleAnimArgs[3]);
spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[3]);
sub_8078E70(spriteId, gBattleAnimArgs[4]);
TASK.data[0] = gBattleAnimArgs[0];
TASK.data[1] = gBattleAnimArgs[1];
@@ -886,7 +886,7 @@ static void AnimTask_ScaleMonAndRestoreStep(u8 taskId)
void sub_80A8E04(u8 taskId)
{
u8 spriteId;
spriteId = GetAnimBankSpriteId(gBattleAnimArgs[2]);
spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]);
sub_8078E70(spriteId, 0);
TASK.data[1] = 0;
TASK.data[2] = gBattleAnimArgs[0];
@@ -930,7 +930,7 @@ void sub_80A8E04(u8 taskId)
void sub_80A8EFC(u8 taskId)
{
u8 spriteId;
spriteId = GetAnimBankSpriteId(gBattleAnimArgs[2]);
spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]);
sub_8078E70(spriteId, 0);
TASK.data[1] = 0;
TASK.data[2] = gBattleAnimArgs[0];
@@ -1023,7 +1023,7 @@ void sub_80A9058(u8 taskId)
TASK.data[12] = 0;
TASK.data[10] = gBattleAnimArgs[3];
TASK.data[11] = gBattleAnimArgs[4];
TASK.data[7] = GetAnimBankSpriteId(1);
TASK.data[7] = GetAnimBattlerSpriteId(1);
TASK.data[8] = gSprites[TASK.data[7]].pos2.x;
TASK.data[9] = gSprites[TASK.data[7]].pos2.y;
TASK.data[0] = 0;

4
src/battle/battle_controller_linkopponent.c
View File

@@ -1157,7 +1157,7 @@ void LinkOpponentHandleLoadPokeSprite(void)
GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(gActiveBattler));
gBankSpriteIds[gActiveBattler] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(gActiveBattler, 2),
GetBattlerSpriteCoord(gActiveBattler, 2),
sub_8077F68(gActiveBattler),
sub_8079E90(gActiveBattler));
gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
@@ -1187,7 +1187,7 @@ void sub_8039430(u8 a, u8 b)
GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(a));
gBankSpriteIds[a] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(a, 2),
GetBattlerSpriteCoord(a, 2),
sub_8077F68(a),
sub_8079E90(a));
gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a];

6
src/battle/battle_controller_linkpartner.c
View File

@@ -85,7 +85,7 @@ extern u8 sub_8046400();
extern void sub_80312F0(struct Sprite *);
extern u8 CreateInvisibleSpriteWithCallback();
extern void BattleLoadPlayerMonSprite();
extern u8 GetBankPosition();
extern u8 GetBattlerSpriteCoord();
extern u8 sub_8077F68();
extern u8 sub_8079E90();
extern void nullsub_10();
@@ -1106,7 +1106,7 @@ void LinkPartnerHandleLoadPokeSprite(void)
GetBattlerPosition(gActiveBattler));
gBankSpriteIds[gActiveBattler] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(gActiveBattler, 2),
GetBattlerSpriteCoord(gActiveBattler, 2),
sub_8077F68(gActiveBattler),
sub_8079E90(gActiveBattler));
gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
@@ -1136,7 +1136,7 @@ void sub_811F864(u8 a, u8 b)
GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(a));
gBankSpriteIds[a] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(a, 2),
GetBattlerSpriteCoord(a, 2),
sub_8077F68(a),
sub_8079E90(a));
gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a];

6
src/battle/battle_controller_opponent.c
View File

@@ -66,7 +66,7 @@ extern struct MusicPlayerInfo gMPlay_SE2;
extern struct MusicPlayerInfo gMPlay_BGM;
extern u32 gBattleExecBuffer;
extern u8 GetBankPosition();
extern u8 GetBattlerSpriteCoord();
extern u8 sub_8077F68();
extern u8 sub_8079E90();
extern void sub_8033018(void);
@@ -1128,7 +1128,7 @@ void OpponentHandleLoadPokeSprite(void)
GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(gActiveBattler));
gBankSpriteIds[gActiveBattler] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(gActiveBattler, 2),
GetBattlerSpriteCoord(gActiveBattler, 2),
sub_8077F68(gActiveBattler),
sub_8079E90(gActiveBattler));
gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
@@ -1160,7 +1160,7 @@ void sub_803495C(u8 a, u8 b)
GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(a));
gBankSpriteIds[a] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(a, 2),
GetBattlerSpriteCoord(a, 2),
sub_8077F68(a),
sub_8079E90(a));
gSprites[gBankSpriteIds[a]].data[0] = a;

14
src/battle/battle_controller_player.c
View File

@@ -133,7 +133,7 @@ extern void sub_802D204(void);
extern u8 sub_8079E90();
extern void sub_802DEAC(void);
extern void sub_80312F0(struct Sprite *);
extern u8 GetBankPosition();
extern u8 GetBattlerSpriteCoord();
extern u8 sub_8077F68();
extern u8 sub_8046400();
extern void sub_802D798(void);
@@ -149,7 +149,7 @@ extern u8 gActionSelectionCursor[];
extern u8 gMoveSelectionCursor[];
extern u8 gAbsentBattlerFlags;
extern u8 gUnknown_03004344;
extern u8 gNoOfAllBanks;
extern u8 gBattlersCount;
extern u16 gBattlerPartyIndexes[];
extern u16 gBattle_BG0_Y;
extern u16 gBattle_BG0_X;
@@ -486,14 +486,14 @@ void sub_802C2EC(void)
dp11b_obj_instanciate(gUnknown_03004344, 1, 15, 1);
i = 0;
if (gNoOfAllBanks != 0)
if (gBattlersCount != 0)
{
do
{
if (i != gUnknown_03004344)
dp11b_obj_free(i, 1);
i++;
} while (i < gNoOfAllBanks);
} while (i < gBattlersCount);
}
if (gMain.newKeys & A_BUTTON)
{
@@ -533,7 +533,7 @@ void sub_802C2EC(void)
if (i < 0)
i = 3;
gUnknown_03004344 = GetBattlerAtPosition(arr[i]);
} while(gUnknown_03004344 == gNoOfAllBanks);
} while(gUnknown_03004344 == gBattlersCount);
i = 0;
switch (GetBattlerPosition(gUnknown_03004344))
{
@@ -580,7 +580,7 @@ void sub_802C2EC(void)
if (i > 3)
i = 0;
gUnknown_03004344 = GetBattlerAtPosition(arr[i]);
} while (gUnknown_03004344 == gNoOfAllBanks);
} while (gUnknown_03004344 == gBattlersCount);
i = 0;
switch (GetBattlerPosition(gUnknown_03004344))
{
@@ -2525,7 +2525,7 @@ void sub_802F934(u8 bank, u8 b)
GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(bank));
gBankSpriteIds[bank] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(bank, 2),
GetBattlerSpriteCoord(bank, 2),
sub_8077F68(bank),
sub_8079E90(bank));
gSprites[gUnknown_0300434C[bank]].data[1] = gBankSpriteIds[bank];

4
src/battle/battle_controller_wally.c
View File

@@ -91,7 +91,7 @@ extern void StartTranslateAnimSpriteByDeltas(struct Sprite *);
extern void sub_8030E38(struct Sprite *);
extern void StoreSpriteCallbackInData();
extern u8 sub_8046400();
extern u8 GetBankPosition();
extern u8 GetBattlerSpriteCoord();
extern u8 sub_8077F68();
extern u8 sub_8079E90();
extern void sub_80312F0(struct Sprite *);
@@ -1510,7 +1510,7 @@ void sub_81398BC(u8 bank)
GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(bank));
gBankSpriteIds[bank] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(bank, 2),
GetBattlerSpriteCoord(bank, 2),
sub_8077F68(bank),
sub_8079E90(bank));
gSprites[gUnknown_0300434C[bank]].data[1] = gBankSpriteIds[bank];

6
src/battle/battle_interface.c
View File

@@ -423,7 +423,7 @@ u8 *const gUnknown_0820A904[10] =
};
extern u8 gDisplayedStringBattle[];
extern u8 gNoOfAllBanks;
extern u8 gBattlersCount;
extern u16 gBattlerPartyIndexes[];
extern u8 gBanksBySide[];
extern u8 gHealthboxIDs[];
@@ -951,7 +951,7 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority)
{
s32 i;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
u8 spriteId1;
u8 spriteId2;
@@ -1648,7 +1648,7 @@ void sub_804454C(void)
s32 i;
u8 spriteId;
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (gSprites[gHealthboxIDs[i]].callback == SpriteCallbackDummy
#if DEBUG

4
src/battle/battle_party_menu.c
View File

@@ -31,7 +31,7 @@ extern void nullsub_14();
extern u8 sub_803FBBC(void);
extern u8 gPlayerPartyCount;
extern u8 gNoOfAllBanks;
extern u8 gBattlersCount;
extern u16 gBattlerPartyIndexes[];
extern u8 gBankInMenu;
extern u8 gUnknown_0202E8F4;
@@ -662,7 +662,7 @@ static void Task_BattlePartyMenuShift(u8 taskId)
gTasks[taskId].func = Task_80954C0;
return;
}
for (i = 0; i < gNoOfAllBanks; i++)
for (i = 0; i < gBattlersCount; i++)
{
if (GetBattlerSide(i) == 0
&& sub_8094C20(partySelection) == gBattlerPartyIndexes[i])

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