summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-02-10 17:29:11 -0800
committerMarcus Huderle <huderlem@gmail.com>2018-02-10 17:29:11 -0800
commitc59acc702458caa610ce856ce20ac6dc12d16621 (patch)
tree04816e5a26540fd5cd99061d6911c6fc3360574c
parentaaf065aba01db7456ed9a8fd82ccb2961ea9d97a (diff)
Start documenting battle anims
Diffstat
-rw-r--r--asm/battle_anim_812C144.s32
-rw-r--r--asm/battle_anim_813F0F4.s68
-rw-r--r--asm/ghost.s4
-rw-r--r--asm/ground.s4
-rw-r--r--asm/normal.s36
-rw-r--r--data/battle_anim_80CA710.s10
-rw-r--r--data/battle_anim_scripts.s1465
-rw-r--r--include/battle_anim.h10
-rw-r--r--include/constants/battle_anim.h9
-rw-r--r--src/battle/anim/dark.c18
-rw-r--r--src/battle/anim/dragon.c2
-rw-r--r--src/battle/anim/fight.c6
-rw-r--r--src/battle/anim/lunge_1.c10
-rw-r--r--src/battle/anim/lunge_2.c4
-rw-r--r--src/battle/anim/powder.c17
-rw-r--r--src/battle/anim/psychic.c10
-rw-r--r--src/battle/anim/ring.c14
-rw-r--r--src/battle/anim/unused_4.c4
-rw-r--r--src/battle/anim/unused_7.c4
-rw-r--r--src/battle/anim/wisp_fire.c4
-rw-r--r--src/battle/anim/withdraw.c6
-rw-r--r--src/battle/battle_2.c4
-rw-r--r--src/battle/battle_7.c30
-rw-r--r--src/battle/battle_anim.c106
-rw-r--r--src/battle/battle_anim_807B69C.c4
-rw-r--r--src/battle/battle_anim_80A7E7C.c49
-rw-r--r--src/battle/battle_controller_linkopponent.c106
-rw-r--r--src/battle/battle_controller_linkpartner.c110
-rw-r--r--src/battle/battle_controller_opponent.c128
-rw-r--r--src/battle/battle_controller_player.c130
-rw-r--r--src/battle/battle_controller_safari.c14
-rw-r--r--src/battle/battle_controller_wally.c74
-rw-r--r--src/battle/pokeball.c38
-rw-r--r--src/battle/reshow_battle_screen.c44
-rw-r--r--src/contest.c14
-rw-r--r--src/rom_8077ABC.c5
-rw-r--r--sym_ewram.txt2
37 files changed, 1306 insertions, 1289 deletions
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s
index 03ffc0eda..2aa2f911b 100644
--- a/asm/battle_anim_812C144.s
+++ b/asm/battle_anim_812C144.s
@@ -3227,7 +3227,7 @@ _0812D9A2:
cmp r0, 0
beq _0812D9F0
ldr r3, _0812D9E4 @ =gSprites
- ldr r4, _0812D9E8 @ =gObjectBankIDs
+ ldr r4, _0812D9E8 @ =gBankSpriteIds
ldr r2, _0812D9D4 @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r4
@@ -3248,11 +3248,11 @@ _0812D9D8: .4byte 0x040000d4
_0812D9DC: .4byte 0x84000200
_0812D9E0: .4byte gSharedMem + 0x19348
_0812D9E4: .4byte gSprites
-_0812D9E8: .4byte gObjectBankIDs
+_0812D9E8: .4byte gBankSpriteIds
_0812D9EC: .4byte gSpriteAffineAnimTable_81E7C18
_0812D9F0:
ldr r3, _0812DA34 @ =gSprites
- ldr r4, _0812DA38 @ =gObjectBankIDs
+ ldr r4, _0812DA38 @ =gBankSpriteIds
ldr r2, _0812DA3C @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r4
@@ -3288,7 +3288,7 @@ _0812DA2A:
b _0812DAFA
.align 2, 0
_0812DA34: .4byte gSprites
-_0812DA38: .4byte gObjectBankIDs
+_0812DA38: .4byte gBankSpriteIds
_0812DA3C: .4byte gAnimBankAttacker
_0812DA40: .4byte gSpriteAffineAnimTable_81E7BEC
_0812DA44: .4byte gTasks
@@ -3401,7 +3401,7 @@ c3_80DFBE4: @ 812DB18
lsrs r0, 24
ldr r4, _0812DB48 @ =gBattleAnimArgs
ldr r3, _0812DB4C @ =gSprites
- ldr r2, _0812DB50 @ =gObjectBankIDs
+ ldr r2, _0812DB50 @ =gBankSpriteIds
ldr r1, _0812DB54 @ =gAnimBankAttacker
ldrb r1, [r1]
adds r1, r2
@@ -3422,7 +3422,7 @@ c3_80DFBE4: @ 812DB18
.align 2, 0
_0812DB48: .4byte gBattleAnimArgs
_0812DB4C: .4byte gSprites
-_0812DB50: .4byte gObjectBankIDs
+_0812DB50: .4byte gBankSpriteIds
_0812DB54: .4byte gAnimBankAttacker
thumb_func_end c3_80DFBE4
@@ -7672,7 +7672,7 @@ sub_812FC68: @ 812FC68
lsls r0, 3
mov r1, r8
adds r4, r0, r1
- ldr r1, _0812FCCC @ =gObjectBankIDs
+ ldr r1, _0812FCCC @ =gBankSpriteIds
ldr r2, _0812FCD0 @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r1
@@ -7709,7 +7709,7 @@ _0812FCAC:
b _0812FD4C
.align 2, 0
_0812FCC8: .4byte gTasks
-_0812FCCC: .4byte gObjectBankIDs
+_0812FCCC: .4byte gBankSpriteIds
_0812FCD0: .4byte gAnimBankAttacker
_0812FCD4: .4byte gBattleAnimArgs
_0812FCD8: .4byte 0xffff8000
@@ -10694,7 +10694,7 @@ _08131384:
cmp r0, 0
beq _081313C6
ldr r3, _081313F8 @ =gSprites
- ldr r2, _081313FC @ =gObjectBankIDs
+ ldr r2, _081313FC @ =gBankSpriteIds
ldrb r0, [r4]
adds r0, r2
ldrb r1, [r0]
@@ -10744,7 +10744,7 @@ _081313E8:
.align 2, 0
_081313F4: .4byte gAnimBankAttacker
_081313F8: .4byte gSprites
-_081313FC: .4byte gObjectBankIDs
+_081313FC: .4byte gBankSpriteIds
_08131400: .4byte gSpriteAffineAnimTable_81E7C18
_08131404: .4byte sub_8131408
thumb_func_end sub_81312E4
@@ -12326,7 +12326,7 @@ _08132084: .4byte gAnimBankAttacker
_08132088: .4byte gAnimBankTarget
_0813208C: .4byte gTasks
_08132090:
- ldr r1, _081320CC @ =gObjectBankIDs
+ ldr r1, _081320CC @ =gBankSpriteIds
ldr r0, _081320D0 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -12357,7 +12357,7 @@ _08132090:
ldrsh r1, [r2, r3]
b _0813215E
.align 2, 0
-_081320CC: .4byte gObjectBankIDs
+_081320CC: .4byte gBankSpriteIds
_081320D0: .4byte gAnimBankAttacker
_081320D4: .4byte gSprites
_081320D8:
@@ -12385,7 +12385,7 @@ _081320EC:
strh r1, [r0, 0x26]
b _08132188
_08132104:
- ldr r1, _08132144 @ =gObjectBankIDs
+ ldr r1, _08132144 @ =gBankSpriteIds
ldr r0, _08132148 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -12418,7 +12418,7 @@ _08132104:
bgt _08132188
b _08132162
.align 2, 0
-_08132144: .4byte gObjectBankIDs
+_08132144: .4byte gBankSpriteIds
_08132148: .4byte gAnimBankAttacker
_0813214C: .4byte gSprites
_08132150:
@@ -12438,7 +12438,7 @@ _08132162:
strh r0, [r2, 0x26]
b _08132188
_0813216A:
- ldr r1, _08132190 @ =gObjectBankIDs
+ ldr r1, _08132190 @ =gBankSpriteIds
ldr r0, _08132194 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -12457,7 +12457,7 @@ _08132188:
pop {r0}
bx r0
.align 2, 0
-_08132190: .4byte gObjectBankIDs
+_08132190: .4byte gBankSpriteIds
_08132194: .4byte gAnimBankAttacker
_08132198: .4byte gSprites
thumb_func_end sub_8131FFC
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s
index ccb4854af..578704b60 100644
--- a/asm/battle_anim_813F0F4.s
+++ b/asm/battle_anim_813F0F4.s
@@ -818,7 +818,7 @@ sub_813F798: @ 813F798
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
- ldr r1, _0813F7C4 @ =gObjectBankIDs
+ ldr r1, _0813F7C4 @ =gBankSpriteIds
ldr r0, _0813F7C8 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -838,7 +838,7 @@ sub_813F798: @ 813F798
beq _0813F7D6
b _0813F838
.align 2, 0
-_0813F7C4: .4byte gObjectBankIDs
+_0813F7C4: .4byte gBankSpriteIds
_0813F7C8: .4byte gAnimBankAttacker
_0813F7CC: .4byte gTasks
_0813F7D0:
@@ -909,7 +909,7 @@ sub_813F844: @ 813F844
sub sp, 0xC
lsls r0, 24
lsrs r5, r0, 24
- ldr r1, _0813F87C @ =gObjectBankIDs
+ ldr r1, _0813F87C @ =gBankSpriteIds
ldr r4, _0813F880 @ =gAnimBankAttacker
ldrb r0, [r4]
adds r1, r0, r1
@@ -929,7 +929,7 @@ sub_813F844: @ 813F844
ldr r1, _0813F888 @ =gPlayerParty
b _0813F89C
.align 2, 0
-_0813F87C: .4byte gObjectBankIDs
+_0813F87C: .4byte gBankSpriteIds
_0813F880: .4byte gAnimBankAttacker
_0813F884: .4byte gBattlePartyID
_0813F888: .4byte gPlayerParty
@@ -1256,7 +1256,7 @@ sub_813FA94: @ 813FA94
ldr r0, _0813FB68 @ =sub_813FD90
str r0, [r4]
ldr r3, _0813FB6C @ =gSharedMem + 0x17840
- ldr r1, _0813FB70 @ =gObjectBankIDs
+ ldr r1, _0813FB70 @ =gBankSpriteIds
mov r2, r8
ldrb r0, [r2]
adds r0, r1
@@ -1299,7 +1299,7 @@ _0813FB60: .4byte gSprites
_0813FB64: .4byte gAnimBankTarget
_0813FB68: .4byte sub_813FD90
_0813FB6C: .4byte gSharedMem + 0x17840
-_0813FB70: .4byte gObjectBankIDs
+_0813FB70: .4byte gBankSpriteIds
_0813FB74: .4byte gTasks
_0813FB78: .4byte sub_813FB7C
thumb_func_end sub_813FA94
@@ -1419,7 +1419,7 @@ _0813FBE0:
str r0, [r4]
movs r0, 0
bl GetBankByIdentity
- ldr r1, _0813FCB0 @ =gObjectBankIDs
+ ldr r1, _0813FCB0 @ =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1450,7 +1450,7 @@ _0813FCA0: .4byte gBallSpriteTemplates
_0813FCA4: .4byte gSprites
_0813FCA8: .4byte gAnimBankTarget
_0813FCAC: .4byte SpriteCallbackDummy
-_0813FCB0: .4byte gObjectBankIDs
+_0813FCB0: .4byte gBankSpriteIds
_0813FCB4: .4byte gTasks
_0813FCB8: .4byte sub_813FCBC
thumb_func_end sub_813FBB8
@@ -1463,7 +1463,7 @@ sub_813FCBC: @ 813FCBC
ldr r6, _0813FD1C @ =gSprites
movs r0, 0
bl GetBankByIdentity
- ldr r1, _0813FD20 @ =gObjectBankIDs
+ ldr r1, _0813FD20 @ =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1505,7 +1505,7 @@ _0813FD16:
bx r0
.align 2, 0
_0813FD1C: .4byte gSprites
-_0813FD20: .4byte gObjectBankIDs
+_0813FD20: .4byte gBankSpriteIds
_0813FD24: .4byte gTasks
_0813FD28: .4byte sub_813FD90
_0813FD2C: .4byte sub_813FD34
@@ -1520,7 +1520,7 @@ sub_813FD34: @ 813FD34
ldr r6, _0813FD88 @ =gSprites
movs r0, 0
bl GetBankByIdentity
- ldr r4, _0813FD8C @ =gObjectBankIDs
+ ldr r4, _0813FD8C @ =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -1554,7 +1554,7 @@ _0813FD80:
bx r0
.align 2, 0
_0813FD88: .4byte gSprites
-_0813FD8C: .4byte gObjectBankIDs
+_0813FD8C: .4byte gBankSpriteIds
thumb_func_end sub_813FD34
thumb_func_start sub_813FD90
@@ -1688,7 +1688,7 @@ sub_813FE70: @ 813FE70
ldr r0, _0813FEB8 @ =sub_813FEC8
str r0, [r4, 0x1C]
ldr r2, _0813FEBC @ =gSprites
- ldr r1, _0813FEC0 @ =gObjectBankIDs
+ ldr r1, _0813FEC0 @ =gBankSpriteIds
ldr r0, _0813FEC4 @ =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
@@ -1707,7 +1707,7 @@ _0813FEAC:
_0813FEB4: .4byte TaskDummy
_0813FEB8: .4byte sub_813FEC8
_0813FEBC: .4byte gSprites
-_0813FEC0: .4byte gObjectBankIDs
+_0813FEC0: .4byte gBankSpriteIds
_0813FEC4: .4byte gAnimBankTarget
thumb_func_end sub_813FE70
@@ -1715,7 +1715,7 @@ _0813FEC4: .4byte gAnimBankTarget
sub_813FEC8: @ 813FEC8
push {r4-r7,lr}
adds r7, r0, 0
- ldr r1, _0813FF0C @ =gObjectBankIDs
+ ldr r1, _0813FF0C @ =gBankSpriteIds
ldr r0, _0813FF10 @ =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
@@ -1748,7 +1748,7 @@ _0813FEFA:
beq _0813FF1E
b _0813FFDC
.align 2, 0
-_0813FF0C: .4byte gObjectBankIDs
+_0813FF0C: .4byte gBankSpriteIds
_0813FF10: .4byte gAnimBankTarget
_0813FF14: .4byte gTasks
_0813FF18:
@@ -2478,7 +2478,7 @@ _08140490:
cmp r1, r0
bne _081404CC
ldr r5, _081404D8 @ =gSprites
- ldr r4, _081404DC @ =gObjectBankIDs
+ ldr r4, _081404DC @ =gBankSpriteIds
ldrb r0, [r7]
adds r0, r4
ldrb r1, [r0]
@@ -2509,7 +2509,7 @@ _081404CC:
.align 2, 0
_081404D4: .4byte 0x0000013b
_081404D8: .4byte gSprites
-_081404DC: .4byte gObjectBankIDs
+_081404DC: .4byte gBankSpriteIds
_081404E0: .4byte sub_81404E4
thumb_func_end sub_8140454
@@ -2697,7 +2697,7 @@ sub_81405F4: @ 81405F4
bl sub_8141314
_08140646:
ldr r6, _081406B4 @ =gSprites
- ldr r5, _081406B8 @ =gObjectBankIDs
+ ldr r5, _081406B8 @ =gBankSpriteIds
ldr r4, _081406B0 @ =gAnimBankTarget
ldrb r0, [r4]
adds r0, r5
@@ -2748,7 +2748,7 @@ _081406A8: .4byte sub_81406BC
_081406AC: .4byte gLastUsedItem
_081406B0: .4byte gAnimBankTarget
_081406B4: .4byte gSprites
-_081406B8: .4byte gObjectBankIDs
+_081406B8: .4byte gBankSpriteIds
thumb_func_end sub_81405F4
thumb_func_start sub_81406BC
@@ -2770,7 +2770,7 @@ sub_81406BC: @ 81406BC
strb r0, [r2]
_081406DA:
ldr r4, _08140708 @ =gSprites
- ldr r3, _0814070C @ =gObjectBankIDs
+ ldr r3, _0814070C @ =gBankSpriteIds
ldr r2, _08140710 @ =gAnimBankTarget
ldrb r0, [r2]
adds r0, r3
@@ -2792,7 +2792,7 @@ _081406DA:
b _08140734
.align 2, 0
_08140708: .4byte gSprites
-_0814070C: .4byte gObjectBankIDs
+_0814070C: .4byte gBankSpriteIds
_08140710: .4byte gAnimBankTarget
_08140714:
ldr r6, _0814079C @ =0xfffffee0
@@ -2822,7 +2822,7 @@ _08140734:
cmp r5, 0
beq _08140796
ldr r4, _081407A0 @ =gSprites
- ldr r3, _081407A4 @ =gObjectBankIDs
+ ldr r3, _081407A4 @ =gBankSpriteIds
ldr r2, _081407A8 @ =gAnimBankTarget
ldrb r0, [r2]
adds r0, r3
@@ -2867,7 +2867,7 @@ _08140796:
.align 2, 0
_0814079C: .4byte 0xfffffee0
_081407A0: .4byte gSprites
-_081407A4: .4byte gObjectBankIDs
+_081407A4: .4byte gBankSpriteIds
_081407A8: .4byte gAnimBankTarget
_081407AC: .4byte gSharedMem + 0x17840
_081407B0: .4byte sub_81405C8
@@ -4581,7 +4581,7 @@ sub_814151C: @ 814151C
lsrs r7, r0, 24
movs r0, 0
mov r8, r0
- ldr r0, _08141550 @ =gObjectBankIDs
+ ldr r0, _08141550 @ =gBankSpriteIds
ldr r3, _08141554 @ =gAnimBankAttacker
ldrb r2, [r3]
adds r0, r2, r0
@@ -4601,7 +4601,7 @@ sub_814151C: @ 814151C
beq _08141562
b _081416B6
.align 2, 0
-_08141550: .4byte gObjectBankIDs
+_08141550: .4byte gBankSpriteIds
_08141554: .4byte gAnimBankAttacker
_08141558: .4byte gTasks
_0814155C:
@@ -4882,7 +4882,7 @@ _08141744:
.align 2, 0
_08141778: .4byte REG_BLDALPHA
_0814177C:
- ldr r1, _081417C0 @ =gObjectBankIDs
+ ldr r1, _081417C0 @ =gBankSpriteIds
ldr r3, _081417C4 @ =gAnimBankAttacker
ldrb r0, [r3]
adds r0, r1
@@ -4916,7 +4916,7 @@ _081417B8:
pop {r0}
bx r0
.align 2, 0
-_081417C0: .4byte gObjectBankIDs
+_081417C0: .4byte gBankSpriteIds
_081417C4: .4byte gAnimBankAttacker
_081417C8: .4byte gSprites
_081417CC: .4byte 0x06010000
@@ -5509,7 +5509,7 @@ sub_8141C30: @ 8141C30
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80786EC
- ldr r1, _08141CAC @ =gObjectBankIDs
+ ldr r1, _08141CAC @ =gBankSpriteIds
ldr r0, _08141CB0 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -5529,7 +5529,7 @@ sub_8141C30: @ 8141C30
.align 2, 0
_08141CA4: .4byte gBattleAnimArgs
_08141CA8: .4byte 0x0000ffe0
-_08141CAC: .4byte gObjectBankIDs
+_08141CAC: .4byte gBankSpriteIds
_08141CB0: .4byte gAnimBankAttacker
_08141CB4: .4byte gSprites
_08141CB8: .4byte sub_8141CBC
@@ -5540,7 +5540,7 @@ sub_8141CBC: @ 8141CBC
push {lr}
adds r3, r0, 0
ldr r2, _08141CE4 @ =gSprites
- ldr r1, _08141CE8 @ =gObjectBankIDs
+ ldr r1, _08141CE8 @ =gBankSpriteIds
ldr r0, _08141CEC @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -5560,7 +5560,7 @@ _08141CE0:
bx r0
.align 2, 0
_08141CE4: .4byte gSprites
-_08141CE8: .4byte gObjectBankIDs
+_08141CE8: .4byte gBankSpriteIds
_08141CEC: .4byte gAnimBankAttacker
_08141CF0: .4byte sub_8141CF4
thumb_func_end sub_8141CBC
@@ -5596,7 +5596,7 @@ sub_8141D20: @ 8141D20
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, _08141D70 @ =gSprites
- ldr r3, _08141D74 @ =gObjectBankIDs
+ ldr r3, _08141D74 @ =gBankSpriteIds
ldr r2, _08141D78 @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r3
@@ -5633,7 +5633,7 @@ _08141D68:
bx r0
.align 2, 0
_08141D70: .4byte gSprites
-_08141D74: .4byte gObjectBankIDs
+_08141D74: .4byte gBankSpriteIds
_08141D78: .4byte gAnimBankAttacker
thumb_func_end sub_8141D20
diff --git a/asm/ghost.s b/asm/ghost.s
index 2934f6dbd..928d940b5 100644
--- a/asm/ghost.s
+++ b/asm/ghost.s
@@ -3257,7 +3257,7 @@ sub_80DF49C: @ 80DF49C
movs r2, 0x4
orrs r1, r2
strb r1, [r3]
- ldr r2, _080DF4E0 @ =gObjectBankIDs
+ ldr r2, _080DF4E0 @ =gBankSpriteIds
ldr r1, _080DF4E4 @ =gAnimBankAttacker
ldrb r1, [r1]
adds r1, r2
@@ -3286,7 +3286,7 @@ sub_80DF49C: @ 80DF49C
strh r1, [r0, 0x22]
bx lr
.align 2, 0
-_080DF4E0: .4byte gObjectBankIDs
+_080DF4E0: .4byte gBankSpriteIds
_080DF4E4: .4byte gAnimBankAttacker
_080DF4E8: .4byte gBattleAnimArgs
_080DF4EC: .4byte sub_80DF4F4
diff --git a/asm/ground.s b/asm/ground.s
index 3d4b69a9f..3be7d74ac 100644
--- a/asm/ground.s
+++ b/asm/ground.s
@@ -1270,7 +1270,7 @@ _080E18CE:
adds r1, r4, 0
adds r1, 0x8
adds r1, r0
- ldr r0, _080E1904 @ =gObjectBankIDs
+ ldr r0, _080E1904 @ =gBankSpriteIds
adds r0, r5, r0
ldrb r0, [r0]
strh r0, [r1]
@@ -1285,7 +1285,7 @@ _080E18F8:
bls _080E18CE
b _080E1924
.align 2, 0
-_080E1904: .4byte gObjectBankIDs
+_080E1904: .4byte gBankSpriteIds
_080E1908:
ldrb r0, [r6]
bl GetAnimBankSpriteId
diff --git a/asm/normal.s b/asm/normal.s
index fffbc3870..f56ca6ec6 100644
--- a/asm/normal.s
+++ b/asm/normal.s
@@ -1214,7 +1214,7 @@ _080E25A0:
bcs _080E25F4
ldr r2, _080E2604 @ =gSprites
mov r12, r2
- ldr r6, _080E2608 @ =gObjectBankIDs
+ ldr r6, _080E2608 @ =gBankSpriteIds
movs r7, 0x3
negs r7, r7
_080E25D2:
@@ -1245,14 +1245,14 @@ _080E25FA:
.align 2, 0
_080E2600: .4byte gNoOfAllBanks
_080E2604: .4byte gSprites
-_080E2608: .4byte gObjectBankIDs
+_080E2608: .4byte gBankSpriteIds
thumb_func_end sub_80E255C
thumb_func_start sub_80E260C
sub_80E260C: @ 80E260C
push {r4-r6,lr}
ldr r6, _080E2680 @ =gSprites
- ldr r4, _080E2684 @ =gObjectBankIDs
+ ldr r4, _080E2684 @ =gBankSpriteIds
ldr r5, _080E2688 @ =gAnimBankAttacker
ldrb r0, [r5]
adds r0, r4
@@ -1309,7 +1309,7 @@ sub_80E260C: @ 80E260C
b _080E26B0
.align 2, 0
_080E2680: .4byte gSprites
-_080E2684: .4byte gObjectBankIDs
+_080E2684: .4byte gBankSpriteIds
_080E2688: .4byte gAnimBankAttacker
_080E268C: .4byte gAnimBankTarget
_080E2690: .4byte gBattleAnimArgs
@@ -2532,7 +2532,7 @@ _080E2FDC:
cmp r0, 0x1
bne _080E3028
ldr r3, _080E3060 @ =gSprites
- ldr r1, _080E3064 @ =gObjectBankIDs
+ ldr r1, _080E3064 @ =gBankSpriteIds
ldrb r0, [r5]
eors r0, r6
adds r0, r1
@@ -2580,7 +2580,7 @@ _080E3054: .4byte 0x00000c08
_080E3058: .4byte REG_BG1CNT
_080E305C: .4byte gAnimBankAttacker
_080E3060: .4byte gSprites
-_080E3064: .4byte gObjectBankIDs
+_080E3064: .4byte gBankSpriteIds
_080E3068: .4byte gSharedMem + 0x19348
_080E306C:
ldr r4, _080E308C @ =gAnimBankAttacker
@@ -2809,7 +2809,7 @@ _080E3208:
ldrsh r0, [r4, r3]
cmp r0, 0x1
bne _080E3288
- ldr r2, _080E32D8 @ =gObjectBankIDs
+ ldr r2, _080E32D8 @ =gBankSpriteIds
ldr r0, _080E32DC @ =gAnimBankAttacker
ldrb r1, [r0]
movs r0, 0x2
@@ -2862,7 +2862,7 @@ _080E32C8: .4byte REG_BLDCNT
_080E32CC: .4byte gSprites
_080E32D0: .4byte 0x040000d4
_080E32D4: .4byte 0x85000200
-_080E32D8: .4byte gObjectBankIDs
+_080E32D8: .4byte gBankSpriteIds
_080E32DC: .4byte gAnimBankAttacker
thumb_func_end sub_80E3194
@@ -3069,7 +3069,7 @@ _080E345E:
cmp r0, 0x1
bne _080E34A4
ldr r1, _080E34D8 @ =gSprites
- ldr r0, _080E34DC @ =gObjectBankIDs
+ ldr r0, _080E34DC @ =gBankSpriteIds
add r0, r8
ldrb r0, [r0]
lsls r2, r0, 4
@@ -3115,7 +3115,7 @@ _080E34CC: .4byte REG_BLDCNT
_080E34D0: .4byte 0x00003f42
_080E34D4: .4byte REG_BG1CNT
_080E34D8: .4byte gSprites
-_080E34DC: .4byte gObjectBankIDs
+_080E34DC: .4byte gBankSpriteIds
_080E34E0: .4byte gSharedMem + 0x19348
_080E34E4:
adds r0, r5, 0
@@ -3149,7 +3149,7 @@ _080E3516:
lsls r0, 16
lsrs r4, r0, 16
_080E3522:
- ldr r6, _080E3570 @ =gObjectBankIDs
+ ldr r6, _080E3570 @ =gBankSpriteIds
adds r0, r5, r6
ldrb r1, [r0]
adds r0, r5, 0
@@ -3184,7 +3184,7 @@ _080E3550:
.align 2, 0
_080E3568: .4byte gBattlePartyID
_080E356C: .4byte gPlayerParty
-_080E3570: .4byte gObjectBankIDs
+_080E3570: .4byte gBankSpriteIds
_080E3574: .4byte gBattleStatMask1_Tilemap
_080E3578:
ldr r0, _080E35B0 @ =gBattleStatMask2_Tilemap
@@ -3344,7 +3344,7 @@ _080E3692:
mov r3, sp
ldrh r3, [r3, 0x20]
strh r3, [r1, 0x14]
- ldr r0, _080E36D8 @ =gObjectBankIDs
+ ldr r0, _080E36D8 @ =gBankSpriteIds
add r0, r8
ldrb r0, [r0]
strh r0, [r1, 0x16]
@@ -3364,7 +3364,7 @@ _080E3692:
bl PlaySE12WithPanning
b _080E36F4
.align 2, 0
-_080E36D8: .4byte gObjectBankIDs
+_080E36D8: .4byte gBankSpriteIds
_080E36DC: .4byte sub_80E3704
_080E36E0:
movs r0, 0x40
@@ -4040,7 +4040,7 @@ _080E3BE6:
lsls r0, 24
cmp r0, 0
beq _080E3C24
- ldr r0, _080E3C44 @ =gObjectBankIDs
+ ldr r0, _080E3C44 @ =gBankSpriteIds
adds r0, r4, r0
ldrb r0, [r0]
lsls r2, r0, 4
@@ -4074,7 +4074,7 @@ _080E3C24:
.align 2, 0
_080E3C3C: .4byte gSprites
_080E3C40: .4byte gAnimBankAttacker
-_080E3C44: .4byte gObjectBankIDs
+_080E3C44: .4byte gBankSpriteIds
_080E3C48: .4byte gBattleAnimArgs
thumb_func_end sub_80E3BDC
@@ -4236,7 +4236,7 @@ _080E3D8A:
lsls r0, 16
lsrs r4, r0, 16
_080E3D96:
- ldr r5, _080E3E50 @ =gObjectBankIDs
+ ldr r5, _080E3E50 @ =gBankSpriteIds
adds r0, r7, r5
ldrb r1, [r0]
adds r0, r7, 0
@@ -4322,7 +4322,7 @@ _080E3DE6:
.align 2, 0
_080E3E48: .4byte gBattlePartyID
_080E3E4C: .4byte gPlayerParty
-_080E3E50: .4byte gObjectBankIDs
+_080E3E50: .4byte gBankSpriteIds
_080E3E54: .4byte gBattle_BG1_X
_080E3E58: .4byte gBattle_BG1_Y
_080E3E5C: .4byte gTasks
diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s
index 85862a4b4..c7c83e7bd 100644
--- a/data/battle_anim_80CA710.s
+++ b/data/battle_anim_80CA710.s
@@ -21,15 +21,15 @@ gSpriteAnimTable_83D6220:: @ 83D6220
.align 2
gBattleAnimSpriteTemplate_83D6224:: @ 83D6224
- spr_template 10067, 10067, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, sub_80CA710
+ spr_template 10067, 10067, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, AnimMovePowderParticle
.align 2
gBattleAnimSpriteTemplate_83D623C:: @ 83D623C
- spr_template 10068, 10068, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, sub_80CA710
+ spr_template 10068, 10068, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, AnimMovePowderParticle
.align 2
-gBattleAnimSpriteTemplate_83D6254:: @ 83D6254
- spr_template 10065, 10065, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, sub_80CA710
+gPoisonPowderParticleSpriteTemplate:: @ 83D6254
+ spr_template 10065, 10065, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, AnimMovePowderParticle
.align 2
gSpriteAnim_83D626C:: @ 83D626C
@@ -4614,7 +4614,7 @@ gSpriteAffineAnimTable_83DB498:: @ 83DB498
.4byte gSpriteAffineAnim_83DB480
.align 2
-gBattleAnimSpriteTemplate_83DB4A8:: @ 83DB4A8
+gBasicHitSplatSpriteTemplate:: @ 83DB4A8
spr_template 10135, 10135, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E27A0
.align 2
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index fb134510f..ae28bc16a 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -1,3 +1,4 @@
+#include "constants/battle_anim.h"
#include "constants/moves.h"
#include "constants/songs.h"
.include "include/macros.inc"
@@ -421,57 +422,57 @@ gBattleAnims_Special:: @ 81C7778
Move_POUND: @ 81C7794
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W003, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
Move_DOUBLE_SLAP: @ 81C77C5
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
- choosetwoturnanim _81C77F0, _81C7804
-_81C77D6:
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ choosetwoturnanim Move_DOUBLE_SLAP_FirstHit, Move_DOUBLE_SLAP_SecondHit
+Move_DOUBLE_SLAP_End:
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
playsewithpan SE_W003, 63
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
-_81C77F0:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -8, 0, 1, 2
- goto _81C77D6
-_81C7804:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 8, 0, 1, 2
- goto _81C77D6
+Move_DOUBLE_SLAP_FirstHit:
+ createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2
+ goto Move_DOUBLE_SLAP_End
+Move_DOUBLE_SLAP_SecondHit:
+ createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 2
+ goto Move_DOUBLE_SLAP_End
Move_POISON_POWDER: @ 81C7818
loadspritegfx 10065
loadspritegfx 10150
loopsewithpan SE_W077, 63, 10, 6
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, -30, -22, 117, 80, 5, 1
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, 10, -22, 117, 80, -5, 1
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, -25, -22, 117, 112, 5, 3
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3
delay 15
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, -5, -22, 117, 80, -5, 1
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, 5, -22, 117, 96, 5, 1
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, 0, -22, 117, 69, -5, 1
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, -15, -22, 117, 112, 5, 2
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2
delay 30
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, -15, -22, 117, 112, 5, 2
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, 15, -22, 117, 80, -5, 1
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, -10, -22, 117, 96, 7, 2
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, -5, -22, 117, 90, -8, 0
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0
delay 20
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, -10, -22, 117, 80, -5, 1
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, 0, -22, 117, 89, 5, 2
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, 20, -22, 117, 112, -8, 2
- createsprite gBattleAnimSpriteTemplate_83D6254, 130, 5, -22, 117, 80, 5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2
+ createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1
waitforvisualfinish
end
@@ -526,7 +527,7 @@ Move_SLEEP_POWDER: @ 81C7A77
Move_SWIFT: @ 81C7BA5
loadspritegfx 10174
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W129, 192
createsprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, 0, 22, 20, 1
@@ -546,13 +547,13 @@ Move_SWIFT: @ 81C7BA5
createsprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, 0, 22, 12, 1
delay 5
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_STRENGTH: @ 81C7C5E
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W036, 192
createvisualtask sub_80A8314, 5, 0, 2, 0, 96, 30
@@ -562,37 +563,37 @@ Move_STRENGTH: @ 81C7C5E
createvisualtask sub_80A8500, 2, 1, 18, 6, 2, 4
delay 4
playsewithpan SE_W025B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 16, 12, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 16, 12, 1, 1
delay 4
playsewithpan SE_W025B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, -16, -12, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, -16, -12, 1, 1
delay 4
playsewithpan SE_W025B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 3, 4, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 3, 4, 1, 1
waitforvisualfinish
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_TACKLE: @ 81C7CF2
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
delay 6
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
playsewithpan SE_W004, 63
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
Move_BODY_SLAM: @ 81C7D30
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W036, 192
createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0
@@ -600,7 +601,7 @@ Move_BODY_SLAM: @ 81C7D30
delay 11
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 26, 0, 0, 5
delay 6
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 4, -10, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0
loopsewithpan SE_W025B, 63, 10, 2
delay 1
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -28, 0, 0, 3
@@ -612,13 +613,13 @@ Move_BODY_SLAM: @ 81C7D30
delay 5
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_SUPERSONIC: @ 81C7DBD
loadspritegfx 10163
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
monbgprio_2A 0
setalpha 12, 8
createvisualtask sub_80A7FA0, 2, 0, 2, 0, 8, 1
@@ -629,7 +630,7 @@ Move_SUPERSONIC: @ 81C7DBD
call _81C7DFB
call _81C7DFB
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
end
_81C7DFB:
@@ -655,7 +656,7 @@ _81C7E48:
Move_FLAME_WHEEL: @ 81C7E62
loadspritegfx 10029
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_2A 1
createsprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 0
playsewithpan SE_W172, 192
@@ -680,14 +681,14 @@ Move_FLAME_WHEEL: @ 81C7E62
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 6
delay 4
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 8, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 8, 1
createvisualtask sub_8079790, 3, 1, 31, 12, 1, 1
playsewithpan SE_W172B, 63
call _81D11A2
delay 7
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 9
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
Unknown_81C7F4C: @ 81C7F4C
@@ -698,7 +699,7 @@ Unknown_81C7F4C: @ 81C7F4C
Move_PIN_MISSILE: @ 81C7F5C
loadspritegfx 10161
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
monbgprio_28 1
setalpha 12, 8
playsewithpan SE_W026, 192
@@ -707,27 +708,27 @@ Move_PIN_MISSILE: @ 81C7F5C
createsprite gBattleAnimSpriteTemplate_83DABA4, 2, 20, -8, 8, 8, 20, -40
delay 4
playsewithpan SE_W030, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, -8, -8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
delay 9
createsprite gBattleAnimSpriteTemplate_83DABA4, 2, 20, -8, 0, 0, 20, -32
delay 4
playsewithpan SE_W030, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 8, 8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
delay 14
playsewithpan SE_W030, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
Move_ICICLE_SPEAR: @ 81C8021
loadspritegfx 10262
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
monbgprio_28 1
setalpha 12, 8
playsewithpan SE_W196, 192
@@ -736,32 +737,32 @@ Move_ICICLE_SPEAR: @ 81C8021
createsprite gBattleAnimSpriteTemplate_83DABBC, 2, 20, -8, 8, 8, 20, -40
delay 4
playsewithpan SE_W030, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, -8, -8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
delay 9
createsprite gBattleAnimSpriteTemplate_83DABBC, 2, 20, -8, 0, 0, 20, -32
delay 4
playsewithpan SE_W030, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 8, 8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
delay 14
playsewithpan SE_W030, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
Move_TAKE_DOWN: @ 81C80E6
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W036, 192
createvisualtask sub_80A8920, 5, 0, -24, 8, 23, 10, 40, 10
delay 35
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 10, 0, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 4, -10, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0
playsewithpan SE_W025B, 63
delay 1
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -16, 0, 0, 4
@@ -773,7 +774,7 @@ Move_TAKE_DOWN: @ 81C80E6
delay 3
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 7
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -792,7 +793,7 @@ Move_DOUBLE_EDGE: @ 81C817A
delay 3
waitforvisualfinish
playsewithpan SE_W025B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 132, -10, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 0
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -32, 0, 0, 3
waitforvisualfinish
createvisualtask sub_80A8E04, 2, 8, -256, 0, 0
@@ -814,26 +815,26 @@ Move_POISON_STING: @ 81C828D
loadspritegfx 10161
loadspritegfx 10135
loadspritegfx 10150
- monbg 1
+ monbg ANIM_BANK_TARGET
monbgprio_28 1
setalpha 12, 8
playsewithpan SE_W013B, 192
createsprite gBattleAnimSpriteTemplate_83DAB8C, 130, 20, 0, -8, 0, 20
waitforvisualfinish
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 5, 1
playsewithpan SE_W030, 63
waitforvisualfinish
call Unknown_81D5F87
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
Move_TWINEEDLE: @ 81C82E2
loadspritegfx 10161
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
monbgprio_28 1
setalpha 12, 8
loopsewithpan SE_W013B, 192, 6, 2
@@ -846,7 +847,7 @@ Move_TWINEEDLE: @ 81C82E2
delay 1
createsprite gBattleAnimSpriteTemplate_83DB4C0, 3, 10, 12, 1, 3
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -860,7 +861,7 @@ Move_FIRE_BLAST: @ 81C8355
createvisualtask sub_80E2A38, 10, 1, 3, 0, 8, 0
waitforvisualfinish
delay 19
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 20, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 20, 1
call _81C842D
delay 3
call _81C842D
@@ -935,7 +936,7 @@ _81C8535:
Move_MEGA_PUNCH: @ 81C854D
loadspritegfx 10135
loadspritegfx 10143
- monbg 1
+ monbg ANIM_BANK_TARGET
delay 2
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 0, 16, 0
setalpha 12, 8
@@ -944,13 +945,13 @@ Move_MEGA_PUNCH: @ 81C854D
createvisualtask sub_80E2A38, 10, 4, 2, 0, 7, 32767
delay 50
call _81C85E9
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
createvisualtask sub_80A7FA0, 2, 1, 4, 0, 22, 1
createvisualtask sub_80E2A38, 10, 4, 2, 0, 0, 32767
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0
playsewithpan SE_W233B, 63
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
delay 2
restorebg
@@ -978,7 +979,7 @@ _81C8620:
Move_MEGA_KICK: @ 81C8627
loadspritegfx 10135
loadspritegfx 10143
- monbg 1
+ monbg ANIM_BANK_TARGET
delay 2
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 0, 16, 0
setalpha 12, 8
@@ -988,12 +989,12 @@ Move_MEGA_KICK: @ 81C8627
delay 50
playsewithpan SE_W025B, 63
call _81C85E9
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
createvisualtask sub_80A7FA0, 2, 1, 4, 0, 22, 1
createvisualtask sub_80E2A38, 10, 4, 2, 0, 0, 32767
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
delay 2
restorebg
@@ -1003,38 +1004,38 @@ Move_MEGA_KICK: @ 81C8627
Move_COMET_PUNCH: @ 81C86C3
loadspritegfx 10135
loadspritegfx 10143
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
choosetwoturnanim _81C86F1, _81C8716
_81C86D7:
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
playsewithpan SE_W004, 63
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
_81C86F1:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -8, -8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, -8, -8, 1, 2
createsprite gBattleAnimSpriteTemplate_83D9FA8, 3, -8, 0, 8, 1, 0
goto _81C86D7
_81C8716:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 8, -8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 8, -8, 1, 2
createsprite gBattleAnimSpriteTemplate_83D9FA8, 3, 8, 0, 8, 1, 0
goto _81C86D7
Move_SONIC_BOOM: @ 81C873B
loadspritegfx 10003
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
call _81C8772
call _81C8772
call _81C8772
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 10, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 10, 1
call _81C878A
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81C8772:
@@ -1043,7 +1044,7 @@ _81C8772:
delay 4
return
_81C878A:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2
delay 4
return
@@ -1141,50 +1142,50 @@ Move_THUNDER_WAVE: @ 81C89C0
Move_BEAT_UP: @ 81C8A2F
loadspritegfx 10135
loadspritegfx 10143
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
choosetwoturnanim _81C8A48, _81C8AB9
_81C8A43:
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
_81C8A48:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, -20, -20, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 130, -20, -20, 1, 2
createsprite gBattleAnimSpriteTemplate_83D9FA8, 131, -20, -12, 8, 1, 0
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, 63
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 8, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2
createsprite gBattleAnimSpriteTemplate_83D9FA8, 131, 8, 8, 8, 1, 0
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, 63
goto _81C8A43
_81C8AB9:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 12, -20, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 130, 12, -20, 1, 2
createsprite gBattleAnimSpriteTemplate_83D9FA8, 131, 12, -12, 8, 1, 0
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, 63
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, -12, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 130, -12, 0, 1, 2
createsprite gBattleAnimSpriteTemplate_83D9FA8, 131, -12, 8, 8, 1, 0
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, 63
goto _81C8A43
Move_STOMP: @ 81C8B2A
loadspritegfx 10143
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W104, 63
createsprite gBattleAnimSpriteTemplate_83DA070, 3, 0, -32, 15
delay 19
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, -8, 1, 1
- createvisualtask sub_80A7E7C, 2, 1, 0, 4, 9, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, -8, 1, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 4, 9, 1
playsewithpan SE_W025B, 63
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -1196,14 +1197,14 @@ Move_TAIL_WHIP: @ 81C8B71
Move_CUT: @ 81C8B8A
loadspritegfx 10138
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W015, 63
createsprite gBattleAnimSpriteTemplate_83D6B28, 2, 40, -32, 0
delay 5
- createvisualtask sub_80A7E7C, 2, 1, 0, 3, 10, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 10, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
waitforvisualfinish
end
@@ -1262,13 +1263,13 @@ Move_REVERSAL: @ 81C8CA5
playsewithpan SE_W233B, 63
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 32767, 8, 0, 0
createsprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 10, 1, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
createvisualtask sub_80A9058, 5, 0, 1, 8, 1, 0
end
Move_PURSUIT: @ 81C8D80
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
fadetobg 1
waitbgfadein
delay 0
@@ -1276,7 +1277,7 @@ Move_PURSUIT: @ 81C8D80
choosetwoturnanim _81C8D9F, _81C8DC8
_81C8D96:
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
delay 0
restorebg
@@ -1284,19 +1285,19 @@ _81C8D96:
end
_81C8D9F:
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
createvisualtask sub_80A9058, 5, 0, 1, 6, 1, 0
goto _81C8D96
_81C8DC8:
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
createvisualtask sub_80A9058, 5, 0, 1, 6, 1, 0
goto _81C8D96
Move_SPIKE_CANNON: @ 81C8DF1
loadspritegfx 10161
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
monbgprio_28 1
setalpha 12, 8
createvisualtask sub_80A8920, 5, 0, -4, 0, 4, 6, 8, 4
@@ -1313,13 +1314,13 @@ Move_SPIKE_CANNON: @ 81C8DF1
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 7, 1
loopsewithpan SE_W030, 63, 5, 3
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
Move_SWORDS_DANCE: @ 81C8EA4
loadspritegfx 10005
- monbg 0
+ monbg ANIM_BANK_ATTACKER
setalpha 12, 8
playsewithpan SE_W014, 192
createvisualtask sub_80A8500, 2, 0, 16, 6, 1, 4
@@ -1327,14 +1328,14 @@ Move_SWORDS_DANCE: @ 81C8EA4
delay 22
createvisualtask sub_80E21A8, 2, 10005, 2, 2, 32754, 16, 0, 0
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
blendoff
delay 1
end
Move_PSYCH_UP: @ 81C8EEA
loadspritegfx 10196
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
createvisualtask sub_80E1F8C, 2, 25, 2, 6, 1, 11, 0
setalpha 12, 8
loopsewithpan SE_W060B, 192, 5, 10
@@ -1346,7 +1347,7 @@ Move_PSYCH_UP: @ 81C8EEA
createvisualtask sub_80A8D34, 5, -5, -5, 10, 0, 1
createvisualtask sub_80E2A38, 9, 2, 2, 10, 0, 1023
delay 30
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
waitforvisualfinish
end
@@ -1355,11 +1356,11 @@ Move_DIZZY_PUNCH: @ 81C8F5C
loadspritegfx 10073
loadspritegfx 10143
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
call _81C9077
createsprite gBattleAnimSpriteTemplate_83D9FA8, 133, 16, 8, 20, 1, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 132, 16, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 132, 16, 0, 1, 1
playsewithpan SE_W004, 63
createsprite gBattleAnimSpriteTemplate_83DA088, 131, 16, 8, 160, -32
createsprite gBattleAnimSpriteTemplate_83DA088, 131, 16, 8, -256, -40
@@ -1370,7 +1371,7 @@ Move_DIZZY_PUNCH: @ 81C8F5C
delay 10
call _81C9077
createsprite gBattleAnimSpriteTemplate_83D9FA8, 133, -16, -8, 20, 1, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 132, -16, -16, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 132, -16, -16, 1, 1
playsewithpan SE_W233B, 63
createsprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, 160, -32
createsprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, -256, -40
@@ -1379,7 +1380,7 @@ Move_DIZZY_PUNCH: @ 81C8F5C
createsprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, -128, -22
createsprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, -384, -31
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
_81C9077:
@@ -1391,7 +1392,7 @@ _81C9077:
Move_FIRE_SPIN: @ 81C9096
loadspritegfx 10029
playsewithpan SE_W221B, 63
- createvisualtask sub_80A7E7C, 5, 1, 0, 2, 47, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 47, 1
call _81C90BF
call _81C90BF
call _81C90BF
@@ -1414,7 +1415,7 @@ _81C90BF:
Move_FURY_CUTTER: @ 81C914A
loadspritegfx 10138
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W013, 63
createvisualtask UpdateFuryCutterAnimDirection, 2
@@ -1428,9 +1429,9 @@ _81C916A:
goto _81C91FF
_81C918E:
delay 5
- createvisualtask sub_80A7E7C, 2, 1, 0, 3, 10, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 10, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
waitforvisualfinish
end
@@ -1484,7 +1485,7 @@ _81C929F:
Move_SLAM: @ 81C9309
loadspritegfx 10056
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W004, 192
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 3, 0, 4
@@ -1492,7 +1493,7 @@ Move_SLAM: @ 81C9309
createsprite gBattleAnimSpriteTemplate_83D69DC, 2, 0, 0
delay 3
playsewithpan SE_W025B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -12, 10, 0, 3
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5
delay 3
@@ -1501,7 +1502,7 @@ Move_SLAM: @ 81C9309
delay 5
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -1539,9 +1540,9 @@ Move_WATERFALL: @ 81C9421
loadspritegfx 10148
loadspritegfx 10155
loadspritegfx 10141
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
- createvisualtask sub_80A7E7C, 5, 0, 0, 2, 23, 1
+ createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 23, 1
delay 5
playsewithpan SE_W152, 192
createsprite gBattleAnimSpriteTemplate_83D9348, 2, 10, 10, 25, 0
@@ -1572,7 +1573,7 @@ Move_WATERFALL: @ 81C9421
delay 6
call _81C9502
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81C9502:
@@ -1662,12 +1663,12 @@ Move_DEFENSE_CURL: @ 81C977C
Move_PROTECT: @ 81C97B5
loadspritegfx 10280
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
monbgprio_28 0
waitplaysewithpan SE_W115, 192, 16
createsprite gBattleAnimSpriteTemplate_83D6BE8, 2, 24, 0, 90
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
end
Move_DETECT: @ 81C97D2
@@ -1688,7 +1689,7 @@ Move_DETECT: @ 81C97D2
Move_FRUSTRATION: @ 81C9830
loadspritegfx 10135
loadspritegfx 10087
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createvisualtask sub_8079CEC, 1
jumpargeq 7, 0, _81C9864
@@ -1697,7 +1698,7 @@ Move_FRUSTRATION: @ 81C9830
goto _81C9AB3
_81C985F:
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81C9864:
@@ -1716,22 +1717,22 @@ _81C9864:
createvisualtask sub_80A8B88, 5, 0, 16, 6144, 8, 0
delay 5
createvisualtask sub_80A7FA0, 5, 1, 4, 0, 30, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0
playsewithpan SE_W004, 63
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 24, 8, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 3, 24, 8, 1, 0
playsewithpan SE_W004, 63
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, -24, -16, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 3, -24, -16, 1, 0
playsewithpan SE_W004, 63
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 8, 4, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 3, 8, 4, 1, 0
playsewithpan SE_W004, 63
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, -16, 19, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 3, -16, 19, 1, 0
playsewithpan SE_W004, 63
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 18, -18, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 3, 18, -18, 1, 0
playsewithpan SE_W004, 63
waitforvisualfinish
createvisualtask sub_80E2A38, 10, 2, 3, 9, 0, 31
@@ -1749,15 +1750,15 @@ _81C996A:
createvisualtask sub_812E498, 5
delay 7
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 8, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 8, 1, 1
createvisualtask sub_80A7FA0, 5, 1, 4, 0, 6, 1
delay 14
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 12, -6, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 12, -6, 1, 1
createvisualtask sub_80A7FA0, 5, 1, 4, 0, 6, 1
delay 14
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, -12, -6, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, -12, -6, 1, 1
createvisualtask sub_80A7FA0, 5, 1, 4, 0, 6, 1
waitforvisualfinish
createvisualtask sub_80E2A38, 10, 2, 3, 9, 0, 31
@@ -1770,13 +1771,13 @@ _81C9A37:
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
delay 6
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, 4, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 10, 4, 1, 1
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 6, 1
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
delay 6
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -4, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, -10, -4, 1, 2
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 6, 1
goto _81C985F
_81C9AB3:
@@ -1786,13 +1787,13 @@ _81C9AB3:
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 10, 2
delay 12
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
createvisualtask sub_80A7FA0, 2, 1, 1, 0, 6, 1
goto _81C985F
Move_SAFEGUARD: @ 81C9AF7
loadspritegfx 10244
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
setalpha 8, 8
playsewithpan SE_W208, 192
createsprite gBattleAnimSpriteTemplate_83D7D74, 2
@@ -1804,7 +1805,7 @@ Move_SAFEGUARD: @ 81C9AF7
playsewithpan SE_REAPOKE, 192
createvisualtask sub_80E1F8C, 2, 10, 0, 2, 0, 10, 32767
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
end
@@ -1835,23 +1836,23 @@ Move_PAIN_SPLIT: @ 81C9B39
Move_VICE_GRIP: @ 81C9BE1
loadspritegfx 10138
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W011, 63
createsprite gBattleAnimSpriteTemplate_83D769C, 2, 0
createsprite gBattleAnimSpriteTemplate_83D769C, 2, 1
delay 9
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 1, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2
createvisualtask sub_80A7FA0, 5, 1, 2, 0, 5, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_GUILLOTINE: @ 81C9C29
loadspritegfx 10138
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
fadetobgfromset 12, 13, 14
waitbgfadein
@@ -1863,11 +1864,11 @@ Move_GUILLOTINE: @ 81C9C29
createvisualtask sub_80A7FA0, 5, 1, 2, 0, 23, 1
delay 46
createvisualtask sub_80A7FA0, 5, 1, 4, 0, 8, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0
playsewithpan SE_W013, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
restorebg
waitbgfadein
@@ -1876,18 +1877,18 @@ Move_GUILLOTINE: @ 81C9C29
Move_PAY_DAY: @ 81C9CB5
loadspritegfx 10100
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
monbgprio_28 1
setalpha 12, 8
playsewithpan SE_W013B, 192
createsprite gBattleAnimSpriteTemplate_83D75E4, 2, 20, 0, 0, 0, 1152
waitforvisualfinish
playsewithpan SE_W006, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 1, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2
createsprite gBattleAnimSpriteTemplate_83D75FC, 2
createvisualtask sub_80A7FA0, 2, 1, 1, 0, 6, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -1974,8 +1975,8 @@ Move_SPARK: @ 81C9EA3
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
delay 4
playsewithpan SE_W063, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
waitforvisualfinish
createvisualtask sub_80E1F8C, 2, 4, -31, 2, 0, 6, 23551
call Unknown_81D6100
@@ -2044,7 +2045,7 @@ Move_WHIRLWIND: @ 81CA1E9
Move_CONFUSE_RAY: @ 81CA291
loadspritegfx 10013
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
fadetobg 2
waitbgfadein
createvisualtask sub_812B374, 2, -64, 63, 2, 0
@@ -2057,7 +2058,7 @@ Move_CONFUSE_RAY: @ 81CA291
waitforvisualfinish
delay 0
blendoff
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
restorebg
waitbgfadein
end
@@ -2076,7 +2077,7 @@ Move_LOCK_ON: @ 81CA2E4
Move_MEAN_LOOK: @ 81CA31A
loadspritegfx 10187
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
playsewithpan SE_W060, 192
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 16, 0
loopsewithpan SE_W109, 63, 15, 4
@@ -2085,7 +2086,7 @@ Move_MEAN_LOOK: @ 81CA31A
delay 120
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 16, 0, 0
delay 30
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
waitforvisualfinish
end
@@ -2100,7 +2101,7 @@ Move_ROCK_THROW: @ 81CA35F
delay 6
createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -23, 2, -10, 0
playsewithpan SE_W088, 63
- createvisualtask sub_80A7E7C, 2, 1, 0, 5, 20, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 5, 20, 1
delay 6
createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -15, 1, -10, 0
playsewithpan SE_W088, 63
@@ -2112,7 +2113,7 @@ Move_ROCK_THROW: @ 81CA35F
Move_ROCK_SLIDE: @ 81CA3EB
loadspritegfx 10058
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
createsprite gBattleAnimSpriteTemplate_83DB428, 2, 7, 1, 11, 1
createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -5, 1, -5, 1
playsewithpan SE_W088, 63
@@ -2125,13 +2126,13 @@ Move_ROCK_SLIDE: @ 81CA3EB
delay 2
createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -23, 2, -10, 1
playsewithpan SE_W088, 63
- createvisualtask sub_80A7E7C, 2, 1, 0, 5, 50, 1
- createvisualtask sub_80A7E7C, 2, 3, 0, 5, 50, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 5, 50, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_DEF_PARTNER, 0, 5, 50, 1
delay 2
call _81CA483
call _81CA483
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
_81CA483:
createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -20, 0, -10, 1
@@ -2162,7 +2163,7 @@ _81CA483:
Move_THIEF: @ 81CA52C
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
delay 1
fadetobg 1
waitbgfadein
@@ -2170,11 +2171,11 @@ Move_THIEF: @ 81CA52C
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
delay 6
playsewithpan SE_W233, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
createvisualtask sub_80A7FA0, 2, 1, 1, 0, 8, 1
waitforvisualfinish
delay 20
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
restorebg
waitbgfadein
@@ -2183,7 +2184,7 @@ Move_THIEF: @ 81CA52C
Move_BUBBLE_BEAM: @ 81CA573
loadspritegfx 10146
loadspritegfx 10155
- monbg 1
+ monbg ANIM_BANK_TARGET
monbgprio_28 1
setalpha 12, 8
delay 1
@@ -2194,7 +2195,7 @@ Move_BUBBLE_BEAM: @ 81CA573
waitforvisualfinish
call Unknown_81D5FF8
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
_81CA5AD:
@@ -2221,7 +2222,7 @@ _81CA5AD:
Move_ICY_WIND: @ 81CA650
loadspritegfx 10141
loadspritegfx 10142
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
createvisualtask sub_80E2A38, 10, 11, 4, 0, 4, 0
fadetobg 15
waitbgfadeout
@@ -2236,7 +2237,7 @@ Move_ICY_WIND: @ 81CA650
delay 55
call Unknown_81D5E0E
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
restorebg
waitbgfadeout
createvisualtask sub_80E2A38, 10, 11, 4, 4, 0, 0
@@ -2280,7 +2281,7 @@ Move_SMOKESCREEN: @ 81CA710
Move_CONVERSION: @ 81CA809
loadspritegfx 10018
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
monbgprio_28 0
setalpha 16, 0
delay 0
@@ -2326,13 +2327,13 @@ Move_CONVERSION: @ 81CA809
createvisualtask sub_80CE108, 5
waitforvisualfinish
delay 1
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
end
Move_CONVERSION_2: @ 81CA91E
loadspritegfx 10018
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_2A 1
setalpha 0, 16
delay 0
@@ -2371,14 +2372,14 @@ Move_CONVERSION_2: @ 81CA91E
delay 10
playsewithpan SE_W129, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_ROLLING_KICK: @ 81CAA3A
loadspritegfx 10143
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createvisualtask sub_80A8500, 2, 0, 18, 6, 1, 4
playsewithpan SE_W104, 192
@@ -2389,11 +2390,11 @@ Move_ROLLING_KICK: @ 81CAA3A
createsprite gBattleAnimSpriteTemplate_83D9FF0, 2, -24, 0, 48, 10, 160, 0
delay 5
playsewithpan SE_W233B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -8, 0, 1, 2
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 1, 8
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -2406,7 +2407,7 @@ Move_HEADBUTT: @ 81CAABD
createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1
waitforvisualfinish
createvisualtask sub_80A8154, 2, 0, 2, 0, 4, 1
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1
createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2
createsprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1
playsewithpan SE_W233B, 63
@@ -2424,7 +2425,7 @@ Move_HORN_ATTACK: @ 81CAB1A
createsprite gBattleAnimSpriteTemplate_83D7050, 132, 0, 0, 10
waitforvisualfinish
createvisualtask sub_80A8154, 2, 0, 2, 0, 4, 1
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1
createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2
createsprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1
playsewithpan SE_W030, 63
@@ -2437,7 +2438,7 @@ Move_FURY_ATTACK: @ 81CAB87
createvisualtask sub_80A8E04, 2, 4, 256, 0, 2
choosetwoturnanim _81CABB8, _81CABDE
_81CABA5:
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1
waitforvisualfinish
end
_81CABB8:
@@ -2539,7 +2540,7 @@ Move_THRASH: @ 81CAD81
Move_SING: @ 81CAE00
loadspritegfx 10072
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
createvisualtask sub_80CEA20, 2
waitforvisualfinish
panse_1B SE_W047, 192, 63, 2, 0
@@ -2568,7 +2569,7 @@ Move_SING: @ 81CAE00
createsprite gBattleAnimSpriteTemplate_83D7114, 130, 5, 3, 12
delay 4
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
createvisualtask sub_80CEAD8, 2
waitforvisualfinish
end
@@ -2579,7 +2580,7 @@ Move_LOW_KICK: @ 81CAED4
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4
createsprite gBattleAnimSpriteTemplate_83D9FF0, 130, -24, 28, 40, 8, 160, 0
delay 4
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, -8, 8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 130, -8, 8, 1, 2
createvisualtask sub_80A8E04, 2, 6, 384, 1, 2
playsewithpan SE_W233B, 63
waitforvisualfinish
@@ -2665,16 +2666,16 @@ _81CB106:
loadspritegfx 10281
createvisualtask sub_80E149C, 2, 0
waitforvisualfinish
- monbg 0
+ monbg ANIM_BANK_ATTACKER
createsprite gBattleAnimSpriteTemplate_83DB364, 1, 0, 0, 48
createsprite gBattleAnimSpriteTemplate_83DB364, 1, 0, 1, 48
delay 1
createvisualtask sub_80E149C, 2, 1
delay 16
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -8, 0, 1, 2
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1
playsewithpan SE_W025B, 192
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
goto _81CB0AA
_81CB16A:
createsprite gBattleAnimSpriteTemplate_83DB34C, 2, 0, 0, 12, 4, -16, 18
@@ -2696,7 +2697,7 @@ Move_MEDITATE: @ 81CB1BD
end
Move_AGILITY: @ 81CB1DA
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
setalpha 12, 8
createvisualtask sub_80A8500, 2, 0, 24, 6, 4, 4
createvisualtask sub_80E2DD8, 2, 0, 4, 7, 10
@@ -2711,24 +2712,24 @@ Move_AGILITY: @ 81CB1DA
playsewithpan SE_W104, 192
delay 12
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
delay 1
end
Move_QUICK_ATTACK: @ 81CB224
loadspritegfx 10135
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
setalpha 12, 8
createvisualtask sub_80A8500, 2, 0, 24, 6, 1, 5
createvisualtask sub_80E2DD8, 2, 0, 4, 7, 3
playsewithpan SE_W026, 192
delay 4
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 132, 0, 0, 1, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 1
playsewithpan SE_W233B, 63
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
waitforvisualfinish
end
@@ -2736,7 +2737,7 @@ Move_QUICK_ATTACK: @ 81CB224
Move_RAGE: @ 81CB27C
loadspritegfx 10135
loadspritegfx 10087
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createvisualtask sub_8079790, 3, 0, 31, 10, 0, 2
createsprite gBattleAnimSpriteTemplate_83D7798, 2, 0, -20, -28
@@ -2747,11 +2748,11 @@ Move_RAGE: @ 81CB27C
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 6
delay 4
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
createvisualtask sub_80A9058, 2, 1, 1, 10, 1, 0
playsewithpan SE_W233B, 63
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
end
Move_TELEPORT: @ 81CB2F2
@@ -2764,7 +2765,7 @@ Move_TELEPORT: @ 81CB2F2
end
Move_DOUBLE_TEAM: @ 81CB30B
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
setalpha 12, 8
createvisualtask sub_80CE7E0, 2
playsewithpan SE_W104, 192
@@ -2785,7 +2786,7 @@ Move_DOUBLE_TEAM: @ 81CB30B
delay 8
playsewithpan SE_W104, 192
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
delay 1
end
@@ -2898,8 +2899,8 @@ Move_BARRAGE: @ 81CB533
playsewithpan SE_W207, 192
delay 24
createsprite gBattleAnimSpriteTemplate_83DB428, 2, 8, 1, 40, 1
- createvisualtask sub_80A7E7C, 3, 1, 0, 4, 20, 1
- createvisualtask sub_80A7E7C, 3, 3, 0, 4, 20, 1
+ createvisualtask AnimTask_ShakeMon, 3, 1, 0, 4, 20, 1
+ createvisualtask AnimTask_ShakeMon, 3, 3, 0, 4, 20, 1
loopsewithpan SE_W070, 63, 8, 2
end
@@ -2908,7 +2909,7 @@ Move_SKY_ATTACK: @ 81CB57B
_81CB584:
end
_81CB585:
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 11
createvisualtask sub_80E3BA4, 5, 7
jumpargeq 7, 0, _81CB5A0
@@ -2926,7 +2927,7 @@ _81CB5A0:
waitforvisualfinish
createvisualtask sub_80E2A38, 10, 25, 1, 8, 0, 0
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
goto _81CB584
_81CB617:
@@ -2943,14 +2944,14 @@ _81CB617:
waitforvisualfinish
createvisualtask sub_80E2A7C, 10, 4, 1, 8, 0, 0
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
goto _81CB584
_81CB68E:
loadspritegfx 10135
loadspritegfx 10284
call Unknown_81D61FB
- monbg 0
+ monbg ANIM_BANK_ATTACKER
createvisualtask sub_80E2A38, 10, 2, 0, 0, 16, 32767
delay 4
createvisualtask sub_80DFC24, 5, 0
@@ -2965,7 +2966,7 @@ _81CB68E:
delay 2
createvisualtask sub_80E2A38, 10, 2, 0, 15, 0, 32767
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
call Unknown_81D622B
goto _81CB584
@@ -2983,13 +2984,13 @@ Move_SPLASH: @ 81CB720
end
Move_ACID_ARMOR: @ 81CB735
- monbg 0
+ monbg ANIM_BANK_ATTACKER
setalpha 15, 0
createvisualtask sub_812F314, 2, 0
playsewithpan SE_W151, 192
waitforvisualfinish
blendoff
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
delay 1
end
@@ -3014,7 +3015,7 @@ Move_SUPER_FANG: @ 81CB75A
playsewithpan SE_W044, 63
delay 8
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 2143, 14, 32767, 14
- createvisualtask sub_80A7E7C, 2, 1, 0, 7, 12, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 7, 12, 1
waitforvisualfinish
blendoff
end
@@ -3033,28 +3034,28 @@ Move_SLASH: @ 81CB7DB
Move_STRUGGLE: @ 81CB815
loadspritegfx 10135
loadspritegfx 10215
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createvisualtask sub_80A8154, 2, 0, 3, 0, 12, 4
createsprite gBattleAnimSpriteTemplate_83D7C90, 2, 0, 0, 2
createsprite gBattleAnimSpriteTemplate_83D7C90, 2, 0, 1, 2
loopsewithpan SE_W029, 192, 12, 4
waitforvisualfinish
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
createvisualtask sub_80A8154, 2, 1, 3, 0, 6, 1
playsewithpan SE_W025B, 63
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
Move_SKETCH: @ 81CB87B
loadspritegfx 10002
- monbg 1
+ monbg ANIM_BANK_TARGET
createvisualtask sub_80D0C88, 2
createsprite gBattleAnimSpriteTemplate_83D77E0, 130
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
createvisualtask sub_80D074C, 2, 0, 2
loopsewithpan SE_W039, 192, 38, 2
end
@@ -3063,18 +3064,18 @@ Move_NIGHTMARE: @ 81CB8A3
fadetobg 2
waitbgfadein
jumpifcontest _81CB8CF
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
createvisualtask sub_80DE1B0, 2
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 40, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 40, 1
playsewithpan SE_W171, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
restorebg
waitbgfadein
end
_81CB8CF:
createvisualtask sub_8079790, 2, 0, 32767, 10, 2, 1
- createvisualtask sub_80A7E7C, 2, 0, 3, 0, 32, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_ATTACKER, 3, 0, 32, 1
playsewithpan SE_W171, 63
waitforvisualfinish
restorebg
@@ -3083,7 +3084,7 @@ _81CB8CF:
Move_FLAIL: @ 81CB8F9
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createvisualtask sub_812E860, 2, 0
loopsewithpan SE_W029, 192, 8, 2
@@ -3092,7 +3093,7 @@ Move_FLAIL: @ 81CB8F9
createvisualtask sub_80A9058, 2, 0, 1, 30, 1, 0
playsewithpan SE_W025B, 63
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -3100,20 +3101,20 @@ Move_SPITE: @ 81CB936
fadetobg 2
playsewithpan SE_W060, 192
waitbgfadein
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
createvisualtask sub_80E1F8C, 2, 2, 2, 6, 0, 8, 32767
createvisualtask sub_80DE3AC, 2
loopsewithpan SE_W060, 63, 20, 3
waitforvisualfinish
restorebg
waitbgfadein
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
end
Move_MACH_PUNCH: @ 81CB965
loadspritegfx 10135
loadspritegfx 10143
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
createvisualtask sub_80E3B4C, 2
jumpargeq 7, 1, _81CB9E6
fadetobg 9
@@ -3126,12 +3127,12 @@ _81CB97E:
createvisualtask sub_807A69C, 2, 28968, 10
playsewithpan SE_W026, 192
delay 6
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 8, 1, 0
playsewithpan SE_W004, 63
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
restorebg
waitbgfadeout
@@ -3144,7 +3145,7 @@ _81CB9E6:
Move_FORESIGHT: @ 81CB9ED
loadspritegfx 10258
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 16, 0
createsprite gBattleAnimSpriteTemplate_8402A24, 130, 1
@@ -3158,7 +3159,7 @@ Move_FORESIGHT: @ 81CB9ED
playsewithpan SE_W197, 63
waitforvisualfinish
blendoff
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
Move_DESTINY_BOND: @ 81CBA2C
@@ -3224,16 +3225,16 @@ Move_ROLLOUT: @ 81CBB5E
loadspritegfx 10135
loadspritegfx 10074
loadspritegfx 10058
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
createvisualtask sub_80DD4D4, 2
waitforvisualfinish
createvisualtask sub_80A9058, 2, 0, 1, 30, 1, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 4, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 4, 0, 0, 1, 2
playsewithpan SE_W025B, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -3259,8 +3260,8 @@ Move_FALSE_SWIPE: @ 81CBB9F
createsprite gBattleAnimSpriteTemplate_83D6E68, 130, 80
delay 2
waitforvisualfinish
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 132, 0, 0, 1, 3
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 3
playsewithpan SE_W004, 63
end
@@ -3286,7 +3287,7 @@ Move_MILK_DRINK: @ 81CBC6E
loadspritegfx 10099
loadspritegfx 10203
loadspritegfx 10031
- monbg 1
+ monbg ANIM_BANK_TARGET
createsprite gBattleAnimSpriteTemplate_83D6C48, 2
delay 40
playsewithpan SE_W152, 192
@@ -3298,7 +3299,7 @@ Move_MILK_DRINK: @ 81CBC6E
createsprite gBattleAnimSpriteTemplate_83D7928, 3, 0, 0, 1, 0
playsewithpan SE_W208, 192
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
call Unknown_81D5F3E
waitforvisualfinish
end
@@ -3328,12 +3329,12 @@ _81CBCEE:
Move_RAPID_SPIN: @ 81CBD41
loadspritegfx 10135
loadspritegfx 10229
- monbg 0
+ monbg ANIM_BANK_ATTACKER
createsprite gBattleAnimSpriteTemplate_84023E8, 2, 0, 0, 32, -32, 40, -2
createvisualtask sub_812CDC8, 2, 0, 2, 0
loopsewithpan SE_W013B, 192, 8, 4
waitforvisualfinish
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
createvisualtask sub_80A9058, 2, 0, 1, 10, 1, 0
playsewithpan SE_W003, 63
waitforvisualfinish
@@ -3341,7 +3342,7 @@ Move_RAPID_SPIN: @ 81CBD41
createvisualtask sub_812CDC8, 2, 0, 2, 1
loopsewithpan SE_W013B, 192, 8, 4
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
end
Move_MOONLIGHT: @ 81CBDAE
@@ -3386,7 +3387,7 @@ _81CBE55:
waitforvisualfinish
delay 1
createvisualtask sub_80E4300, 2
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
delay 18
createvisualtask sub_80D1638, 2
@@ -3409,7 +3410,7 @@ _81CBE55:
waitbgfadeout
setarg 7, -1
waitbgfadein
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
delay 1
setarg 7, 4096
@@ -3422,7 +3423,7 @@ _81CBEF5:
Move_UPROAR: @ 81CBEFC
loadspritegfx 10225
loadspritegfx 10203
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
createvisualtask sub_80D2CF8, 2, 0
createsprite gBattleAnimSpriteTemplate_83D79A4, 3, 0, 0, 0, 0, 31, 8
playsewithpan SE_W253, 192
@@ -3441,7 +3442,7 @@ Move_UPROAR: @ 81CBEFC
createsprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, 24, -24, 1
createsprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, -24, -24, 0
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
Move_HEAT_WAVE: @ 81CBFC6
@@ -3552,7 +3553,7 @@ Move_CHARGE: @ 81CC1D0
loadspritegfx 10211
loadspritegfx 10212
loadspritegfx 10213
- monbg 0
+ monbg ANIM_BANK_ATTACKER
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 4, 0
waitforvisualfinish
@@ -3579,7 +3580,7 @@ Move_CHARGE: @ 81CC1D0
playsewithpan SE_W085B, 192
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 4, 4, 0, 0
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
blendoff
end
@@ -3641,7 +3642,7 @@ Move_SUPERPOWER: @ 81CC3A3
loadspritegfx 10212
loadspritegfx 10256
loadspritegfx 10257
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
monbgprio_28 0
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DA0FC, 130, 0
@@ -3666,14 +3667,14 @@ Move_SUPERPOWER: @ 81CC3A3
createvisualtask sub_80A7FA0, 2, 1, 8, 0, 16, 1
playsewithpan SE_W025B, 63
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
delay 1
end
Move_RECYCLE: @ 81CC45E
loadspritegfx 10278
- monbg 0
+ monbg ANIM_BANK_ATTACKER
setalpha 0, 16
delay 1
createsprite gBattleAnimSpriteTemplate_8402B10, 2
@@ -3683,7 +3684,7 @@ Move_RECYCLE: @ 81CC45E
playsewithpan SE_W036, 192
waitforvisualfinish
blendoff
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
delay 1
end
@@ -3694,53 +3695,53 @@ Move_BRICK_BREAK: @ 81CC492
loadspritegfx 10208
choosetwoturnanim _81CC4A7, _81CC576
_81CC4A7:
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8
delay 4
delay 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, -18, -18, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 2, -18, -18, 10, 1, 0
playsewithpan SE_W233, 63
delay 20
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 18, 18, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 2, 18, 18, 10, 1, 0
playsewithpan SE_W233, 63
delay 20
createvisualtask sub_80A8920, 2, 0, -24, 0, 24, 10, 24, 3
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 6, 0
delay 37
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 2, 0, 0, 10, 1, 0
playsewithpan SE_W233B, 63
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 6, 0, 0
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
end
_81CC576:
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8
delay 4
createsprite gBattleAnimSpriteTemplate_83DA0A0, 3, 1, 0, 0, 90, 10
delay 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, -18, -18, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 2, -18, -18, 10, 1, 0
playsewithpan SE_W233, 63
delay 20
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 18, 18, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 2, 18, 18, 10, 1, 0
playsewithpan SE_W233, 63
delay 20
createvisualtask sub_80A8920, 2, 0, -24, 0, 24, 10, 24, 3
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 6, 0
delay 37
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 2, 0, 0, 10, 1, 0
playsewithpan SE_W233B, 63
waitforvisualfinish
@@ -3752,7 +3753,7 @@ _81CC576:
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 6, 0, 0
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
end
Move_YAWN: @ 81CC697
@@ -3779,11 +3780,11 @@ Move_ENDEAVOR: @ 81CC6DA
createvisualtask sub_8079790, 5, 0, 703, 12, 1, 2
delay 6
createvisualtask sub_80A9058, 5, 0, 1, 8, 1, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 12, -12, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 130, 12, -12, 1, 2
playsewithpan SE_W003, 63
delay 24
createvisualtask sub_80A9058, 5, 0, 1, 8, 1, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, -12, 12, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 130, -12, 12, 1, 2
playsewithpan SE_W004, 63
end
@@ -3829,7 +3830,7 @@ Move_IMPRISON: @ 81CC867
loadspritegfx 10249
loadspritegfx 10250
call Unknown_81D61E7
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
createvisualtask sub_80DBE00, 5
delay 8
loopsewithpan SE_W030, 192, 8, 5
@@ -3838,13 +3839,13 @@ Move_IMPRISON: @ 81CC867
createsprite gBattleAnimSpriteTemplate_83DA8F4, 5, 0, 40
createvisualtask sub_80E1864, 5, 4, 1, 10
playsewithpan SE_W063, 192
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
call Unknown_81D61F3
end
Move_GRUDGE: @ 81CC8AA
loadspritegfx 10253
- monbg 0
+ monbg ANIM_BANK_ATTACKER
monbgprio_29
fadetobg 2
playsewithpan SE_W060, 192
@@ -3857,11 +3858,11 @@ Move_GRUDGE: @ 81CC8AA
waitforvisualfinish
restorebg
waitbgfadein
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
end
Move_CAMOUFLAGE: @ 81CC8D2
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
monbgprio_28 0
setalpha 16, 0
createvisualtask sub_80E2B74, 5, 2, 3, 0, 14
@@ -3875,12 +3876,12 @@ Move_CAMOUFLAGE: @ 81CC8D2
createvisualtask sub_80DFD24, 2, 1
waitforvisualfinish
blendoff
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
end
Move_TAIL_GLOW: @ 81CC918
loadspritegfx 10212
- monbg 0
+ monbg ANIM_BANK_ATTACKER
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 4, 0
waitforvisualfinish
@@ -3889,7 +3890,7 @@ Move_TAIL_GLOW: @ 81CC918
loopsewithpan SE_W234, 192, 16, 6
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 4, 4, 0, 0
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
blendoff
delay 1
end
@@ -3901,7 +3902,7 @@ Move_LUSTER_PURGE: @ 81CC95B
waitbgfadeout
createvisualtask sub_812C624, 5
waitbgfadein
- monbg 0
+ monbg ANIM_BANK_ATTACKER
setalpha 12, 8
playsewithpan SE_W076, 192
createsprite gBattleAnimSpriteTemplate_83DA9E0, 41, 0, 0, 0, 0
@@ -3932,7 +3933,7 @@ Move_LUSTER_PURGE: @ 81CC95B
createvisualtask sub_80E2A7C, 5, 5, 2, 16, 0, -1
createvisualtask sub_80E1864, 5, 1, 5, 14
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
blendoff
call Unknown_81D61F3
end
@@ -3945,21 +3946,21 @@ Move_MIST_BALL: @ 81CCA72
createsprite gBattleAnimSpriteTemplate_83D9D80, 128, 0, 0, 0, 0, 30, 0
waitforvisualfinish
playsewithpan SE_W028, 63
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 10, 0
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 10, 0
createsprite gBattleAnimSpriteTemplate_83DB3DC, 0, 1, 1, 1, 32279, 16, 32767, 16
delay 0
playsewithpan SE_W114, 0
createvisualtask sub_80D8414, 5
createvisualtask sub_80E2A38, 10, 4, 3, 0, 16, 32767
delay 8
- createvisualtask sub_80A7E7C, 2, 1, 4, 0, 70, 0
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 4, 0, 70, 0
delay 70
createvisualtask sub_80E2A38, 10, 4, 2, 16, 0, 32767
end
Move_FEATHER_DANCE: @ 81CCB01
loadspritegfx 10270
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_29
playsewithpan SE_W080, 63
delay 0
@@ -3976,7 +3977,7 @@ Move_FEATHER_DANCE: @ 81CCB01
delay 6
createsprite gBattleAnimSpriteTemplate_83DA498, 128, 0, -16, 96, 2, 104, 11304, 32, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
Move_TEETER_DANCE: @ 81CCBD1
@@ -4076,7 +4077,7 @@ Move_NEEDLE_ARM: @ 81CCD73
createsprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 16, 16, 16
waitforvisualfinish
createvisualtask sub_80A7FA0, 2, 1, 4, 0, 18, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 8, 1, 0
playsewithpan SE_W233B, 63
createsprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, 0, -24, 10
@@ -4102,7 +4103,7 @@ Move_CRUSH_CLAW: @ 81CCF3B
loadspritegfx 10167
loadspritegfx 10039
loadspritegfx 10208
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
delay 4
@@ -4117,7 +4118,7 @@ Move_CRUSH_CLAW: @ 81CCF3B
waitforvisualfinish
waitforvisualfinish
blendoff
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
end
Move_AROMATHERAPY: @ 81CCFAB
@@ -4127,7 +4128,7 @@ Move_AROMATHERAPY: @ 81CCFAB
loadspritegfx 10049
createsprite gBattleAnimSpriteTemplate_83DB3C4, 0, 1, 0, 0, 7, 13293
delay 1
- monbg 0
+ monbg ANIM_BANK_ATTACKER
delay 1
createsprite gBattleAnimSpriteTemplate_83D68B8, 0, 24, 16, 0, 2, 2, 0, 0
createsprite gBattleAnimSpriteTemplate_83D68B8, 66, 64, 24, 0, 3, 1, 1, 0
@@ -4141,7 +4142,7 @@ Move_AROMATHERAPY: @ 81CCFAB
createsprite gBattleAnimSpriteTemplate_83D68B8, 0, 128, 12, 0, 3, 3, 0, 0
createsprite gBattleAnimSpriteTemplate_83D68D0, 0, 90, 16, 0, 2, 1, 0, 0
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
delay 1
createsprite gBattleAnimSpriteTemplate_83DB3C4, 0, 1, 0, 7, 0, 13293
delay 1
@@ -4187,7 +4188,7 @@ Move_AIR_CUTTER: @ 81CD19D
loadspritegfx 10138
loadspritegfx 10135
delay 0
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
delay 0
createvisualtask sub_80CFB04, 2, 32, -24, 1536, 2, 128
@@ -4199,12 +4200,12 @@ Move_AIR_CUTTER: @ 81CD19D
createvisualtask sub_80A7FA0, 2, 3, 2, 0, 8, 1
waitforvisualfinish
blendoff
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
delay 0
end
Move_ODOR_SLEUTH: @ 81CD1FF
- monbg 1
+ monbg ANIM_BANK_TARGET
createvisualtask sub_81316F8, 5
delay 24
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 4
@@ -4213,7 +4214,7 @@ Move_ODOR_SLEUTH: @ 81CD1FF
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 4
playsewithpan SE_W207, 192
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
delay 1
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, -1, 16, -1, 0
playsewithpan SE_W043, 192
@@ -4277,7 +4278,7 @@ Move_TICKLE: @ 81CD33C
Move_WATER_SPOUT: @ 81CD3A8
loadspritegfx 10268
loadspritegfx 10148
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createvisualtask sub_80D40F4, 5
playsewithpan SE_W029, 192
@@ -4287,7 +4288,7 @@ Move_WATER_SPOUT: @ 81CD3A8
delay 16
createvisualtask sub_80D45D8, 5
playsewithpan SE_W057, 63
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -4296,17 +4297,17 @@ Move_SHADOW_PUNCH: @ 81CD3D6
loadspritegfx 10143
fadetobg 2
waitbgfadein
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
setalpha 9, 8
createvisualtask sub_807A69C, 2, 0, 13
playsewithpan SE_W026, 192
delay 6
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 8, 1, 0
playsewithpan SE_W004, 63
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
restorebg
waitbgfadein
@@ -4314,7 +4315,7 @@ Move_SHADOW_PUNCH: @ 81CD3D6
Move_EXTRASENSORY: @ 81CD431
call Unknown_81D61E7
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createvisualtask sub_8079790, 5, 0, 891, 12, 1, 1
createvisualtask sub_80DC2D4, 5, 0
@@ -4329,24 +4330,24 @@ Move_EXTRASENSORY: @ 81CD431
playsewithpan SE_W043, 192
waitforvisualfinish
blendoff
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
call Unknown_81D61F3
end
Move_AERIAL_ACE: @ 81CD499
loadspritegfx 10138
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createvisualtask sub_80A8500, 2, 0, 24, 6, 1, 5
createvisualtask sub_80E2DD8, 2, 0, 4, 7, 3
createsprite gBattleAnimSpriteTemplate_83D6B28, 2, 40, -32, 0
playsewithpan SE_W013B, 192
delay 5
- createvisualtask sub_80A7E7C, 2, 1, 0, 3, 10, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 10, 1
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 10, 0, 0
playsewithpan SE_W013, 63
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -4404,14 +4405,14 @@ Move_VOLT_TACKLE: @ 81CD5D9
loadspritegfx 10001
loadspritegfx 10212
loadspritegfx 10213
- monbg 0
+ monbg ANIM_BANK_ATTACKER
setalpha 12, 8
createvisualtask sub_80E2A38, 10, 1, 0, 0, 8, 0
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83D9AB4, 1
playsewithpan SE_W268, 192
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
blendoff
delay 8
createvisualtask sub_80D700C, 5, 0
@@ -4462,7 +4463,7 @@ Move_WATER_SPORT: @ 81CD6D1
Move_CALM_MIND: @ 81CD6F7
loadspritegfx 10203
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
createvisualtask sub_80E2A7C, 5, 0, 0, 0, 16, 0
waitforvisualfinish
createvisualtask sub_80E3BDC, 5, 1
@@ -4480,7 +4481,7 @@ Move_CALM_MIND: @ 81CD6F7
waitforvisualfinish
createvisualtask sub_80E2A7C, 5, 0, 0, 16, 0, 0
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
end
Move_LEAF_BLADE: @ 81CD775
@@ -4497,20 +4498,20 @@ Move_LEAF_BLADE: @ 81CD775
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
playsewithpan SE_W015, 63
waitforvisualfinish
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
delay 12
createvisualtask sub_80A7FA0, 2, 1, 8, 0, 18, 1
createsprite gBattleAnimSpriteTemplate_83DB520, 130, 0, 0, 1, 36
playsewithpan SE_W043, 63
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
Move_DRAGON_DANCE: @ 81CD7F8
loadspritegfx 10249
- monbg 0
+ monbg ANIM_BANK_ATTACKER
monbgprio_28 0
delay 1
createvisualtask sub_80DF924, 5
@@ -4528,7 +4529,7 @@ Move_DRAGON_DANCE: @ 81CD7F8
delay 30
playsewithpan SE_W100, 192
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
delay 1
end
@@ -4537,7 +4538,7 @@ Move_SHOCK_WAVE: @ 81CD867
loadspritegfx 10212
loadspritegfx 10001
loadspritegfx 10037
- monbg 0
+ monbg ANIM_BANK_ATTACKER
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 4, 0
waitforvisualfinish
@@ -4552,13 +4553,13 @@ Move_SHOCK_WAVE: @ 81CD867
createvisualtask sub_80D759C, 5
playsewithpan SE_W161B, 63
waitforvisualfinish
- createvisualtask sub_80A7E7C, 2, 1, 0, 6, 18, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 6, 18, 1
createvisualtask sub_80E2A38, 5, 1, 3, 16, 0, 32767
createvisualtask sub_80E2A38, 5, 4, 0, 16, 16, 0
delay 4
createvisualtask sub_80E2A38, 5, 4, 0, 0, 0, 0
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
blendoff
end
@@ -4602,11 +4603,11 @@ Move_BELLY_DRUM: @ 81CD91E
end
_81CD9D0:
createsprite gBattleAnimSpriteTemplate_83D7174, 3, 0
- createvisualtask sub_80A7E7C, 2, 0, 0, 8, 2, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_ATTACKER, 0, 8, 2, 1
return
_81CD9EB:
createsprite gBattleAnimSpriteTemplate_83D7174, 3, 1
- createvisualtask sub_80A7E7C, 2, 0, 0, 8, 2, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_ATTACKER, 0, 8, 2, 1
return
Move_MIND_READER: @ 81CDA06
@@ -4649,7 +4650,7 @@ _81CDA4D:
return
Move_ICE_PUNCH: @ 81CDB3E
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
loadspritegfx 10141
loadspritegfx 10135
@@ -4669,10 +4670,10 @@ Move_ICE_PUNCH: @ 81CDB3E
createsprite gBattleAnimSpriteTemplate_83D9BE0, 2, 224
delay 17
createsprite gBattleAnimSpriteTemplate_83D9FA8, 4, 0, -10, 8, 1, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, -10, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, -10, 1, 1
playsewithpan SE_W004, 63
delay 2
- createvisualtask sub_80A7E7C, 5, 1, 0, 5, 3, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 3, 1
waitforvisualfinish
delay 15
call Unknown_81D5C36
@@ -4681,7 +4682,7 @@ Move_ICE_PUNCH: @ 81CDB3E
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 7, 0, 0
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -4697,34 +4698,34 @@ Move_REST: @ 81CDC29
end
Move_CONFUSION: @ 81CDC69
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
call Unknown_81D61E7
setalpha 8, 8
createvisualtask sub_80A7FA0, 2, 0, 1, 0, 10, 1
createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767
waitforvisualfinish
playsewithpan SE_W048, 63
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 15, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 15, 1
createvisualtask sub_80A8D34, 5, -4, -4, 15, 1, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
delay 1
call Unknown_81D61F3
end
Move_PSYCHIC: @ 81CDCCA
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
call Unknown_81D61E7
setalpha 8, 8
createvisualtask sub_80A7FA0, 2, 0, 1, 0, 10, 1
createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 767
waitforvisualfinish
loopsewithpan SE_W048, 63, 10, 3
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 15, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 15, 1
createvisualtask sub_80A8D34, 5, -6, -6, 15, 1, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
delay 1
call Unknown_81D61F3
@@ -4738,7 +4739,7 @@ _81CDD32:
call Unknown_81D61F3
end
_81CDD3B:
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
playsewithpan SE_W060, 192
call Unknown_81D61E7
setalpha 8, 8
@@ -4746,23 +4747,23 @@ _81CDD3B:
createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767
createvisualtask sub_80A8D34, 5, -4, -4, 15, 0, 1
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
goto _81CDD32
Unknown_81CDD7A: @ 81CDD7A
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
playsewithpan SE_W060, 192
call Unknown_81D61E7
setalpha 8, 8
playsewithpan SE_W048, 63
waitplaysewithpan SE_W048, 63, 8
- createvisualtask sub_80A7E7C, 2, 1, 4, 0, 15, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 4, 0, 15, 1
createvisualtask sub_80A8D34, 5, -5, -5, 15, 1, 1
waitforvisualfinish
- createvisualtask sub_80A7E7C, 2, 1, 4, 0, 24, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 4, 0, 24, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
goto _81CDD32
@@ -4828,13 +4829,13 @@ Move_THUNDER_PUNCH: @ 81CDF28
loadspritegfx 10135
loadspritegfx 10143
loadspritegfx 10037
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 16, 0
waitforvisualfinish
playsewithpan SE_W004, 63
createsprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 8, 1, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
delay 1
createvisualtask sub_80E2324, 2, 257, 257, 257
delay 1
@@ -4847,13 +4848,13 @@ Move_THUNDER_PUNCH: @ 81CDF28
playsewithpan SE_W161B, 63
createvisualtask sub_80E2324, 2, 257, 257, 257
delay 2
- createvisualtask sub_80A7E7C, 2, 1, 0, 3, 15, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 15, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
delay 1
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 16, 0, 0
delay 20
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -4916,20 +4917,20 @@ Move_SACRED_FIRE: @ 81CDFF1
Move_SCRATCH: @ 81CE1D8
loadspritegfx 10137
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W010, 63
createsprite gBattleAnimSpriteTemplate_8402180, 2, 0, 0, 1, 0
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
waitforvisualfinish
end
Move_DRAGON_BREATH: @ 81CE20A
loadspritegfx 10029
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
loopsewithpan SE_W172, 192, 7, 7
createsprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
@@ -4958,12 +4959,12 @@ Move_DRAGON_BREATH: @ 81CE20A
waitforvisualfinish
createvisualtask sub_80E2A38, 10, 4, 1, 9, 0, 31
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
Move_ROAR: @ 81CE31E
loadspritegfx 10053
- monbg 0
+ monbg ANIM_BANK_ATTACKER
monbgprio_28 0
setalpha 8, 8
createvisualtask sub_812B18C, 2, 0, 2
@@ -4972,7 +4973,7 @@ Move_ROAR: @ 81CE31E
delay 20
createvisualtask sub_80A8A80, 5, 1, 2
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
blendoff
waitforvisualfinish
delay 20
@@ -5000,13 +5001,13 @@ Move_GROWL: @ 81CE3AF
Move_SNORE: @ 81CE3EA
loadspritegfx 10197
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
setalpha 8, 8
call _81CE403
delay 30
call _81CE403
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
end
_81CE403:
@@ -5088,7 +5089,7 @@ Move_BARRIER: @ 81CE57F
Move_BUBBLE: @ 81CE59C
loadspritegfx 10146
loadspritegfx 10155
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
delay 1
createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 15, -15, 10, 128, 100
@@ -5117,13 +5118,13 @@ Move_BUBBLE: @ 81CE59C
waitforvisualfinish
call Unknown_81D6069
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
Move_SMOG: @ 81CE672
loadspritegfx 10172
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_29
setalpha 12, 8
loopsewithpan SE_W054, 63, 17, 10
@@ -5140,7 +5141,7 @@ Move_SMOG: @ 81CE672
delay 10
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 15, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81CE6D7:
@@ -5150,7 +5151,7 @@ _81CE6D7:
Move_FAINT_ATTACK: @ 81CE6ED
loadspritegfx 10135
- monbg 0
+ monbg ANIM_BANK_ATTACKER
fadetobg 1
waitbgfadein
delay 0
@@ -5158,27 +5159,27 @@ Move_FAINT_ATTACK: @ 81CE6ED
createvisualtask sub_80A8500, 2, 0, 18, 6, 1, 3
createvisualtask sub_80DFC24, 2, 1
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
invisible 0
delay 1
createvisualtask sub_80E4300, 2
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
delay 1
playsewithpan SE_W233B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 9, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
delay 1
setarg 7, 4096
delay 32
createvisualtask sub_80DFDC0, 2
- monbg 0
+ monbg ANIM_BANK_ATTACKER
createvisualtask sub_80DFD24, 2, 1
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
delay 1
restorebg
waitbgfadein
@@ -5186,7 +5187,7 @@ Move_FAINT_ATTACK: @ 81CE6ED
Move_SAND_ATTACK: @ 81CE774
loadspritegfx 10074
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
monbgprio_28 0
setalpha 12, 8
playsewithpan SE_W028, 192
@@ -5200,7 +5201,7 @@ Move_SAND_ATTACK: @ 81CE774
call _81CE7C4
call _81CE7C4
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
end
_81CE7C4:
@@ -5239,14 +5240,14 @@ Move_DRAGON_RAGE: @ 81CE8BA
loadspritegfx 10029
loadspritegfx 10035
playsewithpan SE_W082, 192
- createvisualtask sub_80A7E7C, 5, 0, 0, 2, 40, 1
+ createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FF8, 130, 0, 15, 0, 0, 4
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB0D0, 130, 30, 15, 0, 10, 10
waitforvisualfinish
loopsewithpan SE_W172B, 63, 11, 3
- createvisualtask sub_80A7E7C, 5, 1, 0, 3, 25, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 25, 1
createsprite gBattleAnimSpriteTemplate_83DB078, 194, 1, 5, 0
delay 1
createsprite gBattleAnimSpriteTemplate_83DB078, 194, 1, -10, -15
@@ -5284,16 +5285,16 @@ Move_RAIN_DANCE: @ 81CE997
Move_BITE: @ 81CE9E2
loadspritegfx 10139
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W044, 63
createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, 0, -32, 0, 0, 819, 10
createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, 0, 32, 4, 0, -819, 10
delay 10
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 5, 1, 0, 4, 7, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 4, 7, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
delay 1
end
@@ -5301,7 +5302,7 @@ Move_BITE: @ 81CE9E2
Move_CRUNCH: @ 81CEA40
loadspritegfx 10139
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
fadetobg 1
waitbgfadein
setalpha 12, 8
@@ -5309,17 +5310,17 @@ Move_CRUNCH: @ 81CEA40
createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, -32, -32, 1, 819, 819, 10
createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, 32, 32, 5, -819, -819, 10
delay 10
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -8, 0, 1, 1
- createvisualtask sub_80A7E7C, 5, 1, 0, 7, 5, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 7, 5, 2
waitforvisualfinish
playsewithpan SE_W044, 63
createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, 32, -32, 7, -819, 819, 10
createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, -32, 32, 3, 819, -819, 10
delay 10
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 8, 0, 1, 1
- createvisualtask sub_80A7E7C, 5, 1, 0, 8, 4, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 8, 4, 2
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
delay 1
restorebg
@@ -5329,22 +5330,22 @@ Move_CRUNCH: @ 81CEA40
Move_CLAMP: @ 81CEAF0
loadspritegfx 10145
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W011, 63
createsprite gBattleAnimSpriteTemplate_83DB1E8, 2, -32, 0, 2, 819, 0, 10
createsprite gBattleAnimSpriteTemplate_83DB1E8, 2, 32, 0, 6, -819, 0, 10
delay 10
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 5, 1, 3, 0, 5, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 5, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
waitforvisualfinish
end
Move_ICE_BEAM: @ 81CEB4D
- monbg 1
+ monbg ANIM_BANK_TARGET
monbgprio_28 1
setalpha 12, 8
loadspritegfx 10141
@@ -5377,7 +5378,7 @@ Move_ICE_BEAM: @ 81CEB4D
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 7, 0, 0
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
_81CEC4E:
@@ -5436,13 +5437,13 @@ _81CED71:
waitforvisualfinish
end
_81CED73:
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
setalpha 12, 8
createvisualtask sub_80E1F8C, 2, 2, 1, 4, 0, 11, 12287
playsewithpan SE_W025, 192
call _81CED9D
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
goto _81CED71
_81CED9D:
@@ -5520,7 +5521,7 @@ _81CEF42:
Move_BLIZZARD: @ 81CEFBA
loadspritegfx 10141
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
createvisualtask sub_80E3B4C, 2
jumpargeq 7, 1, _81CF13F
fadetobg 9
@@ -5536,7 +5537,7 @@ _81CEFD0:
waitforvisualfinish
call Unknown_81D5CBA
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
delay 20
restorebg
waitbgfadeout
@@ -5572,7 +5573,7 @@ _81CF13F:
Move_POWDER_SNOW: @ 81CF146
loadspritegfx 10141
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 31, 1, 0, 3, 0
waitforvisualfinish
panse_1B SE_W016, 192, 63, 2, 0
@@ -5583,7 +5584,7 @@ Move_POWDER_SNOW: @ 81CF146
waitsound
call Unknown_81D5CBA
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
delay 20
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 31, 1, 3, 0, 0
end
@@ -5607,17 +5608,17 @@ _81CF190:
Move_HYDRO_PUMP: @ 81CF240
loadspritegfx 10149
loadspritegfx 10148
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
- createvisualtask sub_80A7E7C, 5, 0, 0, 2, 40, 1
+ createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1
delay 6
panse_1B SE_W056, 192, 63, 2, 0
createvisualtask sub_80D3630, 5, 100
call _81CF2DF
call _81CF2DF
call _81CF2DF
- createvisualtask sub_80A7E7C, 5, 1, 3, 0, 37, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 37, 1
call _81CF320
call _81CF2DF
call _81CF2DF
@@ -5635,7 +5636,7 @@ Move_HYDRO_PUMP: @ 81CF240
delay 1
call _81CF320
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81CF2DF:
@@ -5655,7 +5656,7 @@ Move_SIGNAL_BEAM: @ 81CF33F
loadspritegfx 10264
loadspritegfx 10265
loadspritegfx 10073
- createvisualtask sub_80A7E7C, 5, 0, 0, 2, 25, 1
+ createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 25, 1
delay 6
panse_1B SE_W062, 192, 63, 1, 0
createvisualtask sub_80D3630, 5, 100
@@ -5665,7 +5666,7 @@ Move_SIGNAL_BEAM: @ 81CF33F
call _81CF406
call _81CF406
call _81CF406
- createvisualtask sub_80A7E7C, 5, 1, 3, 0, 25, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 25, 1
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 4, 8, 5, 31, 8, 961, 8
call _81CF406
call _81CF406
@@ -5696,15 +5697,15 @@ Move_ABSORB: @ 81CF427
loadspritegfx 10147
loadspritegfx 10031
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_2A 1
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 4, 13293
waitforvisualfinish
playsewithpan SE_W071, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
delay 2
- createvisualtask sub_80A7E7C, 5, 1, 0, 5, 5, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1
waitforvisualfinish
delay 3
call _81CF496
@@ -5714,7 +5715,7 @@ Move_ABSORB: @ 81CF427
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 4, 0, 13293
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81CF496:
@@ -5748,15 +5749,15 @@ Move_MEGA_DRAIN: @ 81CF53F
loadspritegfx 10147
loadspritegfx 10031
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_2A 1
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 8, 13293
waitforvisualfinish
playsewithpan SE_W071, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
delay 2
- createvisualtask sub_80A7E7C, 5, 1, 0, 5, 5, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1
waitforvisualfinish
delay 3
call _81CF5AE
@@ -5766,7 +5767,7 @@ Move_MEGA_DRAIN: @ 81CF53F
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 8, 0, 13293
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81CF5AE:
@@ -5808,15 +5809,15 @@ Move_GIGA_DRAIN: @ 81CF6CF
loadspritegfx 10147
loadspritegfx 10031
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_2A 1
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 12, 13293
waitforvisualfinish
playsewithpan SE_W071, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
delay 2
- createvisualtask sub_80A7E7C, 5, 1, 0, 5, 5, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1
waitforvisualfinish
delay 3
call _81CF73E
@@ -5826,7 +5827,7 @@ Move_GIGA_DRAIN: @ 81CF6CF
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 12, 0, 13293
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81CF73E:
@@ -5878,16 +5879,16 @@ Move_LEECH_LIFE: @ 81CF8D7
delay 1
loadspritegfx 10031
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_2A 1
setalpha 12, 8
delay 1
createsprite gBattleAnimSpriteTemplate_83DAB10, 2, -20, 15, 12
waitforvisualfinish
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
playsewithpan SE_W071, 63
delay 2
- createvisualtask sub_80A7E7C, 5, 1, 0, 5, 5, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 7, 0
waitforvisualfinish
@@ -5898,7 +5899,7 @@ Move_LEECH_LIFE: @ 81CF8D7
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 7, 0, 0
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -5943,7 +5944,7 @@ Move_SLUDGE: @ 81CF9F2
playsewithpan SE_W145C, 192
createsprite gBattleAnimSpriteTemplate_83DA2B8, 130, 20, 0, 40, 0
waitforvisualfinish
- createvisualtask sub_80A7E7C, 5, 1, 3, 0, 5, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 5, 1
createvisualtask sub_80E1F8C, 2, 4, 1, 2, 0, 12, 31774
call Unknown_81D5F87
waitforvisualfinish
@@ -5994,7 +5995,7 @@ _81CFB44:
Move_ACID: @ 81CFB5A
loadspritegfx 10150
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
createsprite gBattleAnimSpriteTemplate_83DA2D0, 130, 20, 0, 40, 1, 0, 0
playsewithpan SE_W145C, 192
delay 5
@@ -6022,66 +6023,66 @@ Move_ACID: @ 81CFB5A
createsprite gBattleAnimSpriteTemplate_83DA31C, 130, 27, -22, 0, 15, 50
playsewithpan SE_W145, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
Move_BONEMERANG: @ 81CFC54
loadspritegfx 10000
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
playsewithpan SE_W155, 192
createsprite gBattleAnimSpriteTemplate_83DB2C8, 2
delay 20
playsewithpan SE_W030, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 1
- createvisualtask sub_80A7E7C, 5, 1, 5, 0, 5, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 5, 1
delay 17
playsewithpan SE_W233, 192
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, -4
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_BONE_CLUB: @ 81CFCA8
loadspritegfx 10000
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
playsewithpan SE_W155, 63
createsprite gBattleAnimSpriteTemplate_83DB2E0, 2, -42, -25, 0, 0, 15
delay 12
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 1
- createvisualtask sub_80A7E7C, 5, 1, 0, 5, 5, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 5, 1, 0, 10, 0, 0
playsewithpan SE_W233B, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_BONE_RUSH: @ 81CFD0A
loadspritegfx 10000
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W155, 63
createsprite gBattleAnimSpriteTemplate_83DB2E0, 2, -42, -25, 0, 0, 15
delay 12
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 5, 1, 0, 3, 5, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 5, 1
playsewithpan SE_W030, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_SPIKES: @ 81CFD55
loadspritegfx 10152
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
playsewithpan SE_W026, 192
waitplaysewithpan SE_W030, 63, 28
createsprite gBattleAnimSpriteTemplate_840227C, 130, 20, 0, 0, 24, 30
@@ -6093,13 +6094,13 @@ Move_SPIKES: @ 81CFD55
waitplaysewithpan SE_W030, 63, 28
createsprite gBattleAnimSpriteTemplate_840227C, 130, 20, 0, 24, 24, 30
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
Move_MEGAHORN: @ 81CFDAC
loadspritegfx 10153
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
playsewithpan SE_W082, 192
jumpifcontest _81CFE83
fadetobg 7
@@ -6108,7 +6109,7 @@ Move_MEGAHORN: @ 81CFDAC
_81CFDCF:
waitbgfadein
setalpha 12, 8
- createvisualtask sub_80A7E7C, 5, 0, 2, 0, 15, 1
+ createvisualtask AnimTask_ShakeMon, 5, 0, 2, 0, 15, 1
waitforvisualfinish
delay 10
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 6
@@ -6116,7 +6117,7 @@ _81CFDCF:
createsprite gBattleAnimSpriteTemplate_83DAABC, 3, -42, 25, 0, 0, 6
delay 4
playsewithpan SE_W011, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -16, 4, 1, 4
waitforvisualfinish
createvisualtask sub_80A8154, 2, 1, -4, 1, 12, 1
@@ -6127,7 +6128,7 @@ _81CFDCF:
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 7
waitforvisualfinish
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
restorebg
waitbgfadeout
@@ -6143,7 +6144,7 @@ _81CFE83:
Move_GUST: @ 81CFE9A
loadspritegfx 10009
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
playsewithpan SE_W016, 63
@@ -6151,17 +6152,17 @@ Move_GUST: @ 81CFE9A
createvisualtask sub_80DA09C, 5, 1, 70
waitforvisualfinish
createvisualtask sub_80A7FA0, 5, 1, 1, 0, 7, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
playsewithpan SE_W016B, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_WING_ATTACK: @ 81CFEEB
loadspritegfx 10009
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
loopsewithpan SE_W017, 192, 20, 2
@@ -6172,13 +6173,13 @@ Move_WING_ATTACK: @ 81CFEEB
delay 24
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 9
delay 17
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 16, 0, 1, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -16, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1
loopsewithpan SE_W003, 63, 5, 2
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 11
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -6193,21 +6194,21 @@ Move_PECK: @ 81CFF88
Move_AEROBLAST: @ 81CFFAF
loadspritegfx 10154
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
call Unknown_81D61FB
monbgprio_28 1
setalpha 12, 8
call _81D000B
- createvisualtask sub_80A7E7C, 5, 1, 5, 0, 50, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 50, 1
call _81D000B
call _81D000B
call _81D000B
call _81D000B
waitforvisualfinish
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
playsewithpan SE_W013, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
delay 0
call Unknown_81D622B
@@ -6234,7 +6235,7 @@ _81D000B:
Move_WATER_GUN: @ 81D00CC
loadspritegfx 10155
loadspritegfx 10148
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83D9318, 2, 20, 0, 0, 0, 40, -25
@@ -6251,14 +6252,14 @@ Move_WATER_GUN: @ 81D00CC
createsprite gBattleAnimSpriteTemplate_83D9330, 2, -15, -10, 0, 10, 45
playsewithpan SE_W152, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_CRABHAMMER: @ 81D0159
loadspritegfx 10141
loadspritegfx 10148
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DB4D8, 4, 0, 0, 1, 0
playsewithpan SE_W233B, 63
@@ -6271,7 +6272,7 @@ Move_CRABHAMMER: @ 81D0159
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 4
waitforvisualfinish
loopsewithpan SE_W152, 63, 20, 3
- createvisualtask sub_80A7E7C, 5, 1, 0, 4, 8, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 4, 8, 1
createsprite gBattleAnimSpriteTemplate_83D9348, 2, 10, 10, 20, 1
delay 4
createsprite gBattleAnimSpriteTemplate_83D9348, 2, 20, -20, 20, 1
@@ -6288,7 +6289,7 @@ Move_CRABHAMMER: @ 81D0159
delay 4
createsprite gBattleAnimSpriteTemplate_83D9348, 2, -16, 0, 20, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -6301,17 +6302,17 @@ Move_SURF: @ 81D0253
Move_FLAMETHROWER: @ 81D0267
loadspritegfx 10029
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
- createvisualtask sub_80A7E7C, 5, 0, 0, 2, 46, 1
+ createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1
delay 6
createvisualtask sub_80D3630, 5, 100
panse_1B SE_W053, 192, 63, 2, 0
call _81D02E1
call _81D02E1
call _81D02E1
- createvisualtask sub_80A7E7C, 5, 1, 3, 0, 43, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 43, 1
call _81D02E1
call _81D02E1
call _81D02E1
@@ -6321,7 +6322,7 @@ Move_FLAMETHROWER: @ 81D0267
call _81D02E1
call _81D02E1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81D02E1:
@@ -6353,20 +6354,20 @@ Move_SANDSTORM: @ 81D0304
Move_WHIRLPOOL: @ 81D038C
loadspritegfx 10149
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
delay 0
createsprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 0, 7, 23968
playsewithpan SE_W250, 63
- createvisualtask sub_80A7E7C, 5, 1, 0, 2, 50, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 50, 1
call _81D03E4
call _81D03E4
call _81D03E4
delay 12
createsprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 7, 0, 23968
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
_81D03E4:
createsprite gBattleAnimSpriteTemplate_83DACB8, 130, 0, 28, 384, 50, 8, 50, 1
@@ -6395,16 +6396,16 @@ _81D0480:
createsprite gBattleAnimSpriteTemplate_83DA450, 2, 0, 0, 13, 336
goto _81D047E
_81D0498:
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W104, 192
createsprite gBattleAnimSpriteTemplate_83DA468, 2, 20
delay 20
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
playsewithpan SE_W013, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
goto _81D047E
@@ -6419,40 +6420,40 @@ _81D04E9:
createsprite gBattleAnimSpriteTemplate_83DA568, 2, 0, 0
goto _81D04E8
_81D04FD:
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W207, 63
createsprite gBattleAnimSpriteTemplate_83DA594, 131
delay 7
playsewithpan SE_W025B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 0
- createvisualtask sub_80A7E7C, 5, 1, 0, 5, 11, 1
+ createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 11, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
goto _81D04E8
Move_KARATE_CHOP: @ 81D053C
loadspritegfx 10143
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
playsewithpan SE_W104, 63
createsprite gBattleAnimSpriteTemplate_83D9F78, 2, -16, 0, 0, 0, 10, 1, 3, 0
waitforvisualfinish
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 5, 1, 4, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_CROSS_CHOP: @ 81D058E
loadspritegfx 10143
loadspritegfx 10285
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W025, 63
createsprite gBattleAnimSpriteTemplate_83D9FD8, 2, 0, 0, 0
@@ -6461,34 +6462,34 @@ Move_CROSS_CHOP: @ 81D058E
playsewithpan SE_W013, 63
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 32767, 10, 0, 10
createsprite gBattleAnimSpriteTemplate_83DB520, 3, 0, 0, 1, 20
- createvisualtask sub_80A7E7C, 5, 1, 7, 0, 9, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 7, 0, 9, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_JUMP_KICK: @ 81D05F7
loadspritegfx 10143
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
delay 3
createsprite gBattleAnimSpriteTemplate_83D9F90, 2, -16, 8, 0, 0, 10, 1, 1, 1
playsewithpan SE_W026, 63
waitforvisualfinish
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 1, 0, 0, 1, 1
- createvisualtask sub_80A7E7C, 5, 1, 5, 0, 7, 1
+ createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1
playsewithpan SE_W004, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_HI_JUMP_KICK: @ 81D0654
loadspritegfx 10143
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, -24, 0, 0, 8
waitforvisualfinish
@@ -6498,7 +6499,7 @@ Move_HI_JUMP_KICK: @ 81D0654
createsprite gBattleAnimSpriteTemplate_83D9F90, 2, -16, 8, 0, 0, 10, 1, 1, 1
playsewithpan SE_W026, 63
waitforvisualfinish
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1
playsewithpan SE_W233B, 63
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -28, 0, 0, 3
delay 3
@@ -6507,28 +6508,28 @@ Move_HI_JUMP_KICK: @ 81D0654
delay 5
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_DOUBLE_KICK: @ 81D06EA
loadspritegfx 10143
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83D9FC0, 3, 1, 20, 1
- createvisualtask sub_80A7E7C, 5, 1, 4, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1
playsewithpan SE_W233B, 63
waitforvisualfinish
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_TRIPLE_KICK: @ 81D071D
loadspritegfx 10143
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W233B, 63
jumpifmoveturn 0, _81D0742
@@ -6536,23 +6537,23 @@ Move_TRIPLE_KICK: @ 81D071D
goto _81D07AE
_81D073D:
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81D0742:
createsprite gBattleAnimSpriteTemplate_83D9FA8, 132, -16, -8, 20, 1, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, -16, -16, 1, 2
- createvisualtask sub_80A7E7C, 5, 1, 4, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, -16, -16, 1, 2
+ createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1
goto _81D073D
_81D0778:
createsprite gBattleAnimSpriteTemplate_83D9FA8, 132, 8, 8, 20, 1, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 8, 0, 1, 2
- createvisualtask sub_80A7E7C, 5, 1, 4, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 8, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1
goto _81D073D
_81D07AE:
createsprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 20, 1, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, -8, 1, 1
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, -8, 1, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
goto _81D073D
Move_DYNAMIC_PUNCH: @ 81D07E4
@@ -6561,12 +6562,12 @@ Move_DYNAMIC_PUNCH: @ 81D07E4
loadspritegfx 10198
loadspritegfx 10007
delay 1
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W233B, 63
createsprite gBattleAnimSpriteTemplate_83D9FA8, 131, 0, 0, 20, 1, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 0
- createvisualtask sub_80A7E7C, 5, 1, 5, 0, 7, 1
+ createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0
+ createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1
delay 1
waitsound
playsewithpan SE_W120, 63
@@ -6585,52 +6586,52 @@ Move_DYNAMIC_PUNCH: @ 81D07E4
playsewithpan SE_W120, 63
createsprite gBattleAnimSpriteTemplate_83D7828, 3, 16, 16, 1, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_COUNTER: @ 81D08AC
loadspritegfx 10135
loadspritegfx 10143
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createvisualtask sub_80A8500, 2, 0, 18, 6, 1, 4
playsewithpan SE_W233, 192
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4
delay 4
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -15, 18, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, -15, 18, 1, 0
playsewithpan SE_W233B, 63
delay 1
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 25, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 25, 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 3, -15, 18, 8, 1, 0
delay 3
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, -4, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, -4, 1, 0
playsewithpan SE_W233B, 63
delay 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 3, 0, -4, 8, 1, 0
delay 3
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 15, 9, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 15, 9, 1, 0
playsewithpan SE_W233B, 63
delay 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 3, 15, 9, 8, 1, 0
delay 5
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_VITAL_THROW: @ 81D097B
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W233, 192
createvisualtask sub_80A8500, 2, 0, 12, 4, 1, 2
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4
delay 2
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
playsewithpan SE_W233B, 63
delay 1
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -24, 0, 0, 4
@@ -6640,7 +6641,7 @@ Move_VITAL_THROW: @ 81D097B
delay 11
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 10
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -6648,13 +6649,13 @@ Move_ROCK_SMASH: @ 81D09F6
loadspritegfx 10058
loadspritegfx 10135
loadspritegfx 10143
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
delay 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
createsprite gBattleAnimSpriteTemplate_83D9FA8, 2, 0, 0, 8, 1, 0
playsewithpan SE_W233B, 63
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 5, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 5, 1
waitforvisualfinish
playsewithpan SE_W088, 63
createsprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, 0, 20, 24, 14, 2
@@ -6665,15 +6666,15 @@ Move_ROCK_SMASH: @ 81D09F6
createsprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, 0, 30, -18, 8, 2
createsprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, 0, -30, 18, 8, 2
createsprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, 0, -30, -18, 8, 2
- createvisualtask sub_80A7E7C, 2, 1, 0, 3, 7, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 7, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_SUBMISSION: @ 81D0AEE
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W104, 192
waitplaysewithpan SE_W004, 63, 10
@@ -6691,21 +6692,21 @@ Move_SUBMISSION: @ 81D0AEE
call _81D0B5D
call _81D0B5D
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81D0B5D:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, -12, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, -12, 1, 1
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, -12, 8, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, -12, 8, 1, 1
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 12, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 12, 0, 1, 1
delay 8
return
Move_SUNNY_DAY: @ 81D0B91
loadspritegfx 10157
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
setalpha 13, 3
createvisualtask sub_80E2A38, 10, 1921, 1, 0, 6, 32767
waitforvisualfinish
@@ -6717,7 +6718,7 @@ Move_SUNNY_DAY: @ 81D0B91
waitforvisualfinish
createvisualtask sub_80E2A38, 10, 1921, 1, 6, 0, 32767
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
end
_81D0BDD:
@@ -6727,14 +6728,14 @@ _81D0BDD:
Move_COTTON_SPORE: @ 81D0BE7
loadspritegfx 10158
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
loopsewithpan SE_W077, 63, 18, 10
call _81D0C07
call _81D0C07
call _81D0C07
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
_81D0C07:
createsprite gBattleAnimSpriteTemplate_83D63F8, 2, 0, -20, 85, 80, 0
@@ -6747,7 +6748,7 @@ _81D0C07:
Move_SPORE: @ 81D0C41
loadspritegfx 10158
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createvisualtask sub_80CACEC, 2
loopsewithpan SE_W077, 63, 16, 11
@@ -6756,7 +6757,7 @@ Move_SPORE: @ 81D0C41
call _81D0C6C
waitforvisualfinish
delay 1
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81D0C6C:
@@ -6771,7 +6772,7 @@ _81D0C6C:
Move_PETAL_DANCE: @ 81D0CA6
loadspritegfx 10159
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W080, 192
createvisualtask sub_80A8500, 2, 0, 12, 6, 6, 3
@@ -6796,13 +6797,13 @@ Move_PETAL_DANCE: @ 81D0CA6
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 5
delay 3
playsewithpan SE_W025B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 0
- createvisualtask sub_80A7E7C, 2, 1, 6, 0, 8, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 6, 0, 8, 1
waitforvisualfinish
delay 8
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 7
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -6810,7 +6811,7 @@ Move_RAZOR_LEAF: @ 81D0DDE
loadspritegfx 10063
loadspritegfx 10160
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
delay 1
loopsewithpan SE_W077, 192, 10, 5
@@ -6842,14 +6843,14 @@ Move_RAZOR_LEAF: @ 81D0DDE
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
createvisualtask sub_80A7FA0, 2, 3, 2, 0, 8, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_ANCIENT_POWER: @ 81D0EE5
loadspritegfx 10058
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DB428, 2, 4, 1, 10, 1
createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 20, 32, -48, 50, 2
@@ -6870,12 +6871,12 @@ Move_ANCIENT_POWER: @ 81D0EE5
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 16, 0, 0, 4
delay 3
playsewithpan SE_W120, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 6, 1
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 7
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -6898,7 +6899,7 @@ Move_OCTAZOOKA: @ 81D100D
Move_MIST: @ 81D1073
loadspritegfx 10144
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
setalpha 12, 8
loopsewithpan SE_W054, 192, 20, 15
call _81D10BE
@@ -6911,7 +6912,7 @@ Move_MIST: @ 81D1073
delay 32
createvisualtask sub_80E1F8C, 2, 10, 8, 2, 0, 14, 32767
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
end
_81D10BE:
@@ -6933,7 +6934,7 @@ Move_FIRE_PUNCH: @ 81D1107
loadspritegfx 10143
loadspritegfx 10029
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createvisualtask sub_80E2A38, 10, 4, 2, 0, 9, 31
createsprite gBattleAnimSpriteTemplate_83D9478, 129, 0
@@ -6943,15 +6944,15 @@ Move_FIRE_PUNCH: @ 81D1107
playsewithpan SE_W172, 63
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83D9FA8, 131, 0, 0, 8, 1, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 1
- createvisualtask sub_80A7E7C, 2, 1, 0, 3, 15, 1
+ createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 15, 1
call _81D11A2
delay 4
playsewithpan SE_W007, 63
waitforvisualfinish
createvisualtask sub_80E2A38, 10, 4, 0, 9, 0, 31
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81D11A2:
@@ -6966,7 +6967,7 @@ _81D11A2:
Move_LEER: @ 81D121A
loadspritegfx 10027
- monbg 0
+ monbg ANIM_BANK_ATTACKER
monbgprio_28 0
setalpha 8, 8
playsewithpan SE_W043, 192
@@ -6977,7 +6978,7 @@ Move_LEER: @ 81D121A
createvisualtask sub_80A7FA0, 2, 1, 1, 0, 9, 1
createvisualtask sub_80A7FA0, 2, 3, 1, 0, 9, 1
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
blendoff
delay 1
waitforvisualfinish
@@ -6986,23 +6987,23 @@ Move_LEER: @ 81D121A
Move_DREAM_EATER: @ 81D1271
loadspritegfx 10147
loadspritegfx 10031
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_2A 1
playsewithpan SE_W060, 192
call Unknown_81D61E7
setalpha 8, 8
playsewithpan SE_W107, 63
- createvisualtask sub_80A7E7C, 2, 1, 5, 0, 15, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 15, 1
createvisualtask sub_80A8D34, 5, -6, -6, 15, 1, 1
waitforvisualfinish
setalpha 12, 8
- createvisualtask sub_80A7E7C, 2, 1, 0, 2, 25, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 2, 25, 1
call _81D12DB
waitforvisualfinish
delay 15
call Unknown_81D5EF5
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
delay 1
call Unknown_81D61F3
@@ -7054,7 +7055,7 @@ Move_POISON_GAS: @ 81D1474
loadspritegfx 10172
loadspritegfx 10150
delay 0
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_29
setalpha 12, 8
delay 0
@@ -7080,7 +7081,7 @@ Move_POISON_GAS: @ 81D1474
createvisualtask sub_80E1F8C, 2, 4, 6, 2, 0, 12, 26650
waitforvisualfinish
blendoff
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
delay 0
end
@@ -7198,7 +7199,7 @@ Move_STEEL_WING: @ 81D1807
loopsewithpan SE_W231, 192, 28, 2
createvisualtask sub_80E0A4C, 5, 0, 0, 0
waitforvisualfinish
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
loopsewithpan SE_W017, 192, 20, 2
@@ -7209,13 +7210,13 @@ Move_STEEL_WING: @ 81D1807
delay 24
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 9
delay 17
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 16, 0, 1, 1
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -16, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1
playsewithpan SE_W013, 63
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 11
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -7224,16 +7225,16 @@ Move_IRON_TAIL: @ 81D18B6
loopsewithpan SE_W231, 192, 28, 2
createvisualtask sub_80E0A4C, 5, 1, 0, 0
waitforvisualfinish
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
delay 6
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, 63
waitforvisualfinish
createvisualtask sub_80E0E24, 5, 0, 1
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
waitforvisualfinish
end
@@ -7244,16 +7245,16 @@ Move_POISON_TAIL: @ 81D1914
loopsewithpan SE_W231, 192, 28, 2
createvisualtask sub_80E0A4C, 5, 1, 1, 23768
waitforvisualfinish
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
delay 6
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, 63
waitforvisualfinish
createvisualtask sub_80E0E24, 5, 0, 1
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
call Unknown_81D5F87
waitforvisualfinish
@@ -7281,7 +7282,7 @@ Move_METAL_CLAW: @ 81D197A
end
Move_NIGHT_SHADE: @ 81D1A0D
- monbg 0
+ monbg ANIM_BANK_ATTACKER
monbgprio_28 0
playsewithpan SE_W060, 192
fadetobg 2
@@ -7293,7 +7294,7 @@ Move_NIGHT_SHADE: @ 81D1A0D
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 12, 1
createvisualtask sub_80E1F8C, 2, 4, 0, 2, 0, 13, 0
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
delay 1
restorebg
waitbgfadein
@@ -7372,7 +7373,7 @@ _81D1BA3:
end
_81D1BCF:
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
loopsewithpan SE_W036, 192, 9, 2
createvisualtask sub_80E2A38, 10, 2, 2, 0, 11, 31
@@ -7383,27 +7384,27 @@ _81D1BCF:
createvisualtask sub_80A8154, 2, 0, 2, 0, 12, 1
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 16, 1
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 1, 18, -8, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 1, 18, -8, 1, 1
delay 5
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 1, -18, 8, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 1, -18, 8, 1, 1
delay 5
playsewithpan SE_W004, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 1, -8, -5, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 1, -8, -5, 1, 1
waitforvisualfinish
delay 5
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 7
waitforvisualfinish
createvisualtask sub_80E2A38, 10, 2, 2, 11, 0, 31
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
Move_STRING_SHOT: @ 81D1C98
loadspritegfx 10179
loadspritegfx 10180
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
delay 0
createsprite gBattleAnimSpriteTemplate_83DB3C4, 5, 1, 2, 0, 9, 0
waitforvisualfinish
@@ -7434,7 +7435,7 @@ Move_STRING_SHOT: @ 81D1C98
delay 4
createsprite gBattleAnimSpriteTemplate_83DAB40, 130, 0, 22
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
delay 1
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 5, 1, 2, 9, 0, 0
@@ -7447,7 +7448,7 @@ _81D1D56:
Move_SPIDER_WEB: @ 81D1D6A
loadspritegfx 10181
loadspritegfx 10180
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
delay 0
createsprite gBattleAnimSpriteTemplate_83DB3C4, 5, 1, 2, 0, 9, 0
waitforvisualfinish
@@ -7471,7 +7472,7 @@ Move_SPIDER_WEB: @ 81D1D6A
playsewithpan SE_W081B, 63
createsprite gBattleAnimSpriteTemplate_83DAB74, 2
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
delay 1
createsprite gBattleAnimSpriteTemplate_83DB3C4, 5, 1, 2, 9, 0, 0
end
@@ -7497,7 +7498,7 @@ _81D1E16:
_81D1E66:
loadspritegfx 10154
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W013B, 192
createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, 8, 0, 0, 22, 2, 1
@@ -7512,13 +7513,13 @@ _81D1E66:
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 10, 1
createvisualtask sub_80A7FA0, 2, 3, 2, 0, 10, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
goto _81D1E14
Move_DISABLE: @ 81D1EF1
loadspritegfx 10071
- monbg 1
+ monbg ANIM_BANK_TARGET
monbgprio_28 1
setalpha 8, 8
playsewithpan SE_W197, 192
@@ -7528,14 +7529,14 @@ Move_DISABLE: @ 81D1EF1
loopsewithpan SE_W020, 63, 15, 4
waitforvisualfinish
delay 1
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
Move_RECOVER: @ 81D1F1F
loadspritegfx 10147
loadspritegfx 10031
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
setalpha 12, 8
loopsewithpan SE_W025, 192, 13, 3
createvisualtask sub_80E1F8C, 2, 2, 0, 6, 0, 11, 12287
@@ -7543,7 +7544,7 @@ Move_RECOVER: @ 81D1F1F
call _81D1F5F
call _81D1F5F
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
delay 1
call Unknown_81D5EF5
@@ -7606,7 +7607,7 @@ Move_CURSE: @ 81D207B
_81D2084:
loadspritegfx 10199
loadspritegfx 10200
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
createvisualtask sub_80DECB0, 5
waitforvisualfinish
delay 20
@@ -7618,16 +7619,16 @@ _81D2084:
delay 41
call _81D20EB
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
delay 1
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
playsewithpan SE_W171, 63
createsprite gBattleAnimSpriteTemplate_83DAF38, 130
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 14, 1
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 16, 0, 0
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
_81D20EB:
createvisualtask sub_80A7FA0, 2, 0, 4, 0, 10, 0
@@ -7650,9 +7651,9 @@ Move_SOFT_BOILED: @ 81D213B
loadspritegfx 10202
loadspritegfx 10203
loadspritegfx 10031
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
playsewithpan SE_W039, 192
- createvisualtask sub_80A7E7C, 2, 0, 0, 2, 6, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_ATTACKER, 0, 2, 6, 1
createsprite gBattleAnimSpriteTemplate_83D78BC, 4, 0, 16, 0
createsprite gBattleAnimSpriteTemplate_83D78BC, 4, 0, 16, 1
delay 120
@@ -7665,7 +7666,7 @@ Move_SOFT_BOILED: @ 81D213B
delay 60
setarg 7, -1
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
call Unknown_81D5F3E
end
@@ -7964,7 +7965,7 @@ _81D29D6:
waitbgfadeout
createsprite gBattleAnimSpriteTemplate_840233C, 130
waitbgfadein
- createvisualtask sub_80A7E7C, 3, 1, 0, 10, 10, 1
+ createvisualtask AnimTask_ShakeMon, 3, 1, 0, 10, 10, 1
playsewithpan SE_W043, 63
delay 20
restorebg
@@ -8033,7 +8034,7 @@ Move_TRI_ATTACK: @ 81D2A0F
Move_WILL_O_WISP: @ 81D2B83
loadspritegfx 10232
loadspritegfx 10231
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_2A 1
playsewithpan SE_W052, 192
waitplaysewithpan SE_W052, 192, 10
@@ -8058,7 +8059,7 @@ Move_WILL_O_WISP: @ 81D2B83
createsprite gBattleAnimSpriteTemplate_83D977C, 2, 168
createsprite gBattleAnimSpriteTemplate_83D977C, 2, 210
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
Move_ENCORE: @ 81D2C41
@@ -8104,8 +8105,8 @@ Move_TRICK: @ 81D2CE8
playsewithpan SE_W104, 0
delay 16
playsewithpan SE_W213, 0
- createvisualtask sub_80A7E7C, 3, 0, 5, 0, 7, 2
- createvisualtask sub_80A7E7C, 3, 1, 5, 0, 7, 2
+ createvisualtask AnimTask_ShakeMon, 3, 0, 5, 0, 7, 2
+ createvisualtask AnimTask_ShakeMon, 3, 1, 5, 0, 7, 2
waitforvisualfinish
end
@@ -8238,12 +8239,12 @@ _81D3045:
goto _81D2FF2
Move_TRANSFORM: @ 81D3054
- monbg 0
+ monbg ANIM_BANK_ATTACKER
playsewithpan SE_W100, 192
waitplaysewithpan SE_W107, 192, 48
createvisualtask sub_812D7E8, 2, 0
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
end
Move_MORNING_SUN: @ 81D306C
@@ -8326,7 +8327,7 @@ Move_HYPER_BEAM: @ 81D31EA
waitforvisualfinish
delay 30
createsoundtask sub_812B058, 247, -64, 63, 1, 15, 0, 5
- createvisualtask sub_80A7E7C, 2, 0, 0, 4, 50, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_ATTACKER, 0, 4, 50, 1
createvisualtask sub_80E21A8, 2, 10147, 1, 12, 31, 16, 0, 0
call _81D331B
call _81D331B
@@ -8412,7 +8413,7 @@ _81D3415:
return
Move_ROLE_PLAY: @ 81D3428
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
createvisualtask sub_80E2A38, 10, 4, 2, 0, 16, 32767
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 10, 0
waitforvisualfinish
@@ -8420,7 +8421,7 @@ Move_ROLE_PLAY: @ 81D3428
waitplaysewithpan SE_W197, 192, 30
createvisualtask sub_812EFC8, 2
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
createvisualtask sub_80E2A38, 10, 4, 2, 16, 0, 32767
delay 8
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 10, 0, 0
@@ -8444,20 +8445,20 @@ Move_BLAZE_KICK: @ 81D34C8
loadspritegfx 10135
loadspritegfx 10143
loadspritegfx 10029
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W172, 63
createsprite gBattleAnimSpriteTemplate_83DA024, 131, 0, 0, 1, 30
createvisualtask sub_80E2A38, 10, 4, 2, 0, 7, 32767
delay 30
playsewithpan SE_W007, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0
createvisualtask sub_80A7FA0, 2, 1, 3, 0, 14, 1
createvisualtask sub_80E2A38, 10, 4, 2, 0, 0, 32767
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0
call _81D11A2
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -8482,7 +8483,7 @@ _81D3562:
Move_SAND_TOMB: @ 81D35D2
loadspritegfx 10074
createsprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 0, 7, 563
- createvisualtask sub_80A7E7C, 5, 1, 0, 2, 43, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 43, 1
playsewithpan SE_W328, 63
call _81D361F
call _81D361F
@@ -8512,13 +8513,13 @@ Move_SHEER_COLD: @ 81D36AA
playsewithpan SE_W196, 0
waitbgfadein
loadspritegfx 10010
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
createvisualtask sub_807B920, 2
waitplaysewithpan SE_W258, 63, 17
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
restorebg
waitbgfadein
@@ -8540,15 +8541,15 @@ Move_ARM_THRUST: @ 81D36CF
playsewithpan SE_W003, 63
choosetwoturnanim _81D373C, _81D3750
_81D3728:
- createvisualtask sub_80A7E7C, 5, 1, 4, 0, 6, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1
waitforvisualfinish
blendoff
end
_81D373C:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, 8, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2
goto _81D3728
_81D3750:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, -8, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 130, -8, 0, 1, 2
goto _81D3728
Move_MUDDY_WATER: @ 81D3764
@@ -8587,7 +8588,7 @@ Move_DRAGON_CLAW: @ 81D380C
loadspritegfx 10039
playsewithpan SE_W221B, 192
createvisualtask sub_80E2A38, 10, 2, 4, 0, 8, 639
- createvisualtask sub_80A7E7C, 5, 0, 0, 2, 15, 1
+ createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 15, 1
call _81D39E9
call _81D39E9
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
@@ -8646,17 +8647,17 @@ Unknown_81D3A74: @ 81D3A74
Move_MUD_SHOT: @ 81D3A75
loadspritegfx 10259
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
- createvisualtask sub_80A7E7C, 5, 0, 0, 2, 46, 1
+ createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1
delay 6
createvisualtask sub_80D3630, 5, 100
panse_1B SE_W250, 192, 63, 1, 0
call _81D3AEF
call _81D3AEF
call _81D3AEF
- createvisualtask sub_80A7E7C, 5, 1, 3, 0, 43, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 43, 1
call _81D3AEF
call _81D3AEF
call _81D3AEF
@@ -8666,7 +8667,7 @@ Move_MUD_SHOT: @ 81D3A75
call _81D3AEF
call _81D3AEF
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81D3AEF:
@@ -8692,7 +8693,7 @@ Move_METEOR_MASH: @ 81D3B12
createsprite gBattleAnimSpriteTemplate_8402A3C, 131, -80, -64, 40, 32, 30
delay 20
playsewithpan SE_W233B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
createvisualtask sub_80A7FA0, 2, 1, 5, 0, 20, 1
waitforvisualfinish
delay 10
@@ -8703,7 +8704,7 @@ Move_METEOR_MASH: @ 81D3B12
Move_REVENGE: @ 81D3B99
loadspritegfx 10245
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W036, 192
createsprite gBattleAnimSpriteTemplate_83DA198, 2, 10, -10
@@ -8726,7 +8727,7 @@ Move_REVENGE: @ 81D3B99
createsprite gBattleAnimSpriteTemplate_83DB550, 131, 10, 8, 1, 1, 8
playsewithpan SE_W025B, 63
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -8736,7 +8737,7 @@ Move_POISON_FANG: @ 81D3C30
playsewithpan SE_W044, 63
createsprite gBattleAnimSpriteTemplate_840233C, 130
delay 10
- createvisualtask sub_80A7E7C, 3, 1, 3, 0, 10, 1
+ createvisualtask AnimTask_ShakeMon, 3, 1, 3, 0, 10, 1
waitforvisualfinish
createvisualtask sub_80E1F8C, 2, 4, 0, 4, 0, 12, 26650
call Unknown_81D5F87
@@ -8751,7 +8752,7 @@ Move_SUBSTITUTE: @ 81D3C6F
Move_FRENZY_PLANT: @ 81D3C7B
loadspritegfx 10223
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
monbgprio_28 1
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DB3C4, 0, 1, 2, 0, 5, 0
@@ -8783,34 +8784,34 @@ Move_FRENZY_PLANT: @ 81D3C7B
createsprite gBattleAnimSpriteTemplate_83D6670, 2, 85, -16, -6, 0, 2, 75
playsewithpan SE_W010, 63
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -10, 1, 3
+ createsprite gBasicHitSplatSpriteTemplate, 2, -10, -10, 1, 3
playsewithpan SE_W003, 63
- createvisualtask sub_80A7E7C, 3, 1, 8, 0, 20, 1
+ createvisualtask AnimTask_ShakeMon, 3, 1, 8, 0, 20, 1
delay 3
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, 8, 1, 3
+ createsprite gBasicHitSplatSpriteTemplate, 2, 10, 8, 1, 3
playsewithpan SE_W003, 63
delay 3
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, -3, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 10, -3, 1, 2
playsewithpan SE_W003, 63
delay 3
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -3, 1, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, -3, 1, 1, 2
playsewithpan SE_W003, 63
delay 2
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, 1, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, -10, 1, 1, 1
playsewithpan SE_W003, 63
delay 2
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 10, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 10, 1, 1
playsewithpan SE_W003, 63
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 0, 1, 2, 5, 0, 0
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
Move_METAL_SOUND: @ 81D3E1F
loadspritegfx 10260
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_2A 1
createvisualtask sub_80A7FA0, 2, 0, 2, 0, 8, 1
call _81D3E52
@@ -8818,7 +8819,7 @@ Move_METAL_SOUND: @ 81D3E1F
call _81D3E52
call _81D3E52
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
delay 0
waitforvisualfinish
end
@@ -8844,26 +8845,26 @@ _81D3E76:
jumpargeq 7, 1, _81D3F28
_81D3EA4:
waitbgfadein
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W207, 63
createsprite gBattleAnimSpriteTemplate_83DA214, 130
delay 10
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 0
- createvisualtask sub_80A7E7C, 5, 1, 8, 0, 24, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0
+ createvisualtask AnimTask_ShakeMon, 5, 1, 8, 0, 24, 1
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, 2, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 10, 2, 1, 0
playsewithpan SE_W233B, 63
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, -6, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 10, -6, 1, 0
playsewithpan SE_W233B, 63
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 8, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 8, 1, 0
playsewithpan SE_W025B, 63
waitforvisualfinish
restorebg
waitbgfadein
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
goto _81D3E74
_81D3F21:
@@ -8878,7 +8879,7 @@ _81D3F2F:
Move_RETURN: @ 81D3F36
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createvisualtask sub_81318F0, 2
delay 2
@@ -8888,7 +8889,7 @@ Move_RETURN: @ 81D3F36
jumpargeq 7, 3, _81D4139
_81D3F67:
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81D3F6C:
@@ -8898,7 +8899,7 @@ _81D3F6C:
createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 16, 1, 0
createvisualtask sub_812B340, 5, 167, -64
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
createvisualtask sub_812B30C, 5, 139, 63
goto _81D3F67
_81D3FBE:
@@ -8911,7 +8912,7 @@ _81D3FBE:
delay 11
createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 5, 4
delay 6
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2
createvisualtask sub_812B30C, 5, 141, 63
goto _81D3F67
_81D401E:
@@ -8927,21 +8928,21 @@ _81D401E:
createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0
createvisualtask sub_812B340, 5, 167, -64
waitforvisualfinish
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
createvisualtask sub_812B30C, 5, 123, 63
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, 10, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 2
createvisualtask sub_812B30C, 5, 123, 63
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 3, -5, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2
createvisualtask sub_812B30C, 5, 123, 63
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -5, 3, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 2
createvisualtask sub_812B30C, 5, 123, 63
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
goto _81D3F67
_81D4139:
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 0, 6, 0
@@ -8949,56 +8950,56 @@ _81D4139:
createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 16, 1, 0
createvisualtask sub_812B340, 5, 167, -64
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 3, -5, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2
createvisualtask sub_812B30C, 5, 123, 63
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 12, 1, 0
createvisualtask sub_812B340, 5, 167, -64
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
createvisualtask sub_812B30C, 5, 123, 63
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
waitforvisualfinish
delay 4
createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 8, 1, 0
createvisualtask sub_812B340, 5, 167, -64
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
createvisualtask sub_812B30C, 5, 123, 63
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
waitforvisualfinish
delay 2
createvisualtask sub_80E2DD8, 2, 0, 4, 5, 1
createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 4, 1, 0
createvisualtask sub_812B340, 5, 167, -64
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
createvisualtask sub_812B30C, 5, 123, 63
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
createvisualtask sub_80E2DD8, 2, 0, 4, 5, 1
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 4, 2, 0
createvisualtask sub_812B340, 5, 167, -64
delay 5
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2
createvisualtask sub_812B30C, 5, 123, 63
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
createvisualtask sub_80E2DD8, 2, 0, 4, 5, 1
waitforvisualfinish
call _81D4371
call _81D4371
call _81D4371
call _81D4371
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0
createvisualtask sub_812B30C, 5, 141, 63
- createvisualtask sub_80A7E7C, 5, 1, 8, 0, 24, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 8, 0, 24, 1
delay 6
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, 10, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 0
createvisualtask sub_812B30C, 5, 141, 63
delay 6
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 3, -5, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 0
createvisualtask sub_812B30C, 5, 141, 63
delay 6
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, -5, 3, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 0
createvisualtask sub_812B30C, 5, 141, 63
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 6, 0, 0
@@ -9006,9 +9007,9 @@ _81D4139:
_81D4371:
createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 4, 3, 0
createvisualtask sub_812B340, 5, 167, -64
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
createvisualtask sub_812B30C, 5, 123, 63
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
createvisualtask sub_80E2DD8, 2, 0, 4, 5, 1
waitforvisualfinish
return
@@ -9041,7 +9042,7 @@ Move_COSMIC_POWER: @ 81D43C5
Move_BLAST_BURN: @ 81D444A
loadspritegfx 10035
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W221, 192
createsprite gBattleAnimSpriteTemplate_83D9538, 2, -32, 0, 24, 0, 0, 0
@@ -9058,7 +9059,7 @@ Move_BLAST_BURN: @ 81D444A
createsprite gBattleAnimSpriteTemplate_83D9538, 6, -40, -20, 24, 0, 0, 0
createsprite gBattleAnimSpriteTemplate_83D9538, 70, 0, -32, 24, 0, 0, 0
createsprite gBattleAnimSpriteTemplate_83D9538, 70, 40, -20, 24, 0, 0, 0
- createvisualtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
createsprite gBattleAnimSpriteTemplate_83D9538, 66, 64, 0, 24, 0, 0, 0
createsprite gBattleAnimSpriteTemplate_83D9538, 66, 40, 20, 24, 0, 0, 0
createsprite gBattleAnimSpriteTemplate_83D9538, 2, 0, 32, 24, 0, 0, 0
@@ -9070,8 +9071,8 @@ Move_BLAST_BURN: @ 81D444A
createsprite gBattleAnimSpriteTemplate_83D9538, 6, -60, -30, 24, 0, 0, 0
createsprite gBattleAnimSpriteTemplate_83D9538, 70, 0, -48, 24, 0, 0, 0
createsprite gBattleAnimSpriteTemplate_83D9538, 70, 60, -30, 24, 0, 0, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, -4, 3, 1, 0
- createvisualtask sub_80A7E7C, 5, 1, 12, 0, 20, 1
+ createsprite gBasicHitSplatSpriteTemplate, 130, -4, 3, 1, 0
+ createvisualtask AnimTask_ShakeMon, 5, 1, 12, 0, 20, 1
createvisualtask sub_80E26BC, 2, 2, 0, 10, 1
createsprite gBattleAnimSpriteTemplate_83D9538, 66, 96, 0, 24, 0, 0, 0
createsprite gBattleAnimSpriteTemplate_83D9538, 66, 60, 30, 24, 0, 0, 0
@@ -9079,7 +9080,7 @@ Move_BLAST_BURN: @ 81D444A
createsprite gBattleAnimSpriteTemplate_83D9538, 2, -60, 30, 24, 0, 0, 0
createvisualtask sub_80E2324, 2, 257, 257, 257
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -9110,7 +9111,7 @@ Move_ROCK_TOMB: @ 81D468C
delay 24
playsewithpan SE_W063, 63
createsprite gBattleAnimSpriteTemplate_83DA8F4, 133, 1, 50
- createvisualtask sub_80A7E7C, 5, 1, 3, 0, 20, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 20, 1
createvisualtask sub_80E26BC, 2, 2, 0, 10, 1
waitforvisualfinish
end
@@ -9120,7 +9121,7 @@ Move_SILVER_WIND: @ 81D4773
panse_1B SE_W016, 192, 63, 2, 0
playsewithpan SE_W234, 0
delay 0
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_29
delay 0
createvisualtask sub_80E2A7C, 10, 1, 0, 0, 4, 0
@@ -9158,7 +9159,7 @@ _81D47BA:
createsprite gBattleAnimSpriteTemplate_83D696C, 194, -16, 12, 192, 5, 2, 3, 1
waitforvisualfinish
playsewithpan SE_W016B, 63
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
delay 0
restorebg
waitbgfadeout
@@ -9201,7 +9202,7 @@ _81D49F2:
_81D4A09:
loadspritegfx 10148
loadspritegfx 10155
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W153, 63
createsprite gBattleAnimSpriteTemplate_83DA614, 131, 1
@@ -9214,7 +9215,7 @@ _81D4A09:
call _81C9502
waitforvisualfinish
visible 0
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81D4A48:
@@ -9230,10 +9231,10 @@ Move_ROCK_BLAST: @ 81D4A5F
playsewithpan SE_W207, 192
createsprite gBattleAnimSpriteTemplate_83DADE8, 130, 16, 0, 0, 0, 25, 257
waitforvisualfinish
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1
playsewithpan SE_W088, 63
createsprite gBattleAnimSpriteTemplate_83DAC64, 130, 0, 0, 20, 24, 14, 2
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 5, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 5, 1
createsprite gBattleAnimSpriteTemplate_83DAC64, 130, 5, 0, -20, 24, 14, 1
createsprite gBattleAnimSpriteTemplate_83DAC64, 130, 0, 5, 20, -24, 14, 2
createsprite gBattleAnimSpriteTemplate_83DAC64, 130, -5, 0, -20, -24, 14, 2
@@ -9243,7 +9244,7 @@ Move_ROCK_BLAST: @ 81D4A5F
Move_OVERHEAT: @ 81D4AFC
loadspritegfx 10029
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 18
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 5, 28
waitforvisualfinish
@@ -9255,7 +9256,7 @@ Move_OVERHEAT: @ 81D4AFC
createvisualtask sub_80E4028, 5, 1, 0
delay 1
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 2, 1, 0, 13, 28
- createvisualtask sub_80A7E7C, 5, 0, 2, 0, 15, 1
+ createvisualtask AnimTask_ShakeMon, 5, 0, 2, 0, 15, 1
waitforvisualfinish
playsewithpan SE_W172B, 192
createsprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 0, 30, 25, -20
@@ -9286,28 +9287,28 @@ Move_OVERHEAT: @ 81D4AFC
createsprite gBattleAnimSpriteTemplate_83DB100, 66, 1, 224, 30, 25, 10
delay 5
waitforvisualfinish
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, -5, 3, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 131, -5, 3, 1, 0
playsewithpan SE_W007, 63
- createvisualtask sub_80A7E7C, 2, 1, 10, 0, 25, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 10, 0, 25, 1
delay 6
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 8, -5, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 131, 8, -5, 1, 0
playsewithpan SE_W007, 63
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 10, 10, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 131, 10, 10, 1, 0
playsewithpan SE_W007, 63
delay 8
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 0
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 0
playsewithpan SE_W007, 63
createvisualtask sub_80E4178, 5, 1
delay 1
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 2, -1, 0, 13, 19026
- createvisualtask sub_80A7E7C, 5, 0, 3, 0, 15, 1
+ createvisualtask AnimTask_ShakeMon, 5, 0, 3, 0, 15, 1
waitforvisualfinish
createvisualtask sub_80E40D0, 5, 0, 1
delay 1
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 5, 0, 28
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
waitforvisualfinish
delay 15
@@ -9320,7 +9321,7 @@ Move_OVERHEAT: @ 81D4AFC
Move_HYDRO_CANNON: @ 81D4DDE
loadspritegfx 10149
loadspritegfx 10148
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_W057, 192
createsprite gBattleAnimSpriteTemplate_83D92D0, 130
@@ -9329,7 +9330,7 @@ Move_HYDRO_CANNON: @ 81D4DDE
delay 30
panse_1B SE_W056, 192, 63, 2, 0
call _81D4EA8
- createvisualtask sub_80A7E7C, 5, 1, 10, 0, 40, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 10, 0, 40, 1
createsprite gBattleAnimSpriteTemplate_83DB4D8, 130, 0, 0, 1, 0
call _81D4EA8
createsprite gBattleAnimSpriteTemplate_83DB4D8, 130, 0, 0, 1, 0
@@ -9344,7 +9345,7 @@ Move_HYDRO_CANNON: @ 81D4DDE
waitforvisualfinish
createvisualtask sub_80E2324, 2, 257, 257, 257
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81D4EA8:
@@ -9376,7 +9377,7 @@ Move_SEISMIC_TOSS: @ 81D4F58
loadspritegfx 10135
loadspritegfx 10058
setarg 7, 0
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
waitforvisualfinish
createvisualtask sub_80DDA4C, 3
@@ -9396,7 +9397,7 @@ _81D4FA0:
waitbgfadeout
setarg 7, 4095
waitbgfadein
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
_81D4FAB:
@@ -9421,18 +9422,18 @@ _81D4FD4:
call _81D4FF3
goto _81D4FA0
_81D4FF3:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, -10, -8, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, -10, -8, 1, 1
playsewithpan SE_W070, 63
- createvisualtask sub_80A7E7C, 2, 1, 0, 3, 5, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 5, 1
createsprite gBattleAnimSpriteTemplate_83DAE00, 130, -12, 27, 2, 3
createsprite gBattleAnimSpriteTemplate_83DAE00, 130, 8, 28, 3, 4
createsprite gBattleAnimSpriteTemplate_83DAE00, 130, -4, 30, 2, 3
createsprite gBattleAnimSpriteTemplate_83DAE00, 130, 12, 25, 4, 4
return
_81D5054:
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 10, -8, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 10, -8, 1, 1
playsewithpan SE_W088, 63
- createvisualtask sub_80A7E7C, 2, 1, 0, 3, 5, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 5, 1
createsprite gBattleAnimSpriteTemplate_83DAE00, 130, -12, 32, 3, 4
createsprite gBattleAnimSpriteTemplate_83DAE00, 130, 8, 31, 2, 2
createsprite gBattleAnimSpriteTemplate_83DAE00, 130, -4, 28, 2, 3
@@ -9452,7 +9453,7 @@ Move_MAGIC_COAT: @ 81D50B5
Move_WATER_PULSE: @ 81D50D2
loadspritegfx 10155
loadspritegfx 10288
- monbg 1
+ monbg ANIM_BANK_TARGET
monbgprio_28 1
playsewithpan SE_W145C, 192
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 0, 7, 29472
@@ -9473,16 +9474,16 @@ Move_WATER_PULSE: @ 81D50D2
playsewithpan SE_W202, 192
createsprite gBattleAnimSpriteTemplate_83D757C, 130, 0, 0, 40, 15
delay 13
- createvisualtask sub_80A7E7C, 2, 1, 0, 8, 18, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 8, 18, 1
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 7, 0, 29472
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
Move_PSYCHO_BOOST: @ 81D51C7
loadspritegfx 10212
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
fadetobg 3
waitbgfadeout
createvisualtask sub_812C624, 5
@@ -9493,7 +9494,7 @@ Move_PSYCHO_BOOST: @ 81D51C7
monbgprio_28 0
setalpha 8, 8
delay 10
- createvisualtask sub_80A7E7C, 2, 0, 3, 0, 240, 0
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_ATTACKER, 3, 0, 240, 0
loopsewithpan SE_W060B, 192, 14, 10
createsprite gBattleAnimSpriteTemplate_83DAA68, 2
delay 110
@@ -9502,7 +9503,7 @@ Move_PSYCHO_BOOST: @ 81D51C7
createvisualtask sub_80A7FA0, 2, 1, -8, 1, 24, 1
playsewithpan SE_W043, 63
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
call Unknown_81D61F3
end
@@ -9516,7 +9517,7 @@ Move_KNOCK_OFF: @ 81D523B
createsprite gBattleAnimSpriteTemplate_8402AE4, 130, -16, -16
delay 8
createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 5, 1, 32767, 10, 0, 0
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2
playsewithpan SE_W004, 63
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -12, 10, 0, 3
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5
@@ -9531,7 +9532,7 @@ Move_KNOCK_OFF: @ 81D523B
Move_DOOM_DESIRE: @ 81D52CB
createvisualtask sub_80E0EE8, 2
delay 1
- monbg 2
+ monbg ANIM_BANK_ATK_PARTNER
createvisualtask sub_80E0E24, 5, 1, 0
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 4, 0
waitforvisualfinish
@@ -9543,7 +9544,7 @@ Move_DOOM_DESIRE: @ 81D52CB
createvisualtask sub_80E0E24, 5, 1, 1
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 4, 0, 0
waitforvisualfinish
- clearmonbg 2
+ clearmonbg ANIM_BANK_ATK_PARTNER
blendoff
end
@@ -9582,7 +9583,7 @@ Unknown_81D532F: @ 81D532F
Move_SKY_UPPERCUT: @ 81D53ED
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
fadetobg 17
waitbgfadeout
@@ -9595,20 +9596,20 @@ Move_SKY_UPPERCUT: @ 81D53ED
delay 4
createvisualtask sub_80A7FA0, 2, 1, 4, 0, 6, 1
playsewithpan SE_W233B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, -28, 28, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, -28, 28, 1, 1
delay 1
playsewithpan SE_W233B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, -15, 8, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, -15, 8, 1, 1
playsewithpan SE_W233B, 63
delay 1
playsewithpan SE_W233B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, -5, -12, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, -5, -12, 1, 1
delay 1
playsewithpan SE_W233B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, -32, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 0, -32, 1, 1
delay 1
playsewithpan SE_W233B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 5, -52, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, 131, 5, -52, 1, 1
createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -26, 16, 1, 4
delay 4
createvisualtask sub_80A8154, 2, 1, 0, 3, 6, 1
@@ -9616,7 +9617,7 @@ Move_SKY_UPPERCUT: @ 81D53ED
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 6
delay 4
createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
restorebg
waitbgfadeout
@@ -9641,7 +9642,7 @@ Move_TWISTER: @ 81D553A
loadspritegfx 10063
loadspritegfx 10135
loadspritegfx 10058
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
playsewithpan SE_W239, 63
createsprite gBattleAnimSpriteTemplate_83D64B4, 130, 120, 70, 5, 70, 30
@@ -9665,7 +9666,7 @@ Move_TWISTER: @ 81D553A
createsprite gBattleAnimSpriteTemplate_83D64B4, 130, 20, 255, 15, 32, 0
createsprite gBattleAnimSpriteTemplate_83D64B4, 130, 110, 10, 8, 32, 20
waitforvisualfinish
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, -32, -16, 1, 3
+ createsprite gBasicHitSplatSpriteTemplate, 131, -32, -16, 1, 3
playsewithpan SE_W004, 63
createvisualtask sub_80A8154, 2, 1, 3, 0, 12, 1
createvisualtask sub_80A8154, 2, 3, 3, 0, 12, 1
@@ -9676,10 +9677,10 @@ Move_TWISTER: @ 81D553A
createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 3
playsewithpan SE_W004, 63
delay 4
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 131, 32, 20, 1, 3
+ createsprite gBasicHitSplatSpriteTemplate, 131, 32, 20, 1, 3
playsewithpan SE_W004, 63
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -9687,7 +9688,7 @@ Move_MAGICAL_LEAF: @ 81D5699
loadspritegfx 10063
loadspritegfx 10160
loadspritegfx 10135
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
delay 1
loopsewithpan SE_W077, 192, 10, 5
@@ -9717,13 +9718,13 @@ Move_MAGICAL_LEAF: @ 81D5699
createsprite gBattleAnimSpriteTemplate_83D64E4, 131, 20, -10, 20, 0, 32, -20, 0
delay 30
playsewithpan SE_W013, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 132, -10, -4, 1, 2
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 132, 10, 4, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 132, -10, -4, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 132, 10, 4, 1, 2
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
delay 20
setarg 7, -1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -9840,8 +9841,8 @@ _81D59F4:
createsprite gBattleAnimSpriteTemplate_83930C0, 130, -30, -100, 25, 1, 0, 0
waitforvisualfinish
playsewithpan SE_W025B, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 132, -10, 0, 1, 2
- createvisualtask sub_80A7E7C, 2, 1, 0, 3, 8, 1
+ createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 8, 1
waitforvisualfinish
end
_81D5A31:
@@ -9856,7 +9857,7 @@ _81D5A31:
playsewithpan SE_W172, 63
waitforvisualfinish
playsewithpan SE_W172B, 63
- createvisualtask sub_80A7E7C, 2, 1, 0, 3, 8, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 8, 1
waitforvisualfinish
end
_81D5A95:
@@ -9870,7 +9871,7 @@ _81D5A95:
createsprite gBattleAnimSpriteTemplate_83D9438, 130, -30, -100, 25, 1, 0, 0
playsewithpan SE_W152, 63
waitforvisualfinish
- createvisualtask sub_80A7E7C, 2, 1, 0, 3, 8, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 8, 1
playsewithpan SE_W202, 63
waitforvisualfinish
end
@@ -9913,13 +9914,13 @@ _81D5B99:
PoundCopy: @ 81D5C05
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W003, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -10262,32 +10263,32 @@ StatusCondition_Paralysis: @ 81D6335
StatusCondition_Ice: @ 81D634F
playsewithpan SE_W196, 0
loadspritegfx 10010
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
waitplaysewithpan SE_W258, 63, 17
createvisualtask sub_807B920, 2
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
StatusCondition_Curse: @ 81D636A
loadspritegfx 10200
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
playsewithpan SE_W171, 63
createsprite gBattleAnimSpriteTemplate_83DAF38, 130
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 14, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
StatusCondition_Nightmare: @ 81D638F
loadspritegfx 10221
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
playsewithpan SE_W171, 63
createsprite gBattleAnimSpriteTemplate_83DAF50, 130
createvisualtask sub_80A7FA0, 2, 1, 2, 0, 14, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
General_CastformChange: @ 81D63B4
@@ -10295,12 +10296,12 @@ General_CastformChange: @ 81D63B4
jumpargeq 7, 1, _81D63E0
goto _81D63C8
_81D63C8:
- monbg 0
+ monbg ANIM_BANK_ATTACKER
playsewithpan SE_W100, 192
waitplaysewithpan SE_W107, 192, 48
createvisualtask sub_812D7E8, 2, 1
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
end
_81D63E0:
createvisualtask sub_812DB58, 2, 1
@@ -10312,12 +10313,12 @@ General_StatsChange: @ 81D63EA
end
General_SubstituteFade: @ 81D63F3
- monbg 0
+ monbg ANIM_BANK_ATTACKER
createvisualtask sub_81416C4, 5
createvisualtask sub_80E2A38, 10, 2, 0, 0, 16, 32767
waitforvisualfinish
delay 1
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
delay 2
blendoff
createvisualtask sub_80E2A38, 10, 2, 0, 0, 0, 32767
@@ -10369,7 +10370,7 @@ _81D64B5:
_81D64FD:
loadspritegfx 10029
playsewithpan SE_W221B, 63
- createvisualtask sub_80A7E7C, 5, 1, 0, 2, 30, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1
call _81C90BF
call _81C90BF
waitforvisualfinish
@@ -10377,41 +10378,41 @@ _81D64FD:
end
_81D6522:
loadspritegfx 10149
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
monbgprio_28 1
setalpha 12, 8
delay 0
createsprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 0, 7, 23968
playsewithpan SE_W250, 63
- createvisualtask sub_80A7E7C, 5, 1, 0, 2, 30, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1
call _81D03E4
call _81D03E4
delay 12
createsprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 7, 0, 23968
waitforvisualfinish
stopsound
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
end
_81D6576:
loadspritegfx 10145
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W011, 63
createsprite gBattleAnimSpriteTemplate_83DB1E8, 2, -32, 0, 2, 819, 0, 10
createsprite gBattleAnimSpriteTemplate_83DB1E8, 2, 32, 0, 6, -819, 0, 10
delay 10
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 5, 1, 3, 0, 5, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 5, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
waitforvisualfinish
end
_81D65D3:
loadspritegfx 10074
createsprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 0, 7, 563
- createvisualtask sub_80A7E7C, 5, 1, 0, 2, 30, 1
+ createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1
playsewithpan SE_W328, 63
call _81D361F
call _81D361F
@@ -10445,7 +10446,7 @@ General_ItemEffect: @ 81D661C
General_SmokeballEscape: @ 81D6690
loadspritegfx 10242
- monbg 0
+ monbg ANIM_BANK_ATTACKER
setalpha 12, 4
delay 0
playsewithpan SE_BOWA2, 63
@@ -10476,7 +10477,7 @@ General_SmokeballEscape: @ 81D6690
delay 0
createsprite gBattleAnimSpriteTemplate_8402894, 118, 3, 0, 0, 46
waitforvisualfinish
- clearmonbg 0
+ clearmonbg ANIM_BANK_ATTACKER
invisible 0
delay 0
blendoff
@@ -10522,13 +10523,13 @@ General_LeechSeedDrain: @ 81D6813
General_MonHit: @ 81D6821
loadspritegfx 10135
- monbg 1
+ monbg ANIM_BANK_TARGET
setalpha 12, 8
playsewithpan SE_W003, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
- createvisualtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
+ createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1
waitforvisualfinish
- clearmonbg 1
+ clearmonbg ANIM_BANK_TARGET
blendoff
end
@@ -10565,18 +10566,18 @@ _81D68C5:
General_FutureSightHit: @ 81D68D5
createvisualtask sub_80E42B0, 2
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
playsewithpan SE_W060, 192
call Unknown_81D61E7
setalpha 8, 8
playsewithpan SE_W048, 63
waitplaysewithpan SE_W048, 63, 8
- createvisualtask sub_80A7E7C, 2, 1, 4, 0, 15, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 4, 0, 15, 1
createvisualtask sub_80A8D34, 5, -5, -5, 15, 1, 1
waitforvisualfinish
- createvisualtask sub_80A7E7C, 2, 1, 4, 0, 24, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 4, 0, 24, 1
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
waitforvisualfinish
delay 1
@@ -10633,7 +10634,7 @@ General_FocusPunchSetUp: @ 81D69F9
General_IngrainHeal: @ 81D6A39
loadspritegfx 10147
loadspritegfx 10031
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 4, 13293
waitforvisualfinish
@@ -10645,7 +10646,7 @@ General_IngrainHeal: @ 81D6A39
waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 4, 0, 13293
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
end
@@ -10719,13 +10720,13 @@ _81D6B5C:
_81D6B65:
loadspritegfx 10135
delay 25
- monbg 3
+ monbg ANIM_BANK_DEF_PARTNER
setalpha 12, 8
delay 0
playsewithpan SE_W003, 63
- createsprite gBattleAnimSpriteTemplate_83DB4A8, 130, -4, -20, 1, 2
+ createsprite gBasicHitSplatSpriteTemplate, 130, -4, -20, 1, 2
waitforvisualfinish
- clearmonbg 3
+ clearmonbg ANIM_BANK_DEF_PARTNER
blendoff
goto _81D6B5C
diff --git a/include/battle_anim.h b/include/battle_anim.h
index fd1becf39..ce9bb13de 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -9,14 +9,6 @@
#define REG_BG2CNT_BITFIELD REG_BGnCNT_BITFIELD(2)
#define REG_BG3CNT_BITFIELD REG_BGnCNT_BITFIELD(3)
-enum
-{
- ANIM_BANK_ATTACKER,
- ANIM_BANK_TARGET,
- ANIM_BANK_ATK_PARTNER,
- ANIM_BANK_DEF_PARTNER,
-};
-
struct BattleAnimBackground
{
void *image;
@@ -51,7 +43,7 @@ extern struct DisableStruct *gAnimDisableStructPtr;
void DoMoveAnim(u16 move);
void LaunchBattleAnimation(const u8 *const moveAnims[], u16 b, u8 c);
bool8 IsAnimBankSpriteVisible(u8 a);
-void sub_8076034(u8, u8);
+void MoveBattlerSpriteToBG(u8, u8);
bool8 IsContest(void);
void ClearBattleAnimationVars(void);
void DestroyAnimSprite(struct Sprite *sprite);
diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h
new file mode 100644
index 000000000..c173a8730
--- /dev/null
+++ b/include/constants/battle_anim.h
@@ -0,0 +1,9 @@
+#ifndef GUARD_BATTLEANIM_CONSTANTS_H
+#define GUARD_BATTLEANIM_CONSTANTS_H
+
+#define ANIM_BANK_ATTACKER 0
+#define ANIM_BANK_TARGET 1
+#define ANIM_BANK_ATK_PARTNER 2
+#define ANIM_BANK_DEF_PARTNER 3
+
+#endif
diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index 1c88dc23e..674ae5188 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -14,7 +14,7 @@
extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG1_Y;
extern u16 gBattle_BG2_X;
@@ -69,7 +69,7 @@ static void sub_80DFC9C(u8 taskId)
gTasks[taskId].data[2] = 0;
if (r2 == 16)
{
- gSprites[gObjectBankIDs[gAnimBankAttacker]].invisible = 1;
+ gSprites[gBankSpriteIds[gAnimBankAttacker]].invisible = 1;
DestroyAnimVisualTask(taskId);
}
}
@@ -792,13 +792,13 @@ static void sub_80E08CC(u8 priority)
void sub_80E0918(u8 taskId)
{
u8 toBG2 = GetBankIdentity_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0;
- sub_8076034(gAnimBankAttacker, toBG2);
- gSprites[gObjectBankIDs[gAnimBankAttacker]].invisible = 0;
+ MoveBattlerSpriteToBG(gAnimBankAttacker, toBG2);
+ gSprites[gBankSpriteIds[gAnimBankAttacker]].invisible = 0;
if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
{
- sub_8076034(gAnimBankAttacker ^ 2, toBG2 ^ 1);
- gSprites[gObjectBankIDs[gAnimBankAttacker ^ 2]].invisible = 0;
+ MoveBattlerSpriteToBG(gAnimBankAttacker ^ 2, toBG2 ^ 1);
+ gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].invisible = 0;
}
DestroyAnimVisualTask(taskId);
@@ -851,7 +851,7 @@ void sub_80E0A4C(u8 taskId)
{
if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2) == TRUE)
{
- gSprites[gObjectBankIDs[gAnimBankAttacker ^ 2]].oam.priority--;
+ gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority--;
REG_BG1CNT_BITFIELD.priority = 1;
var0 = 1;
}
@@ -937,7 +937,7 @@ static void sub_80E0CD0(u8 taskId)
if (gTasks[taskIdCopy].data[6] == 1)
{
- gSprites[gObjectBankIDs[gAnimBankAttacker ^ 2]].oam.priority++;
+ gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority++;
}
DestroyAnimVisualTask(taskIdCopy);
@@ -985,7 +985,7 @@ void sub_80E0E24(u8 taskId)
{
bank = GetBankByIdentity(identity);
if (IsAnimBankSpriteVisible(bank))
- spriteId = gObjectBankIDs[bank];
+ spriteId = gBankSpriteIds[bank];
else
spriteId = 0xFF;
}
diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c
index bf39e01c0..4f25cf1a5 100644
--- a/src/battle/anim/dragon.c
+++ b/src/battle/anim/dragon.c
@@ -19,7 +19,7 @@ extern u8 gBankAttacker;
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG2_X;
extern u16 gUnknown_03000730[];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
// Outrage
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index b20813fcb..160b51274 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -11,7 +11,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gBankAttacker;
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u8 gBanksBySide[];
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG1_Y;
@@ -24,7 +24,7 @@ extern u16 gBattle_WIN0V;
extern u16 gBattlePartyID[];
extern u8 gAnimMoveTurn;
-extern struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4A8;
+extern struct SpriteTemplate gBasicHitSplatSpriteTemplate;
static void sub_80D927C(struct Sprite *sprite);
static void sub_80D9328(struct Sprite *sprite);
@@ -122,7 +122,7 @@ void sub_80D90F4(struct Sprite *sprite)
sprite->pos1.y += y;
sprite->data[0] = gBattleAnimArgs[1];
- sprite->data[7] = CreateSprite(&gBattleAnimSpriteTemplate_83DB4A8, sprite->pos1.x, sprite->pos1.y, sprite->subpriority + 1);
+ sprite->data[7] = CreateSprite(&gBasicHitSplatSpriteTemplate, sprite->pos1.x, sprite->pos1.y, sprite->subpriority + 1);
if (sprite->data[7] != 64)
{
StartSpriteAffineAnim(&gSprites[sprite->data[7]], 0);
diff --git a/src/battle/anim/lunge_1.c b/src/battle/anim/lunge_1.c
index d379c8f09..a2adfba13 100644
--- a/src/battle/anim/lunge_1.c
+++ b/src/battle/anim/lunge_1.c
@@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
static void sub_80CD7CC(struct Sprite* sprite);
static void sub_80CD81C(struct Sprite* sprite);
@@ -46,7 +46,7 @@ void sub_80CD7CC(struct Sprite* sprite)
sprite->data[0] = 6;
sprite->data[1] = (GetBankSide(gAnimBankAttacker)) ? 2 : -2;
sprite->data[2] = 0;
- sprite->data[3] = gObjectBankIDs[gAnimBankAttacker];
+ sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
StoreSpriteCallbackInData(sprite, sub_80CD81C);
sprite->callback = sub_8078458;
}
@@ -55,7 +55,7 @@ void sub_80CD81C(struct Sprite* sprite)
{
if (sprite->data[0] == 0)
{
- sprite->data[3] = gObjectBankIDs[gAnimBankAttacker];
+ sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
sub_8078E70(sprite->data[3], 0);
sprite->data[4] = (sprite->data[6] = GetBankSide(gAnimBankAttacker)) ? 0x300 : 0xFFFFFD00;
sprite->data[5] = 0;
@@ -76,7 +76,7 @@ void sub_80CD8A8(struct Sprite* sprite)
sprite->data[0] = 4;
sprite->data[1] = (GetBankSide(gAnimBankAttacker)) ? -3 : 3;
sprite->data[2] = 0;
- sprite->data[3] = gObjectBankIDs[gAnimBankAttacker];
+ sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
StoreSpriteCallbackInData(sprite, sub_80CD9B8);
sprite->callback = sub_8078458;
}
@@ -94,7 +94,7 @@ void sub_80CD91C(struct Sprite* sprite)
{
if (sprite->data[0] == 0)
{
- sprite->data[3] = gObjectBankIDs[gAnimBankAttacker];
+ sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
sprite->data[6] = GetBankSide(gAnimBankAttacker);
if (GetBankSide(gAnimBankAttacker))
{
diff --git a/src/battle/anim/lunge_2.c b/src/battle/anim/lunge_2.c
index fe2470567..f222b291d 100644
--- a/src/battle/anim/lunge_2.c
+++ b/src/battle/anim/lunge_2.c
@@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
static void sub_80CDB60(u8 taskId);
static void sub_80CDD20(u8 taskId);
@@ -20,7 +20,7 @@ void sub_80CDAC8(u8 taskId)
{
u8 a;
- gTasks[taskId].data[0] = gObjectBankIDs[gAnimBankAttacker];
+ gTasks[taskId].data[0] = gBankSpriteIds[gAnimBankAttacker];
a = GetBankSide(gAnimBankAttacker);
gTasks[taskId].data[1] = a;
gTasks[taskId].data[2] = 0;
diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c
index a0be20d6f..5d67311dc 100644
--- a/src/battle/anim/powder.c
+++ b/src/battle/anim/powder.c
@@ -6,12 +6,17 @@
extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
-static void sub_80CA768(struct Sprite* sprite);
+static void AnimMovePowderParticleStep(struct Sprite* sprite);
-// powder
+// Animates the falling particles that horizontally wave back and forth.
// Used by Sleep Powder, Stun Spore, and Poison Powder.
-
-void sub_80CA710(struct Sprite* sprite)
+// arg 0: initial x pixel offset
+// arg 1: initial y pixel offset
+// arg 2: total duration in frames
+// arg 3: vertical movement speed (sub-pixel value)
+// arg 4: wave amplitude
+// arg 5: wave speed
+void AnimMovePowderParticle(struct Sprite* sprite)
{
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
@@ -28,10 +33,10 @@ void sub_80CA710(struct Sprite* sprite)
}
sprite->data[4] = gBattleAnimArgs[5];
- sprite->callback = sub_80CA768;
+ sprite->callback = AnimMovePowderParticleStep;
}
-void sub_80CA768(struct Sprite* sprite)
+static void AnimMovePowderParticleStep(struct Sprite* sprite)
{
if (sprite->data[0] > 0)
{
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 6617183cb..37c527183 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -14,7 +14,7 @@ extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG2_X;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern const union AffineAnimCmd *const gUnknown_083DA888[];
extern struct AffineAnimFrameCmd gUnknown_083DA8A4;
@@ -53,11 +53,11 @@ void sub_80DB74C(struct Sprite *sprite)
u8 toBG_2 = (identity ^ var0) != 0;
if (IsAnimBankSpriteVisible(bank))
- sub_8076034(bank, toBG_2);
+ MoveBattlerSpriteToBG(bank, toBG_2);
bank = bankCopy ^ 2;
if (IsAnimBankSpriteVisible(bank))
- sub_8076034(bank, toBG_2 ^ var0);
+ MoveBattlerSpriteToBG(bank, toBG_2 ^ var0);
}
if (!IsContest() && IsDoubleBattle())
@@ -134,11 +134,11 @@ static void sub_80DB92C(struct Sprite *sprite)
u8 bank = bankCopy = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
if (IsAnimBankSpriteVisible(bank))
- gSprites[gObjectBankIDs[bank]].invisible = 0;
+ gSprites[gBankSpriteIds[bank]].invisible = 0;
bank = bankCopy ^ 2;
if (IsAnimBankSpriteVisible(bank))
- gSprites[gObjectBankIDs[bank]].invisible = 0;
+ gSprites[gBankSpriteIds[bank]].invisible = 0;
}
sprite->invisible = 1;
diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c
index 915cadcbc..759652f0c 100644
--- a/src/battle/anim/ring.c
+++ b/src/battle/anim/ring.c
@@ -10,7 +10,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
static void sub_80D1098(struct Sprite* sprite);
@@ -94,23 +94,23 @@ void sub_80D10B8(struct Sprite* sprite)
{
r9 = GetBankPosition(bankr7, r10) + gBattleAnimArgs[0];
if (IsAnimBankSpriteVisible(bankr8 ^ 2))
- sprite->subpriority = gSprites[gObjectBankIDs[bankr8 ^ 2]].subpriority - 1;
+ sprite->subpriority = gSprites[gBankSpriteIds[bankr8 ^ 2]].subpriority - 1;
else
- sprite->subpriority = gSprites[gObjectBankIDs[bankr8]].subpriority - 1;
+ sprite->subpriority = gSprites[gBankSpriteIds[bankr8]].subpriority - 1;
}
else
{
r9 = GetBankPosition(bankr7, r10) - gBattleAnimArgs[0];
if (gMain.inBattle && IsAnimBankSpriteVisible(bankr7 ^ 2))
{
- if (gSprites[gObjectBankIDs[bankr7]].pos1.x < gSprites[gObjectBankIDs[bankr7 ^ 2]].pos1.x)
- sprite->subpriority = gSprites[gObjectBankIDs[bankr7 ^ 2]].subpriority + 1;
+ if (gSprites[gBankSpriteIds[bankr7]].pos1.x < gSprites[gBankSpriteIds[bankr7 ^ 2]].pos1.x)
+ sprite->subpriority = gSprites[gBankSpriteIds[bankr7 ^ 2]].subpriority + 1;
else
- sprite->subpriority = gSprites[gObjectBankIDs[bankr7]].subpriority - 1;
+ sprite->subpriority = gSprites[gBankSpriteIds[bankr7]].subpriority - 1;
}
else
{
- sprite->subpriority = gSprites[gObjectBankIDs[bankr7]].subpriority - 1;
+ sprite->subpriority = gSprites[gBankSpriteIds[bankr7]].subpriority - 1;
}
}
diff --git a/src/battle/anim/unused_4.c b/src/battle/anim/unused_4.c
index bda476a0a..50ffaba4a 100644
--- a/src/battle/anim/unused_4.c
+++ b/src/battle/anim/unused_4.c
@@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
static void sub_80CD9D4(struct Sprite* sprite);
@@ -27,7 +27,7 @@ void sub_80CD9D4(struct Sprite* sprite)
{
case 0:
sprite->data[1] = 0;
- sprite->data[2] = gObjectBankIDs[gAnimBankAttacker];
+ sprite->data[2] = gBankSpriteIds[gAnimBankAttacker];
sprite->data[3] = GetBankSide(gAnimBankAttacker);
sprite->data[4] = (sprite->data[3] != 0) ? 0x200 : -0x200;
sprite->data[5] = 0;
diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c
index 2be6e7633..5a2de33c3 100644
--- a/src/battle/anim/unused_7.c
+++ b/src/battle/anim/unused_7.c
@@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
// unused_7
@@ -32,7 +32,7 @@ void sub_80CF3C4(struct Sprite* sprite)
u8 a;
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
- a = gObjectBankIDs[gAnimBankTarget];
+ a = gBankSpriteIds[gAnimBankTarget];
if (GetBankSide(gAnimBankAttacker) != 0)
{
sprite->pos1.x -= gBattleAnimArgs[0];
diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c
index 348ce6426..24cecb60c 100644
--- a/src/battle/anim/wisp_fire.c
+++ b/src/battle/anim/wisp_fire.c
@@ -10,7 +10,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankTarget;
extern u8 gAnimBankAttacker;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern s8 gUnknown_083D9794[16];
extern s8 gUnknown_083D97A4[16];
@@ -175,7 +175,7 @@ void sub_80D60B4(u8 taskId)
}
gTasks[taskId].data[0]++;
- spriteId = gObjectBankIDs[gAnimBankTarget];
+ spriteId = gBankSpriteIds[gAnimBankTarget];
if (!gTasks[taskId].data[4])
unk = gUnknown_083D9794[gTasks[taskId].data[0] % 10];
diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c
index e67248b9f..933c97fa9 100644
--- a/src/battle/anim/withdraw.c
+++ b/src/battle/anim/withdraw.c
@@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
static void sub_80CF514(u8 taskId);
@@ -17,13 +17,13 @@ static void sub_80CF514(u8 taskId);
void sub_80CF4D8(u8 taskId)
{
- sub_8078E70(gObjectBankIDs[gAnimBankAttacker], 0);
+ sub_8078E70(gBankSpriteIds[gAnimBankAttacker], 0);
gTasks[taskId].func = sub_80CF514;
}
void sub_80CF514(u8 taskId)
{
- u8 a = gObjectBankIDs[gAnimBankAttacker];
+ u8 a = gBankSpriteIds[gAnimBankAttacker];
s16 b;
if (GetBankSide(gAnimBankAttacker) == 0)
{
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index b09d9ad8d..61cd583ba 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -88,7 +88,7 @@ extern u16 gBattlePartyID[];
extern u8 gCurrentActionFuncId;
extern u8 gBanksByTurnOrder[];
extern struct UnknownStruct12 gUnknown_02024AD0[];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u16 gCurrentMove; // This is mis-named. It is a species, not a move ID.
extern u8 gLastUsedAbility;
extern u8 gStringBank;
@@ -4671,7 +4671,7 @@ void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d)
}
else
{
- objectID = gObjectBankIDs[bank];
+ objectID = gBankSpriteIds[bank];
ewram17810[bank].unk3 = spriteId;
ewram17810[bank].unk0_2 = 1;
gSprites[spriteId].data[0] = 0xC0;
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index b4c71b9c2..85c1d4aed 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -26,7 +26,7 @@ extern u8 gActiveBank;
extern u8 gNoOfAllBanks;
extern u16 gBattlePartyID[];
extern u8 gBanksBySide[];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u16 gUnknown_02024DE8;
extern u8 gDoingBattleAnim;
extern u32 gTransformedPersonalities[];
@@ -169,9 +169,9 @@ bool8 move_anim_start_t3(u8 a, u8 b, u8 c, u8 d, u16 e)
}
if (ewram17800[a].substituteSprite && sub_803163C(d) == 0)
return TRUE;
- if (ewram17800[a].substituteSprite && d == 2 && gSprites[gObjectBankIDs[a]].invisible)
+ if (ewram17800[a].substituteSprite && d == 2 && gSprites[gBankSpriteIds[a]].invisible)
{
- refresh_graphics_maybe(a, 1, gObjectBankIDs[a]);
+ refresh_graphics_maybe(a, 1, gBankSpriteIds[a]);
sub_80324E0(a);
return TRUE;
}
@@ -592,12 +592,12 @@ void sub_8031F24(void)
s32 i;
for (i = 0; i < gNoOfAllBanks; i++)
- ewram17800[i].invisible = gSprites[gObjectBankIDs[i]].invisible;
+ ewram17800[i].invisible = gSprites[gBankSpriteIds[i]].invisible;
}
void sub_8031F88(u8 a)
{
- ewram17800[a].invisible = gSprites[gObjectBankIDs[a]].invisible;
+ ewram17800[a].invisible = gSprites[gBankSpriteIds[a]].invisible;
}
void sub_8031FC4(u8 a, u8 b, bool8 c)
@@ -611,7 +611,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
if (c)
{
- StartSpriteAnim(&gSprites[gObjectBankIDs[a]], ewram17840.unk0);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[a]], ewram17840.unk0);
paletteOffset = 0x100 + a * 16;
LoadPalette(ewram16400 + ewram17840.unk0 * 32, paletteOffset, 32);
gBattleMonForms[a] = ewram17840.unk0;
@@ -620,7 +620,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
BlendPalette(paletteOffset, 16, 6, 0x7FFF);
CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
}
- gSprites[gObjectBankIDs[a]].pos1.y = sub_8077F68(a);
+ gSprites[gBankSpriteIds[a]].pos1.y = sub_8077F68(a);
}
else
{
@@ -673,7 +673,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
gTransformedPersonalities[a]);
}
}
- DmaCopy32Defvars(3, gUnknown_081FAF4C[r10], (void *)(VRAM + 0x10000 + gSprites[gObjectBankIDs[a]].oam.tileNum * 32), 0x800);
+ DmaCopy32Defvars(3, gUnknown_081FAF4C[r10], (void *)(VRAM + 0x10000 + gSprites[gBankSpriteIds[a]].oam.tileNum * 32), 0x800);
paletteOffset = 0x100 + a * 16;
lzPaletteData = GetMonSpritePalFromOtIdPersonality(species, otId, personalityValue);
LZDecompressWram(lzPaletteData, gSharedMem);
@@ -692,8 +692,8 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
ewram17800[a].transformedSpecies = species;
gBattleMonForms[a] = gBattleMonForms[b];
}
- gSprites[gObjectBankIDs[a]].pos1.y = sub_8077F68(a);
- StartSpriteAnim(&gSprites[gObjectBankIDs[a]], gBattleMonForms[a]);
+ gSprites[gBankSpriteIds[a]].pos1.y = sub_8077F68(a);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[a]], gBattleMonForms[a]);
}
}
@@ -833,15 +833,15 @@ void sub_80326EC(u8 a)
{
if (IsBankSpritePresent(i) != 0)
{
- gSprites[gObjectBankIDs[i]].oam.affineMode = a;
+ gSprites[gBankSpriteIds[i]].oam.affineMode = a;
if (a == 0)
{
- ewram17810[i].unk6 = gSprites[gObjectBankIDs[i]].oam.matrixNum;
- gSprites[gObjectBankIDs[i]].oam.matrixNum = 0;
+ ewram17810[i].unk6 = gSprites[gBankSpriteIds[i]].oam.matrixNum;
+ gSprites[gBankSpriteIds[i]].oam.matrixNum = 0;
}
else
{
- gSprites[gObjectBankIDs[i]].oam.matrixNum = ewram17810[i].unk6;
+ gSprites[gBankSpriteIds[i]].oam.matrixNum = ewram17810[i].unk6;
}
}
}
@@ -867,7 +867,7 @@ void sub_80328A4(struct Sprite *sprite)
{
bool8 invisible = FALSE;
u8 r4 = sprite->data[0];
- struct Sprite *r7 = &gSprites[gObjectBankIDs[r4]];
+ struct Sprite *r7 = &gSprites[gBankSpriteIds[r4]];
if (!r7->inUse || IsBankSpritePresent(r4) == 0)
{
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index 476f2c910..03ce1798f 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -14,6 +14,7 @@
#include "task.h"
#include "ewram.h"
#include "graphics.h"
+#include "constants/battle_anim.h"
// sprites start at 10000 and thus must be subtracted of 10000 to account for the true index.
#define GET_TRUE_SPRITE_INDEX(i) (i - 10000)
@@ -1287,7 +1288,7 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] =
};
extern u16 gBattlePartyID[4];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u8 gBankAttacker;
extern u8 gBankTarget;
EWRAM_DATA const u8 *sBattleAnimScriptPtr = NULL;
@@ -1608,28 +1609,28 @@ static void RunAnimScriptCommand(void)
static void ScriptCmd_loadspritegfx(void)
{
- u16 index;
+ u16 tag;
sBattleAnimScriptPtr++;
- index = T1_READ_16(sBattleAnimScriptPtr);
- LoadCompressedObjectPic(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)]);
- LoadCompressedObjectPalette(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(index)]);
+ tag = T1_READ_16(sBattleAnimScriptPtr);
+ LoadCompressedObjectPic(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(tag)]);
+ LoadCompressedObjectPalette(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(tag)]);
sBattleAnimScriptPtr += 2;
- AddSpriteIndex(GET_TRUE_SPRITE_INDEX(index));
+ AddSpriteIndex(GET_TRUE_SPRITE_INDEX(tag));
gAnimFramesToWait = 1;
gAnimScriptCallback = WaitAnimFrameCount;
}
static void ScriptCmd_unloadspritegfx(void)
{
- u16 index;
+ u16 tag;
sBattleAnimScriptPtr++;
- index = T1_READ_16(sBattleAnimScriptPtr);
- FreeSpriteTilesByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag);
- FreeSpritePaletteByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag);
+ tag = T1_READ_16(sBattleAnimScriptPtr);
+ FreeSpriteTilesByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(tag)].tag);
+ FreeSpritePaletteByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(tag)].tag);
sBattleAnimScriptPtr += 2;
- ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(index));
+ ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(tag));
}
static void ScriptCmd_createsprite(void)
@@ -1811,7 +1812,7 @@ static void ScriptCmd_monbg(void)
u8 bank;
u8 identity;
bool8 toBG_2;
- u16 r4;
+ u16 spriteId;
u8 taskId;
sBattleAnimScriptPtr++;
@@ -1835,12 +1836,12 @@ static void ScriptCmd_monbg(void)
else
toBG_2 = 1;
- sub_8076034(bank, toBG_2);
- r4 = gObjectBankIDs[bank];
+ MoveBattlerSpriteToBG(bank, toBG_2);
+ spriteId = gBankSpriteIds[bank];
taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10);
- gTasks[taskId].data[0] = r4;
- gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x;
- gTasks[taskId].data[2] = gSprites[r4].pos1.y + gSprites[r4].pos2.y;
+ gTasks[taskId].data[0] = spriteId;
+ gTasks[taskId].data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
+ gTasks[taskId].data[2] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y;
if (toBG_2 == 0)
{
gTasks[taskId].data[3] = gBattle_BG1_X;
@@ -1856,8 +1857,9 @@ static void ScriptCmd_monbg(void)
gMonAnimTaskIdArray[0] = taskId;
}
+
bank ^= 2;
- if (animBank > 1 && IsAnimBankSpriteVisible(bank))
+ if (animBank >= ANIM_BANK_ATK_PARTNER && IsAnimBankSpriteVisible(bank))
{
identity = GetBankIdentity(bank);
identity += 0xFF;
@@ -1865,12 +1867,12 @@ static void ScriptCmd_monbg(void)
toBG_2 = 0;
else
toBG_2 = 1;
- sub_8076034(bank, toBG_2);
- r4 = gObjectBankIDs[bank];
+ MoveBattlerSpriteToBG(bank, toBG_2);
+ spriteId = gBankSpriteIds[bank];
taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10);
- gTasks[taskId].data[0] = r4;
- gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x;
- gTasks[taskId].data[2] = gSprites[r4].pos1.y + gSprites[r4].pos2.y;
+ gTasks[taskId].data[0] = spriteId;
+ gTasks[taskId].data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
+ gTasks[taskId].data[2] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y;
if (toBG_2 == 0)
{
gTasks[taskId].data[3] = gBattle_BG1_X;
@@ -1903,17 +1905,17 @@ bool8 IsAnimBankSpriteVisible(u8 bank)
return FALSE;
if (IsContest())
return TRUE; // this line wont ever be reached.
- if (!(EWRAM_17800[bank].unk0 & 1) || !gSprites[gObjectBankIDs[bank]].invisible)
+ if (!(EWRAM_17800[bank].unk0 & 1) || !gSprites[gBankSpriteIds[bank]].invisible)
return TRUE;
return FALSE;
}
-void sub_8076034(u8 a, u8 b)
+void MoveBattlerSpriteToBG(u8 bank, u8 toBG_2)
{
u8 spriteId;
- if (b == 0)
+ if (toBG_2 == 0)
{
volatile u8 pointlessZero;
struct UnknownStruct2 s;
@@ -1929,23 +1931,23 @@ void sub_8076034(u8 a, u8 b)
REG_BG1CNT_BITFIELD.screenSize = 1;
REG_BG1CNT_BITFIELD.areaOverflowMode = 0;
- spriteId = gObjectBankIDs[a];
+ spriteId = gBankSpriteIds[bank];
gBattle_BG1_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32;
if (IsContest() != 0 && IsSpeciesNotUnown(EWRAM_19348) != 0)
gBattle_BG1_X--;
gBattle_BG1_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32;
- gSprites[gObjectBankIDs[a]].invisible = TRUE;
+ gSprites[gBankSpriteIds[bank]].invisible = TRUE;
REG_BG1HOFS = gBattle_BG1_X;
REG_BG1VOFS = gBattle_BG1_Y;
- LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, s.unk8 * 16, 32);
- DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + a * 16, (u16 *)PLTT + s.unk8 * 16, 32);
+ LoadPalette(gPlttBufferUnfaded + 0x100 + bank * 16, s.unk8 * 16, 32);
+ DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + bank * 16, (u16 *)PLTT + s.unk8 * 16, 32);
if (IsContest() != 0)
r2 = 0;
else
- r2 = GetBankIdentity(a);
+ r2 = GetBankIdentity(bank);
sub_80E4EF8(0, 0, r2, s.unk8, (u32)s.unk0, (((s32)s.unk4 - VRAM) / 2048), REG_BG1CNT_BITFIELD.charBaseBlock);
if (IsContest() != 0)
sub_8076380();
@@ -1963,18 +1965,18 @@ void sub_8076034(u8 a, u8 b)
REG_BG2CNT_BITFIELD.screenSize = 1;
REG_BG2CNT_BITFIELD.areaOverflowMode = 0;
- spriteId = gObjectBankIDs[a];
+ spriteId = gBankSpriteIds[bank];
gBattle_BG2_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32;
gBattle_BG2_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32;
- gSprites[gObjectBankIDs[a]].invisible = TRUE;
+ gSprites[gBankSpriteIds[bank]].invisible = TRUE;
REG_BG2HOFS = gBattle_BG2_X;
REG_BG2VOFS = gBattle_BG2_Y;
- LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, 0x90, 32);
- DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + a * 16, (void *)(PLTT + 0x120), 32);
+ LoadPalette(gPlttBufferUnfaded + 0x100 + bank * 16, 0x90, 32);
+ DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + bank * 16, (void *)(PLTT + 0x120), 32);
- sub_80E4EF8(0, 0, GetBankIdentity(a), 9, 0x6000, 0x1E, REG_BG2CNT_BITFIELD.charBaseBlock);
+ sub_80E4EF8(0, 0, GetBankIdentity(bank), 9, 0x6000, 0x1E, REG_BG2CNT_BITFIELD.charBaseBlock);
}
}
@@ -2097,9 +2099,9 @@ static void ScriptCmd_clearmonbg(void)
bank = gAnimBankTarget;
if (gMonAnimTaskIdArray[0] != 0xFF)
- gSprites[gObjectBankIDs[bank]].invisible = FALSE;
+ gSprites[gBankSpriteIds[bank]].invisible = FALSE;
if (animBankId > 1 && gMonAnimTaskIdArray[1] != 0xFF)
- gSprites[gObjectBankIDs[bank ^ 2]].invisible = FALSE;
+ gSprites[gBankSpriteIds[bank ^ 2]].invisible = FALSE;
else
animBankId = 0;
@@ -2167,8 +2169,8 @@ static void ScriptCmd_monbg_22(void)
r1 = 0;
else
r1 = 1;
- sub_8076034(bank, r1);
- gSprites[gObjectBankIDs[bank]].invisible = FALSE;
+ MoveBattlerSpriteToBG(bank, r1);
+ gSprites[gBankSpriteIds[bank]].invisible = FALSE;
}
bank ^= 2;
@@ -2180,8 +2182,8 @@ static void ScriptCmd_monbg_22(void)
r1 = 0;
else
r1 = 1;
- sub_8076034(bank, r1);
- gSprites[gObjectBankIDs[bank]].invisible = FALSE;
+ MoveBattlerSpriteToBG(bank, r1);
+ gSprites[gBankSpriteIds[bank]].invisible = FALSE;
}
sBattleAnimScriptPtr++;
}
@@ -2206,9 +2208,9 @@ static void ScriptCmd_clearmonbg_23(void)
bank = gAnimBankTarget;
if (IsAnimBankSpriteVisible(bank))
- gSprites[gObjectBankIDs[bank]].invisible = FALSE;
+ gSprites[gBankSpriteIds[bank]].invisible = FALSE;
if (animBankId > 1 && IsAnimBankSpriteVisible(bank ^ 2))
- gSprites[gObjectBankIDs[bank ^ 2]].invisible = FALSE;
+ gSprites[gBankSpriteIds[bank ^ 2]].invisible = FALSE;
else
animBankId = 0;
@@ -2245,13 +2247,13 @@ static void sub_80769A4(u8 taskId)
static void ScriptCmd_setalpha(void)
{
- u16 half1, half2;
+ u16 spriteAlpha, bgAlpha;
sBattleAnimScriptPtr++;
- half1 = *(sBattleAnimScriptPtr++);
- half2 = *(sBattleAnimScriptPtr++) << 8;
- REG_BLDCNT = 0x3F40;
- REG_BLDALPHA = half1 | half2;
+ spriteAlpha = *(sBattleAnimScriptPtr++);
+ bgAlpha = *(sBattleAnimScriptPtr++) << 8;
+ REG_BLDCNT = BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_EFFECT_BLEND;
+ REG_BLDALPHA = spriteAlpha | bgAlpha;
}
static void ScriptCmd_setbldcnt(void)
@@ -2700,13 +2702,13 @@ s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan)
static void ScriptCmd_playsewithpan(void)
{
- u16 songId;
+ u16 soundId;
s8 pan;
sBattleAnimScriptPtr++;
- songId = T1_READ_16(sBattleAnimScriptPtr);
+ soundId = T1_READ_16(sBattleAnimScriptPtr);
pan = T1_READ_8(sBattleAnimScriptPtr + 2);
- PlaySE12WithPanning(songId, BattleAnimAdjustPanning(pan));
+ PlaySE12WithPanning(soundId, BattleAnimAdjustPanning(pan));
sBattleAnimScriptPtr += 3;
}
diff --git a/src/battle/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c
index 058a45769..6043efb0c 100644
--- a/src/battle/battle_anim_807B69C.c
+++ b/src/battle/battle_anim_807B69C.c
@@ -15,7 +15,7 @@ extern bool8 gAnimScriptActive;
extern void (*gAnimScriptCallback)(void);
extern s16 gBattleAnimArgs[];
extern u8 gAnimBankTarget;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern const struct CompressedSpriteSheet gBattleAnimPicTable[];
extern const struct CompressedSpritePalette gBattleAnimPaletteTable[];
extern const u8 *const gBattleAnims_StatusConditions[];
@@ -72,7 +72,7 @@ static void sub_807BDAC(u8);
u8 unref_sub_807B69C(u8 a, u8 b)
{
- u8 spriteId1 = gObjectBankIDs[a];
+ u8 spriteId1 = gBankSpriteIds[a];
u8 taskId = CreateTask(sub_807B7E0, 10);
u8 spriteId2;
u8 i;
diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c
index f109333e3..2f10b07ae 100644
--- a/src/battle/battle_anim_80A7E7C.c
+++ b/src/battle/battle_anim_80A7E7C.c
@@ -9,13 +9,13 @@
extern s16 gBattleAnimArgs[8];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern s32 gAnimMoveDmg;
extern u16 gAnimMovePower;
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
-static void sub_80A7EF0(u8 taskId);
+static void AnimTask_ShakeMonStep(u8 taskId);
static void sub_80A808C(u8 taskId);
static void sub_80A81D8(u8 taskId);
static void sub_80A8374(u8 taskId);
@@ -91,28 +91,35 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83C2010 =
.callback = sub_80A8818,
};
-void sub_80A7E7C(u8 taskId)
+// Task to facilitate simple shaking of a pokemon's picture in battle.
+// The shaking alternates between the original position and the target position.
+// arg 0: anim battler
+// arg 1: x pixel offset
+// arg 2: y pixel offset
+// arg 3: num times to shake
+// arg 4: frame delay
+void AnimTask_ShakeMon(u8 taskId)
{
- u8 sprite;
- sprite = GetAnimBankSpriteId(gBattleAnimArgs[0]);
- if (sprite == 0xff)
+ u8 spriteId;
+ spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+ if (spriteId == 0xff)
{
DestroyAnimVisualTask(taskId);
return;
}
- gSprites[sprite].pos2.x = gBattleAnimArgs[1];
- gSprites[sprite].pos2.y = gBattleAnimArgs[2];
- TASK.data[0] = sprite;
+ gSprites[spriteId].pos2.x = gBattleAnimArgs[1];
+ gSprites[spriteId].pos2.y = gBattleAnimArgs[2];
+ TASK.data[0] = spriteId;
TASK.data[1] = gBattleAnimArgs[3];
TASK.data[2] = gBattleAnimArgs[4];
TASK.data[3] = gBattleAnimArgs[4];
TASK.data[4] = gBattleAnimArgs[1];
TASK.data[5] = gBattleAnimArgs[2];
- TASK.func = sub_80A7EF0;
- sub_80A7EF0(taskId);
+ TASK.func = AnimTask_ShakeMonStep;
+ AnimTask_ShakeMonStep(taskId);
}
-static void sub_80A7EF0(u8 taskId)
+static void AnimTask_ShakeMonStep(u8 taskId)
{
if (TASK.data[3] == 0)
{
@@ -185,11 +192,11 @@ void sub_80A7FA0(u8 taskId)
{
r6 = 1;
}
- sprite = gObjectBankIDs[side];
+ sprite = gBankSpriteIds[side];
}
else
{
- sprite = gObjectBankIDs[gAnimBankAttacker];
+ sprite = gBankSpriteIds[gAnimBankAttacker];
}
if (r6)
{
@@ -408,7 +415,7 @@ static void sub_80A8530(struct Sprite *sprite)
}
sprite->data[0] = gBattleAnimArgs[0];
sprite->data[2] = 0;
- sprite->data[3] = gObjectBankIDs[gAnimBankAttacker];
+ sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
sprite->data[4] = gBattleAnimArgs[0];
StoreSpriteCallbackInData(sprite, sub_80A85A4);
sprite->callback = sub_8078458;
@@ -450,11 +457,11 @@ static void sub_80A8638(struct Sprite *sprite)
int spriteId;
if (!gBattleAnimArgs[0])
{
- spriteId = gObjectBankIDs[gAnimBankAttacker];
+ spriteId = gBankSpriteIds[gAnimBankAttacker];
}
else
{
- spriteId = gObjectBankIDs[gAnimBankTarget];
+ spriteId = gBankSpriteIds[gAnimBankTarget];
}
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
@@ -523,7 +530,7 @@ static void sub_80A8764(struct Sprite *sprite)
{
v1 = gAnimBankTarget;
}
- spriteId = gObjectBankIDs[v1];
+ spriteId = gBankSpriteIds[v1];
if (GetBankSide(v1))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -559,7 +566,7 @@ static void sub_80A8818(struct Sprite *sprite)
{
v1 = gAnimBankTarget;
}
- spriteId = gObjectBankIDs[v1];
+ spriteId = gBankSpriteIds[v1];
if (GetBankSide(v1))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -668,7 +675,7 @@ void sub_80A8A80(u8 taskId)
DestroyAnimVisualTask(taskId);
return;
}
- spriteId = gObjectBankIDs[gAnimBankAttacker ^ 2];
+ spriteId = gBankSpriteIds[gAnimBankAttacker ^ 2];
break;
case 3:
if (!IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
@@ -676,7 +683,7 @@ void sub_80A8A80(u8 taskId)
DestroyAnimVisualTask(taskId);
return;
}
- spriteId = gObjectBankIDs[gAnimBankTarget ^ 2];
+ spriteId = gBankSpriteIds[gAnimBankTarget ^ 2];
break;
default:
DestroyAnimVisualTask(taskId);
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 40f50d7ff..604c21e6d 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -27,7 +27,7 @@ struct MovePpInfo
extern u8 gActiveBank;
extern u8 gBattleBufferA[][0x200];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u16 gBattlePartyID[];
extern u8 gHealthboxIDs[];
extern u16 gBattleTypeFlags;
@@ -266,18 +266,18 @@ void sub_803752C(void)
void sub_803757C(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
LinkOpponentBufferExecCompleted();
}
void sub_80375B4(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
{
- sub_8031B74(gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam);
- gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = gSprites[gObjectBankIDs[gActiveBank]].data[5];
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ sub_8031B74(gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam);
+ gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum = gSprites[gBankSpriteIds[gActiveBank]].data[5];
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
LinkOpponentBufferExecCompleted();
}
}
@@ -381,8 +381,8 @@ void sub_8037840(void)
void sub_8037A74(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].animEnded == TRUE
- && gSprites[gObjectBankIDs[gActiveBank]].pos2.x == 0)
+ if (gSprites[gBankSpriteIds[gActiveBank]].animEnded == TRUE
+ && gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
{
if (!ewram17810[gActiveBank].unk0_7)
{
@@ -414,7 +414,7 @@ void sub_8037B24(void)
void sub_8037B78(void)
{
- if (!gSprites[gObjectBankIDs[gActiveBank]].inUse)
+ if (!gSprites[gBankSpriteIds[gActiveBank]].inUse)
{
sub_8043DB0(gHealthboxIDs[gActiveBank]);
LinkOpponentBufferExecCompleted();
@@ -425,8 +425,8 @@ void sub_8037BBC(void)
{
if (!ewram17810[gActiveBank].unk0_6)
{
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8032A08(gActiveBank);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
LinkOpponentBufferExecCompleted();
@@ -441,7 +441,7 @@ void sub_8037C2C(void)
void dp01t_0F_4_move_anim(void)
{
- u8 spriteId = gObjectBankIDs[gActiveBank];
+ u8 spriteId = gBankSpriteIds[gActiveBank];
if (gSprites[spriteId].data[1] == 32)
{
@@ -485,7 +485,7 @@ void sub_8037D64(void)
ewram17810[gActiveBank].unk1_0 = 0;
FreeSpriteTilesByTag(0x27F9);
FreeSpritePaletteByTag(0x27F9);
- StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 0);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
sub_8045A5C(
gHealthboxIDs[gActiveBank],
&gEnemyParty[gBattlePartyID[gActiveBank]],
@@ -1155,15 +1155,15 @@ void LinkOpponentHandleLoadPokeSprite(void)
BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[gActiveBank]], gActiveBank);
GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(gActiveBank, 2),
sub_8077F68(gActiveBank),
sub_8079E90(gActiveBank));
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = gActiveBank;
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
- StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], gBattleMonForms[gActiveBank]);
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
+ StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
sub_8032984(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
gBattleBankFunc[gActiveBank] = sub_8037A74;
}
@@ -1185,18 +1185,18 @@ void sub_8039430(u8 a, u8 b)
gUnknown_0300434C[a] = CreateInvisibleSpriteWithCallback(sub_80312F0);
BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[a]], a);
GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a));
- gObjectBankIDs[a] = CreateSprite(
+ gBankSpriteIds[a] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(a, 2),
sub_8077F68(a),
sub_8079E90(a));
- gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a];
- gSprites[gObjectBankIDs[a]].data[0] = a;
- gSprites[gObjectBankIDs[a]].data[2] = species;
- gSprites[gObjectBankIDs[a]].oam.paletteNum = a;
- StartSpriteAnim(&gSprites[gObjectBankIDs[a]], gBattleMonForms[a]);
- gSprites[gObjectBankIDs[a]].invisible = TRUE;
- gSprites[gObjectBankIDs[a]].callback = SpriteCallbackDummy;
+ gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a];
+ gSprites[gBankSpriteIds[a]].data[0] = a;
+ gSprites[gBankSpriteIds[a]].data[2] = species;
+ gSprites[gBankSpriteIds[a]].oam.paletteNum = a;
+ StartSpriteAnim(&gSprites[gBankSpriteIds[a]], gBattleMonForms[a]);
+ gSprites[gBankSpriteIds[a]].invisible = TRUE;
+ gSprites[gBankSpriteIds[a]].callback = SpriteCallbackDummy;
gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFE);
}
@@ -1209,8 +1209,8 @@ void LinkOpponentHandleReturnPokeToBall(void)
}
else
{
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8032A08(gActiveBank);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
LinkOpponentBufferExecCompleted();
@@ -1257,17 +1257,17 @@ void LinkOpponentHandleTrainerThrow(void)
}
sub_8031A6C(gender, gActiveBank);
GetMonSpriteTemplate_803C5A0(gender, GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
176 + xOffset, 40 + 4 * (8 - gTrainerFrontPicCoords[gender].coords),
sub_8079E90(gActiveBank));
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 2;
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[gender].tag);
- gSprites[gObjectBankIDs[gActiveBank]].data[5] = gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum;
- gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[gender].tag);
- gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam = gender;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[gender].tag);
+ gSprites[gBankSpriteIds[gActiveBank]].data[5] = gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[gender].tag);
+ gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = gender;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
gBattleBankFunc[gActiveBank] = sub_803757C;
}
@@ -1278,12 +1278,12 @@ void LinkOpponentHandleTrainerSlide(void)
void LinkOpponentHandleTrainerSlideBack(void)
{
- oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]);
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 35;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = 280;
- gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34;
- StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy);
+ oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
+ gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+ StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
gBattleBankFunc[gActiveBank] = sub_80375B4;
}
@@ -1299,7 +1299,7 @@ void LinkOpponentHandlecmd10(void)
{
ewram17810[gActiveBank].unk4 = 0;
PlaySE12WithPanning(SE_POKE_DEAD, 63);
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8010384;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8010384;
gBattleBankFunc[gActiveBank] = sub_8037B78;
}
}
@@ -1574,14 +1574,14 @@ void LinkOpponentHandlecmd40(void)
void LinkOpponentHandleHitAnimation(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].invisible == TRUE)
+ if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
{
LinkOpponentBufferExecCompleted();
}
else
{
gDoingBattleAnim = TRUE;
- gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0;
+ gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
sub_8047858(gActiveBank);
gBattleBankFunc[gActiveBank] = dp01t_0F_4_move_anim;
}
@@ -1629,12 +1629,12 @@ void LinkOpponentHandleTrainerBallThrow(void)
{
u8 taskId;
- oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]);
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 35;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = 280;
- gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34;
- StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], sub_803A3A8);
+ oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
+ gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+ StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_803A3A8);
taskId = CreateTask(sub_803A2C4, 5);
gTasks[taskId].data[0] = gActiveBank;
if (ewram17810[gActiveBank].unk0_0)
@@ -1733,7 +1733,7 @@ void LinkOpponentHandleSpriteInvisibility(void)
{
if (IsBankSpritePresent(gActiveBank) != 0)
{
- gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
+ gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
sub_8031F88(gActiveBank);
}
LinkOpponentBufferExecCompleted();
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index 3a16e12e6..e1f93ba08 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -35,7 +35,7 @@ extern u8 gBattleBufferA[][0x200];
extern u8 gActiveBank;
extern u32 gBattleExecBuffer;
extern u16 gBattlePartyID[];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u8 gBattleOutcome;
extern u16 gUnknown_02024DE8;
extern u8 gUnknown_02024E68[];
@@ -260,17 +260,17 @@ void LinkPartnerBufferRunCommand(void)
void sub_811DAE4(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
LinkPartnerBufferExecCompleted();
}
void sub_811DB1C(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
{
nullsub_10(0);
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
LinkPartnerBufferExecCompleted();
}
}
@@ -338,8 +338,8 @@ void sub_811DCA0(void)
void sub_811DDE8(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].animEnded
- && gSprites[gObjectBankIDs[gActiveBank]].pos2.x == 0)
+ if (gSprites[gBankSpriteIds[gActiveBank]].animEnded
+ && gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
LinkPartnerBufferExecCompleted();
}
@@ -362,11 +362,11 @@ void bx_t3_healthbar_update(void)
void sub_811DE98(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].pos1.y + gSprites[gObjectBankIDs[gActiveBank]].pos2.y > 160)
+ if (gSprites[gBankSpriteIds[gActiveBank]].pos1.y + gSprites[gBankSpriteIds[gActiveBank]].pos2.y > 160)
{
nullsub_9(GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
- FreeOamMatrix(gSprites[gObjectBankIDs[gActiveBank]].oam.matrixNum);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBank]].oam.matrixNum);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
LinkPartnerBufferExecCompleted();
}
@@ -376,8 +376,8 @@ void sub_811DF34(void)
{
if (!ewram17810[gActiveBank].unk0_6)
{
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
LinkPartnerBufferExecCompleted();
}
@@ -391,7 +391,7 @@ void sub_811DFA0(void)
void bx_blink_t3(void)
{
- u8 spriteId = gObjectBankIDs[gActiveBank];
+ u8 spriteId = gBankSpriteIds[gActiveBank];
if (gSprites[spriteId].data[1] == 32)
{
gSprites[spriteId].data[1] = 0;
@@ -435,7 +435,7 @@ void sub_811E0CC(void)
FreeSpritePaletteByTag(0x27F9);
CreateTask(c3_0802FDF4, 10);
HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
- StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 0);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 0);
sub_804777C(gActiveBank);
sub_8043DFC(gHealthboxIDs[gActiveBank]);
@@ -1104,15 +1104,15 @@ void LinkPartnerHandleLoadPokeSprite(void)
GetMonSpriteTemplate_803C56C(
GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES),
GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(gActiveBank, 2),
sub_8077F68(gActiveBank),
sub_8079E90(gActiveBank));
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = gActiveBank;
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
- StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], gBattleMonForms[gActiveBank]);
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
+ StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
gBattleBankFunc[gActiveBank] = sub_811DDE8;
}
@@ -1134,18 +1134,18 @@ void sub_811F864(u8 a, u8 b)
species = GetMonData(&gPlayerParty[gBattlePartyID[a]], MON_DATA_SPECIES);
gUnknown_0300434C[a] = CreateInvisibleSpriteWithCallback(sub_80312F0);
GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a));
- gObjectBankIDs[a] = CreateSprite(
+ gBankSpriteIds[a] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(a, 2),
sub_8077F68(a),
sub_8079E90(a));
- gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a];
- gSprites[gObjectBankIDs[a]].data[0] = a;
- gSprites[gObjectBankIDs[a]].data[2] = species;
- gSprites[gObjectBankIDs[a]].oam.paletteNum = a;
- StartSpriteAnim(&gSprites[gObjectBankIDs[a]], gBattleMonForms[a]);
- gSprites[gObjectBankIDs[a]].invisible = TRUE;
- gSprites[gObjectBankIDs[a]].callback = SpriteCallbackDummy;
+ gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a];
+ gSprites[gBankSpriteIds[a]].data[0] = a;
+ gSprites[gBankSpriteIds[a]].data[2] = species;
+ gSprites[gBankSpriteIds[a]].oam.paletteNum = a;
+ StartSpriteAnim(&gSprites[gBankSpriteIds[a]], gBattleMonForms[a]);
+ gSprites[gBankSpriteIds[a]].invisible = TRUE;
+ gSprites[gBankSpriteIds[a]].callback = SpriteCallbackDummy;
gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFF);
}
@@ -1158,8 +1158,8 @@ void LinkPartnerHandleReturnPokeToBall(void)
}
else
{
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
LinkPartnerBufferExecCompleted();
}
@@ -1205,14 +1205,14 @@ void LinkPartnerHandleTrainerThrow(void)
}
LoadPlayerTrainerBankSprite(gender, gActiveBank);
GetMonSpriteTemplate_803C5A0(gender, GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
80 + xOffset, 80 + 4 * (8 - gTrainerBackPicCoords[gender].coords),
sub_8079E90(gActiveBank));
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = -2;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
gBattleBankFunc[gActiveBank] = sub_811DAE4;
}
@@ -1223,12 +1223,12 @@ void LinkPartnerHandleTrainerSlide(void)
void LinkPartnerHandleTrainerSlideBack(void)
{
- oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]);
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 35;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = -40;
- gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34;
- StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy);
+ oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+ gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+ StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
gBattleBankFunc[gActiveBank] = sub_811DB1C;
}
@@ -1245,9 +1245,9 @@ void LinkPartnerHandlecmd10(void)
ewram17810[gActiveBank].unk4 = 0;
HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
PlaySE12WithPanning(SE_POKE_DEAD, -64);
- gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = 5;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80105EC;
+ gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80105EC;
gBattleBankFunc[gActiveBank] = sub_811DE98;
}
}
@@ -1519,14 +1519,14 @@ void LinkPartnerHandlecmd40(void)
void LinkPartnerHandleHitAnimation(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].invisible == TRUE)
+ if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
{
LinkPartnerBufferExecCompleted();
}
else
{
gDoingBattleAnim = TRUE;
- gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0;
+ gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
sub_8047858(gActiveBank);
gBattleBankFunc[gActiveBank] = bx_blink_t3;
}
@@ -1575,19 +1575,19 @@ void LinkPartnerHandleTrainerBallThrow(void)
u8 r4;
u8 taskId;
- oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]);
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 50;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = -40;
- gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34;
- gSprites[gObjectBankIDs[gActiveBank]].data[5] = gActiveBank;
- StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38);
- StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 1);
+ oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+ gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+ gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
+ StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8030E38);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
r4 = AllocSpritePalette(0xD6F9);
LoadCompressedPalette(
gTrainerBackPicPaletteTable[gLinkPlayers[sub_803FC34(gActiveBank)].gender].data,
0x100 + r4 * 16, 0x20);
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = r4;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = r4;
taskId = CreateTask(sub_812071C, 5);
gTasks[taskId].data[0] = gActiveBank;
if (ewram17810[gActiveBank].unk0_0)
@@ -1673,7 +1673,7 @@ void LinkPartnerHandleSpriteInvisibility(void)
{
if (IsBankSpritePresent(gActiveBank) != 0)
{
- gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
+ gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
sub_8031F88(gActiveBank);
}
LinkPartnerBufferExecCompleted();
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index 338f8d418..5fb642e0c 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -34,7 +34,7 @@ extern u8 gUnknown_02023A14_50;
extern u8 gActiveBank;
extern u8 gBattleBufferA[][0x200];
extern u16 gBattlePartyID[];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u8 gBattleMonForms[];
extern struct SpriteTemplate gUnknown_02024E8C;
extern void (*gBattleBankFunc[])(void);
@@ -280,25 +280,25 @@ void OpponentBufferRunCommand(void)
void sub_8032B4C(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
OpponentBufferExecCompleted();
}
// Duplicate of sub_8032B4C
void sub_8032B84(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
OpponentBufferExecCompleted();
}
void sub_8032BBC(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
{
- sub_8031B74(gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam);
- gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = gSprites[gObjectBankIDs[gActiveBank]].data[5];
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ sub_8031B74(gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam);
+ gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum = gSprites[gBankSpriteIds[gActiveBank]].data[5];
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
OpponentBufferExecCompleted();
}
}
@@ -386,8 +386,8 @@ void sub_8032E2C(void)
void sub_8033018(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].animEnded == TRUE
- && gSprites[gObjectBankIDs[gActiveBank]].pos2.x == 0)
+ if (gSprites[gBankSpriteIds[gActiveBank]].animEnded == TRUE
+ && gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
{
if (!ewram17810[gActiveBank].unk0_7)
{
@@ -419,7 +419,7 @@ void sub_80330C8(void)
void sub_803311C(void)
{
- if (!gSprites[gObjectBankIDs[gActiveBank]].inUse)
+ if (!gSprites[gBankSpriteIds[gActiveBank]].inUse)
{
sub_8043DB0(gHealthboxIDs[gActiveBank]);
OpponentBufferExecCompleted();
@@ -430,8 +430,8 @@ void sub_8033160(void)
{
if (!ewram17810[gActiveBank].unk0_6)
{
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8032A08(gActiveBank);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
OpponentBufferExecCompleted();
@@ -446,7 +446,7 @@ void sub_80331D0(void)
void bx_blink_t7(void)
{
- u8 spriteId = gObjectBankIDs[gActiveBank];
+ u8 spriteId = gBankSpriteIds[gActiveBank];
if (gSprites[spriteId].data[1] == 32)
{
@@ -490,7 +490,7 @@ void sub_8033308(void)
ewram17810[gActiveBank].unk1_0 = 0;
FreeSpriteTilesByTag(0x27F9);
FreeSpritePaletteByTag(0x27F9);
- StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 0);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
sub_8045A5C(
gHealthboxIDs[gActiveBank],
&gEnemyParty[gBattlePartyID[gActiveBank]],
@@ -1126,16 +1126,16 @@ void OpponentHandleLoadPokeSprite(void)
BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[gActiveBank]], gActiveBank);
GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(gActiveBank, 2),
sub_8077F68(gActiveBank),
sub_8079E90(gActiveBank));
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = gActiveBank;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = species;
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
- StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], gBattleMonForms[gActiveBank]);
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = species;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
+ StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
sub_8032984(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
gBattleBankFunc[gActiveBank] = sub_8033018;
}
@@ -1158,18 +1158,18 @@ void sub_803495C(u8 a, u8 b)
gUnknown_0300434C[a] = CreateInvisibleSpriteWithCallback(sub_80312F0);
BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[a]], a);
GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a));
- gObjectBankIDs[a] = CreateSprite(
+ gBankSpriteIds[a] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(a, 2),
sub_8077F68(a),
sub_8079E90(a));
- gSprites[gObjectBankIDs[a]].data[0] = a;
- gSprites[gObjectBankIDs[a]].data[2] = species;
- gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a];
- gSprites[gObjectBankIDs[a]].oam.paletteNum = a;
- StartSpriteAnim(&gSprites[gObjectBankIDs[a]], gBattleMonForms[a]);
- gSprites[gObjectBankIDs[a]].invisible = TRUE;
- gSprites[gObjectBankIDs[a]].callback = SpriteCallbackDummy;
+ gSprites[gBankSpriteIds[a]].data[0] = a;
+ gSprites[gBankSpriteIds[a]].data[2] = species;
+ gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a];
+ gSprites[gBankSpriteIds[a]].oam.paletteNum = a;
+ StartSpriteAnim(&gSprites[gBankSpriteIds[a]], gBattleMonForms[a]);
+ gSprites[gBankSpriteIds[a]].invisible = TRUE;
+ gSprites[gBankSpriteIds[a]].callback = SpriteCallbackDummy;
gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFE);
}
@@ -1182,8 +1182,8 @@ void OpponentHandleReturnPokeToBall(void)
}
else
{
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8032A08(gActiveBank);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
OpponentBufferExecCompleted();
@@ -1234,18 +1234,18 @@ void OpponentHandleTrainerThrow(void)
sub_8031A6C(trainerPicIndex, gActiveBank);
GetMonSpriteTemplate_803C5A0(trainerPicIndex, GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
0xB0,
40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicIndex].coords),
sub_8079E90(gActiveBank));
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 2;
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag);
- gSprites[gObjectBankIDs[gActiveBank]].data[5] = gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum;
- gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[trainerPicIndex].tag);
- gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam = trainerPicIndex;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag);
+ gSprites[gBankSpriteIds[gActiveBank]].data[5] = gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[trainerPicIndex].tag);
+ gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicIndex;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
gBattleBankFunc[gActiveBank] = sub_8032B4C;
}
@@ -1264,30 +1264,30 @@ void OpponentHandleTrainerSlide(void)
sub_8031A6C(trainerPicIndex, gActiveBank);
GetMonSpriteTemplate_803C5A0(trainerPicIndex, GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
0xB0,
40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicIndex].coords),
0x1E);
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 96;
- gSprites[gObjectBankIDs[gActiveBank]].pos1.x += 32;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = -2;
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag);
- gSprites[gObjectBankIDs[gActiveBank]].data[5] = gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum;
- gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[trainerPicIndex].tag);
- gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam = trainerPicIndex;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 96;
+ gSprites[gBankSpriteIds[gActiveBank]].pos1.x += 32;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag);
+ gSprites[gBankSpriteIds[gActiveBank]].data[5] = gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[trainerPicIndex].tag);
+ gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicIndex;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
gBattleBankFunc[gActiveBank] = sub_8032B84;
}
void OpponentHandleTrainerSlideBack(void)
{
- oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]);
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 35;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = 280;
- gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34;
- StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy);
+ oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
+ gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+ StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
gBattleBankFunc[gActiveBank] = sub_8032BBC;
}
@@ -1303,7 +1303,7 @@ void OpponentHandlecmd10(void)
{
ewram17810[gActiveBank].unk4 = 0;
PlaySE12WithPanning(SE_POKE_DEAD, 63);
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8010384;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8010384;
gBattleBankFunc[gActiveBank] = sub_803311C;
}
}
@@ -2166,14 +2166,14 @@ void OpponentHandlecmd40(void)
void OpponentHandleHitAnimation(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].invisible == TRUE)
+ if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
{
OpponentBufferExecCompleted();
}
else
{
gDoingBattleAnim = TRUE;
- gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0;
+ gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
sub_8047858(gActiveBank);
gBattleBankFunc[gActiveBank] = bx_blink_t7;
}
@@ -2221,12 +2221,12 @@ void OpponentHandleTrainerBallThrow(void)
{
u8 taskId;
- oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]);
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 35;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = 280;
- gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34;
- StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], sub_8035C10);
+ oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
+ gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+ StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8035C10);
taskId = CreateTask(sub_8035C44, 5);
gTasks[taskId].data[0] = gActiveBank;
if (ewram17810[gActiveBank].unk0_0)
@@ -2325,7 +2325,7 @@ void OpponentHandleSpriteInvisibility(void)
{
if (IsBankSpritePresent(gActiveBank) != 0)
{
- gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
+ gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
sub_8031F88(gActiveBank);
}
OpponentBufferExecCompleted();
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index e03e21849..33a29c064 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -53,7 +53,7 @@ extern u8 gBankInMenu;
extern u16 gBattlePartyID[];
extern u8 gHealthboxIDs[];
extern u8 gDoingBattleAnim;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u16 gBattleTypeFlags;
extern u8 gBattleOutcome;
extern void (*gAnimScriptCallback)(void);
@@ -143,7 +143,7 @@ extern bool8 gDoingBattleAnim;
extern u16 gBattleTypeFlags;
extern u32 gBattleExecBuffer;
extern u8 gBattleBufferA[][0x200];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u8 gActionSelectionCursor[];
extern u8 gMoveSelectionCursor[];
extern u8 gAbsentBankFlags;
@@ -370,7 +370,7 @@ void PlayerBufferRunCommand(void)
void bx_0802E404(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].pos2.x == 0)
+ if (gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
PlayerBufferExecCompleted();
}
@@ -498,7 +498,7 @@ void sub_802C2EC(void)
{
DestroyMenuCursor();
PlaySE(SE_SELECT);
- gSprites[gObjectBankIDs[gUnknown_03004344]].callback = sub_8010574;
+ gSprites[gBankSpriteIds[gUnknown_03004344]].callback = sub_8010574;
Emitcmd33(1, 10, gMoveSelectionCursor[gActiveBank] | (gUnknown_03004344 << 8));
dp11b_obj_free(gUnknown_03004344, 1);
PlayerBufferExecCompleted();
@@ -507,7 +507,7 @@ void sub_802C2EC(void)
else if (gMain.newKeys & B_BUTTON)
{
PlaySE(SE_SELECT);
- gSprites[gObjectBankIDs[gUnknown_03004344]].callback = sub_8010574;
+ gSprites[gBankSpriteIds[gUnknown_03004344]].callback = sub_8010574;
gBattleBankFunc[gActiveBank] = sub_802C68C;
dp11b_obj_instanciate(gActiveBank, 1, 7, 1);
dp11b_obj_instanciate(gActiveBank, 0, 7, 1);
@@ -516,7 +516,7 @@ void sub_802C2EC(void)
else if (gMain.newKeys & 0x60)
{
PlaySE(SE_SELECT);
- gSprites[gObjectBankIDs[gUnknown_03004344]].callback = sub_8010574;
+ gSprites[gBankSpriteIds[gUnknown_03004344]].callback = sub_8010574;
do
{
u8 var = GetBankIdentity(gUnknown_03004344);
@@ -557,13 +557,13 @@ void sub_802C2EC(void)
if (gAbsentBankFlags & gBitTable[gUnknown_03004344])
i = 0;
} while (i == 0);
- gSprites[gObjectBankIDs[gUnknown_03004344]].callback = sub_8010520;
+ gSprites[gBankSpriteIds[gUnknown_03004344]].callback = sub_8010520;
}
//_0802C540
else if (gMain.newKeys & 0x90)
{
PlaySE(SE_SELECT);
- gSprites[gObjectBankIDs[gUnknown_03004344]].callback = sub_8010574;
+ gSprites[gBankSpriteIds[gUnknown_03004344]].callback = sub_8010574;
do
{
u8 var = GetBankIdentity(gUnknown_03004344);
@@ -603,7 +603,7 @@ void sub_802C2EC(void)
if (gAbsentBankFlags & gBitTable[gUnknown_03004344])
i = 0;
} while (i == 0);
- gSprites[gObjectBankIDs[gUnknown_03004344]].callback = sub_8010520;
+ gSprites[gBankSpriteIds[gUnknown_03004344]].callback = sub_8010520;
}
}
@@ -679,7 +679,7 @@ void sub_802C68C(void)
gUnknown_03004344 = GetBankByIdentity(3);
else
gUnknown_03004344 = GetBankByIdentity(1);
- gSprites[gObjectBankIDs[gUnknown_03004344]].callback = sub_8010520;
+ gSprites[gBankSpriteIds[gUnknown_03004344]].callback = sub_8010520;
}
}
else if (gMain.newKeys & B_BUTTON)
@@ -1684,24 +1684,24 @@ void debug_sub_803107C(void)
void sub_802D204(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
PlayerBufferExecCompleted();
}
// duplicate of sub_802D204
void sub_802D23C(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
PlayerBufferExecCompleted();
}
void sub_802D274(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
{
nullsub_10(gSaveBlock2.playerGender);
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
PlayerBufferExecCompleted();
}
}
@@ -2176,13 +2176,13 @@ void sub_802DDC4(u8 taskId)
void sub_802DE10(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].pos1.y + gSprites[gObjectBankIDs[gActiveBank]].pos2.y > DISPLAY_HEIGHT)
+ if (gSprites[gBankSpriteIds[gActiveBank]].pos1.y + gSprites[gBankSpriteIds[gActiveBank]].pos2.y > DISPLAY_HEIGHT)
{
u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
nullsub_9(species);
- FreeOamMatrix(gSprites[gObjectBankIDs[gActiveBank]].oam.matrixNum);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBank]].oam.matrixNum);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
PlayerBufferExecCompleted();
}
@@ -2192,8 +2192,8 @@ void sub_802DEAC(void)
{
if (!ewram17810[gActiveBank].unk0_6)
{
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
PlayerBufferExecCompleted();
}
@@ -2260,7 +2260,7 @@ void bx_wait_t1(void)
void bx_blink_t1(void)
{
- u8 spriteId = gObjectBankIDs[gActiveBank];
+ u8 spriteId = gBankSpriteIds[gActiveBank];
if (gSprites[spriteId].data[1] == 32)
{
@@ -3020,7 +3020,7 @@ void PlayerHandlecmd3(void)
void PlayerHandleLoadPokeSprite(void)
{
BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
gBattleBankFunc[gActiveBank] = bx_0802E404;
}
@@ -3044,18 +3044,18 @@ void sub_802F934(u8 bank, u8 b)
species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
gUnknown_0300434C[bank] = CreateInvisibleSpriteWithCallback(sub_80312F0);
GetMonSpriteTemplate_803C56C(species, GetBankIdentity(bank));
- gObjectBankIDs[bank] = CreateSprite(
+ gBankSpriteIds[bank] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(bank, 2),
sub_8077F68(bank),
sub_8079E90(bank));
- gSprites[gUnknown_0300434C[bank]].data[1] = gObjectBankIDs[bank];
- gSprites[gObjectBankIDs[bank]].data[0] = bank;
- gSprites[gObjectBankIDs[bank]].data[2] = species;
- gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
- StartSpriteAnim(&gSprites[gObjectBankIDs[bank]], gBattleMonForms[bank]);
- gSprites[gObjectBankIDs[bank]].invisible = TRUE;
- gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
+ gSprites[gUnknown_0300434C[bank]].data[1] = gBankSpriteIds[bank];
+ gSprites[gBankSpriteIds[bank]].data[0] = bank;
+ gSprites[gBankSpriteIds[bank]].data[2] = species;
+ gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+ StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
+ gSprites[gBankSpriteIds[bank]].invisible = TRUE;
+ gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
gSprites[gUnknown_0300434C[bank]].data[0] = sub_8046400(0, 0xFF);
}
@@ -3068,8 +3068,8 @@ void PlayerHandleReturnPokeToBall(void)
}
else
{
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
PlayerBufferExecCompleted();
}
@@ -3111,15 +3111,15 @@ void PlayerHandleTrainerThrow(void)
}
LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
r7 + 80,
(8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
sub_8079E90(gActiveBank));
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = -2;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
gBattleBankFunc[gActiveBank] = sub_802D204;
}
@@ -3127,27 +3127,27 @@ void PlayerHandleTrainerSlide(void)
{
LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
80,
(8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
30);
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -96;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 2;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -96;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
gBattleBankFunc[gActiveBank] = sub_802D23C;
}
void PlayerHandleTrainerSlideBack(void)
{
- oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]);
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 50;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = -40;
- gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34;
- StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy);
- StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 1);
+ oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+ gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+ StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
gBattleBankFunc[gActiveBank] = sub_802D274;
}
@@ -3166,9 +3166,9 @@ void PlayerHandlecmd10(void)
ewram17810[gActiveBank].unk4 = 0;
HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
PlaySE12WithPanning(SE_POKE_DEAD, -64);
- gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = 5;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80105EC;
+ gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80105EC;
gBattleBankFunc[gActiveBank] = sub_802DE10;
}
}
@@ -3540,14 +3540,14 @@ void PlayerHandlecmd40(void)
void PlayerHandleHitAnimation(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].invisible == TRUE)
+ if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
{
PlayerBufferExecCompleted();
}
else
{
gDoingBattleAnim = 1;
- gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0;
+ gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
sub_8047858(gActiveBank);
gBattleBankFunc[gActiveBank] = bx_blink_t1;
}
@@ -3596,17 +3596,17 @@ void PlayerHandleTrainerBallThrow(void)
u8 paletteNum;
u8 taskId;
- oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]);
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 50;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = -40;
- gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34;
- gSprites[gObjectBankIDs[gActiveBank]].data[5] = gActiveBank;
- StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38);
- StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 1);
+ oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+ gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+ gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
+ StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8030E38);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
paletteNum = AllocSpritePalette(0xD6F8);
LoadCompressedPalette(gTrainerBackPicPaletteTable[gSaveBlock2.playerGender].data, 0x100 + paletteNum * 16, 32);
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = paletteNum;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = paletteNum;
taskId = CreateTask(task05_08033660, 5);
gTasks[taskId].data[0] = gActiveBank;
if (ewram17810[gActiveBank].unk0_0)
@@ -3623,7 +3623,7 @@ void sub_8030E38(struct Sprite *sprite)
FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum));
DestroySprite(sprite);
BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[r4]], r4);
- StartSpriteAnim(&gSprites[gObjectBankIDs[r4]], 0);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[r4]], 0);
}
void task05_08033660(u8 taskId)
@@ -3702,7 +3702,7 @@ void PlayerHandleSpriteInvisibility(void)
{
if (IsBankSpritePresent(gActiveBank))
{
- gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
+ gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
sub_8031F88(gActiveBank);
}
PlayerBufferExecCompleted();
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index 5896e5e18..e9425e7e7 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -28,7 +28,7 @@ extern u16 gBattle_BG0_Y;
extern u16 gBattle_BG0_X;
extern u8 gBattleBufferA[][0x200];
extern bool8 gDoingBattleAnim;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern struct SpriteTemplate gUnknown_02024E8C;
extern u16 gBattleTypeFlags;
extern u32 gBattleExecBuffer;
@@ -288,7 +288,7 @@ void bx_battle_menu_t6_2(void)
void sub_812B65C(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
SafariBufferExecCompleted();
}
@@ -399,15 +399,15 @@ void SafariHandleTrainerThrow(void)
{
LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
80,
(8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
30);
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = -2;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
gBattleBankFunc[gActiveBank] = sub_812B65C;
}
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 49f530129..3eacaa085 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -31,7 +31,7 @@ extern u8 gActiveBank;
extern void (*gBattleBankFunc[])(void);
extern u32 gBattleExecBuffer;
extern u8 gBattleBufferA[][0x200];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern MainCallback gPreBattleCallback1;
extern bool8 gDoingBattleAnim;
extern u16 gBattlePartyID[];
@@ -325,7 +325,7 @@ void sub_81372BC(void)
void sub_813741C(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
WallyBufferExecCompleted();
}
@@ -436,7 +436,7 @@ void sub_81377B0(void)
void bx_blink_t5(void)
{
- u8 spriteId = gObjectBankIDs[gActiveBank];
+ u8 spriteId = gBankSpriteIds[gActiveBank];
if (gSprites[spriteId].data[1] == 32)
{
@@ -457,8 +457,8 @@ void sub_813789C(void)
{
if (!ewram17810[gActiveBank].unk0_6)
{
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
WallyBufferExecCompleted();
}
@@ -467,7 +467,7 @@ void sub_813789C(void)
// Duplicate of sub_813741C
void sub_8137908(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+ if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
WallyBufferExecCompleted();
}
@@ -1093,8 +1093,8 @@ void WallyHandleReturnPokeToBall(void)
}
else
{
- FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
- DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+ FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
+ DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_8043DB0(gHealthboxIDs[gActiveBank]);
WallyBufferExecCompleted();
}
@@ -1104,14 +1104,14 @@ void WallyHandleTrainerThrow(void)
{
LoadPlayerTrainerBankSprite(2, gActiveBank);
GetMonSpriteTemplate_803C5A0(2, GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
80, 80 + 4 * (8 - gTrainerBackPicCoords[2].coords),
30);
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = -2;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
gBattleBankFunc[gActiveBank] = sub_813741C;
}
@@ -1119,14 +1119,14 @@ void WallyHandleTrainerSlide(void)
{
LoadPlayerTrainerBankSprite(2, gActiveBank);
GetMonSpriteTemplate_803C5A0(2, GetBankIdentity(gActiveBank));
- gObjectBankIDs[gActiveBank] = CreateSprite(
+ gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_02024E8C,
80, 80 + 4 * (8 - gTrainerBackPicCoords[2].coords),
30);
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
- gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -96;
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 2;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
+ gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -96;
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
gBattleBankFunc[gActiveBank] = sub_8137908;
}
@@ -1432,14 +1432,14 @@ void WallyHandlecmd40(void)
void WallyHandleHitAnimation(void)
{
- if (gSprites[gObjectBankIDs[gActiveBank]].invisible == TRUE)
+ if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
{
WallyBufferExecCompleted();
}
else
{
gDoingBattleAnim = 1;
- gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0;
+ gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
sub_8047858(gActiveBank);
gBattleBankFunc[gActiveBank] = bx_blink_t5;
}
@@ -1480,17 +1480,17 @@ void WallyHandleTrainerBallThrow(void)
u8 paletteNum;
u8 taskId;
- oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]);
- gSprites[gObjectBankIDs[gActiveBank]].data[0] = 50;
- gSprites[gObjectBankIDs[gActiveBank]].data[2] = -40;
- gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y;
- gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34;
- gSprites[gObjectBankIDs[gActiveBank]].data[5] = gActiveBank;
- StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38);
- StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 1);
+ oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+ gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
+ gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+ gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+ gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8078B34;
+ gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
+ StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8030E38);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
paletteNum = AllocSpritePalette(0xD6F8);
LoadCompressedPalette(gTrainerBackPicPaletteTable[2].data, 0x100 + paletteNum * 16, 32);
- gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = paletteNum;
+ gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = paletteNum;
taskId = CreateTask(sub_8139A2C, 5);
gTasks[taskId].data[0] = gActiveBank;
if (ewram17810[gActiveBank].unk0_0)
@@ -1508,18 +1508,18 @@ void sub_81398BC(u8 bank)
species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
gUnknown_0300434C[bank] = CreateInvisibleSpriteWithCallback(sub_80312F0);
GetMonSpriteTemplate_803C56C(species, GetBankIdentity(bank));
- gObjectBankIDs[bank] = CreateSprite(
+ gBankSpriteIds[bank] = CreateSprite(
&gUnknown_02024E8C,
GetBankPosition(bank, 2),
sub_8077F68(bank),
sub_8079E90(bank));
- gSprites[gUnknown_0300434C[bank]].data[1] = gObjectBankIDs[bank];
- gSprites[gObjectBankIDs[bank]].data[0] = bank;
- gSprites[gObjectBankIDs[bank]].data[2] = species;
- gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
- StartSpriteAnim(&gSprites[gObjectBankIDs[bank]], gBattleMonForms[bank]);
- gSprites[gObjectBankIDs[bank]].invisible = TRUE;
- gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
+ gSprites[gUnknown_0300434C[bank]].data[1] = gBankSpriteIds[bank];
+ gSprites[gBankSpriteIds[bank]].data[0] = bank;
+ gSprites[gBankSpriteIds[bank]].data[2] = species;
+ gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+ StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
+ gSprites[gBankSpriteIds[bank]].invisible = TRUE;
+ gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
gSprites[gUnknown_0300434C[bank]].data[0] = sub_8046400(0, 0xFF);
}
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index 6f27469ce..f5b8e1c5d 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -21,7 +21,7 @@ extern u16 gBattleTypeFlags;
extern u8 gBankTarget;
extern u8 gActiveBank;
extern u16 gBattlePartyID[];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u8 gDoingBattleAnim;
extern u8 gHealthboxIDs[];
@@ -442,9 +442,9 @@ static void sub_80466F4(struct Sprite *sprite)
{
sprite->data[5] = 0;
sprite->callback = sub_8046760;
- StartSpriteAffineAnim(&gSprites[gObjectBankIDs[sprite->data[6]]], 2);
- AnimateSprite(&gSprites[gObjectBankIDs[sprite->data[6]]]);
- gSprites[gObjectBankIDs[sprite->data[6]]].data[1] = 0;
+ StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->data[6]]], 2);
+ AnimateSprite(&gSprites[gBankSpriteIds[sprite->data[6]]]);
+ gSprites[gBankSpriteIds[sprite->data[6]]].data[1] = 0;
}
}
@@ -453,17 +453,17 @@ static void sub_8046760(struct Sprite *sprite)
sprite->data[5]++;
if (sprite->data[5] == 11)
PlaySE(SE_SUIKOMU);
- if (gSprites[gObjectBankIDs[sprite->data[6]]].affineAnimEnded)
+ if (gSprites[gBankSpriteIds[sprite->data[6]]].affineAnimEnded)
{
StartSpriteAnim(sprite, 2);
- gSprites[gObjectBankIDs[sprite->data[6]]].invisible = TRUE;
+ gSprites[gBankSpriteIds[sprite->data[6]]].invisible = TRUE;
sprite->data[5] = 0;
sprite->callback = sub_80467F8;
}
else
{
- gSprites[gObjectBankIDs[sprite->data[6]]].data[1] += 0x60;
- gSprites[gObjectBankIDs[sprite->data[6]]].pos2.y = -gSprites[gObjectBankIDs[sprite->data[6]]].data[1] >> 8;
+ gSprites[gBankSpriteIds[sprite->data[6]]].data[1] += 0x60;
+ gSprites[gBankSpriteIds[sprite->data[6]]].pos2.y = -gSprites[gBankSpriteIds[sprite->data[6]]].data[1] >> 8;
}
}
@@ -747,9 +747,9 @@ static void sub_8046C78(struct Sprite *sprite)
gTasks[taskId].data[2] = r4_2;
gTasks[taskId].data[15] = 0;
}
- StartSpriteAffineAnim(&gSprites[gObjectBankIDs[sprite->data[6]]], 1);
- AnimateSprite(&gSprites[gObjectBankIDs[sprite->data[6]]]);
- gSprites[gObjectBankIDs[sprite->data[6]]].data[1] = 0x1000;
+ StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->data[6]]], 1);
+ AnimateSprite(&gSprites[gBankSpriteIds[sprite->data[6]]]);
+ gSprites[gBankSpriteIds[sprite->data[6]]].data[1] = 0x1000;
}
static void sub_8046E7C(struct Sprite *sprite)
@@ -766,25 +766,25 @@ static void sub_8046E9C(struct Sprite *sprite)
bool8 r7 = FALSE;
u8 r4 = sprite->data[6];
- gSprites[gObjectBankIDs[r4]].invisible = FALSE;
+ gSprites[gBankSpriteIds[r4]].invisible = FALSE;
if (sprite->animEnded)
sprite->invisible = TRUE;
- if (gSprites[gObjectBankIDs[r4]].affineAnimEnded)
+ if (gSprites[gBankSpriteIds[r4]].affineAnimEnded)
{
- StartSpriteAffineAnim(&gSprites[gObjectBankIDs[r4]], 0);
+ StartSpriteAffineAnim(&gSprites[gBankSpriteIds[r4]], 0);
r7 = TRUE;
}
else
{
- gSprites[gObjectBankIDs[r4]].data[1] -= 288;
- gSprites[gObjectBankIDs[r4]].pos2.y = gSprites[gObjectBankIDs[r4]].data[1] >> 8;
+ gSprites[gBankSpriteIds[r4]].data[1] -= 288;
+ gSprites[gBankSpriteIds[r4]].pos2.y = gSprites[gBankSpriteIds[r4]].data[1] >> 8;
}
if (sprite->animEnded && r7)
{
s32 i;
u32 r3;
- gSprites[gObjectBankIDs[r4]].pos2.y = 0;
+ gSprites[gBankSpriteIds[r4]].pos2.y = 0;
gDoingBattleAnim = 0;
ewram17810[r4].unk0_3 = 0;
FreeSpriteOamMatrix(sprite);
@@ -819,8 +819,8 @@ static void sub_8046FBC(struct Sprite *sprite)
}
else if (sprite->data[4] == 315)
{
- FreeOamMatrix(gSprites[gObjectBankIDs[sprite->data[6]]].oam.matrixNum);
- DestroySprite(&gSprites[gObjectBankIDs[sprite->data[6]]]);
+ FreeOamMatrix(gSprites[gBankSpriteIds[sprite->data[6]]].oam.matrixNum);
+ DestroySprite(&gSprites[gBankSpriteIds[sprite->data[6]]]);
DestroySpriteAndFreeResources(sprite);
if (gMain.inBattle)
ewram17810[r7].unk0_3 = 0;
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c
index a78cb20df..0da29441e 100644
--- a/src/battle/reshow_battle_screen.c
+++ b/src/battle/reshow_battle_screen.c
@@ -25,7 +25,7 @@ extern u8 gBankInMenu;
extern u16 gBattlePartyID[4];
extern u8 gNoOfAllBanks;
extern u16 gBattleTypeFlags;
-extern u8 gObjectBankIDs[4];
+extern u8 gBankSpriteIds[4];
extern u8 gBattleMonForms[4];
extern u8 gHealthboxIDs[4];
@@ -243,46 +243,46 @@ static void sub_807B184(u8 bank)
if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
return;
GetMonSpriteTemplate_803C56C(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
- gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank));
- gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
- gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
- gSprites[gObjectBankIDs[bank]].data[0] = bank;
- gSprites[gObjectBankIDs[bank]].data[2] = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
- StartSpriteAnim(&gSprites[gObjectBankIDs[bank]], gBattleMonForms[bank]);
+ gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank));
+ gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+ gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+ gSprites[gBankSpriteIds[bank]].data[0] = bank;
+ gSprites[gBankSpriteIds[bank]].data[2] = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
}
else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
{
GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(0));
- gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, 0x50,
+ gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, 0x50,
(8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
sub_8079E90(0));
- gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
- gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
- gSprites[gObjectBankIDs[bank]].data[0] = bank;
+ gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+ gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+ gSprites[gBankSpriteIds[bank]].data[0] = bank;
}
else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
{
GetMonSpriteTemplate_803C5A0(2, GetBankIdentity(0));
- gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, 0x50,
+ gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, 0x50,
(8 - gTrainerBackPicCoords[2].coords) * 4 + 80,
sub_8079E90(0));
- gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
- gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
- gSprites[gObjectBankIDs[bank]].data[0] = bank;
+ gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+ gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+ gSprites[gBankSpriteIds[bank]].data[0] = bank;
}
else
{
if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
return;
GetMonSpriteTemplate_803C56C(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
- gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank));
- gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
- gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
- gSprites[gObjectBankIDs[bank]].data[0] = bank;
- gSprites[gObjectBankIDs[bank]].data[2] = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
- StartSpriteAnim(&gSprites[gObjectBankIDs[bank]], gBattleMonForms[bank]);
+ gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank));
+ gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+ gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+ gSprites[gBankSpriteIds[bank]].data[0] = bank;
+ gSprites[gBankSpriteIds[bank]].data[2] = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+ StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
}
- gSprites[gObjectBankIDs[bank]].invisible = ewram17800[bank].invisible;
+ gSprites[gBankSpriteIds[bank]].invisible = ewram17800[bank].invisible;
}
}
diff --git a/src/contest.c b/src/contest.c
index e2695627e..e7740bade 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -47,7 +47,7 @@ extern u16 gBattleTypeFlags;
extern u8 gBankAttacker;
extern u8 gBankTarget;
extern u8 gBanksBySide[];
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
extern u16 gBattle_BG3_X;
extern s16 gBattle_BG1_Y;
extern u16 gBattle_BG3_Y;
@@ -553,7 +553,7 @@ u8 sub_80AB70C(u8 *a)
gBattleTypeFlags = 0;
gBankAttacker = 2;
gBankTarget = 3;
- gObjectBankIDs[gBankAttacker] = CreateJudgeSprite();
+ gBankSpriteIds[gBankAttacker] = CreateJudgeSprite();
sub_80B292C();
break;
default:
@@ -931,7 +931,7 @@ void debug_sub_80BA054(u8 taskId)
gSprites[r6].pos2.x = 120;
gSprites[r6].callback = sub_80AD8FC;
gTasks[taskId].data[2] = r6;
- gObjectBankIDs[gBankAttacker] = r6;
+ gBankSpriteIds[gBankAttacker] = r6;
gTasks[taskId].data[3] = 0;
gTasks[taskId].data[0]++;
sContest.unk1925E = 0;
@@ -1143,7 +1143,7 @@ void sub_80AC2CC(u8 taskId)
gSprites[spriteId].pos2.x = 120;
gSprites[spriteId].callback = sub_80AD8FC;
gTasks[taskId].data[2] = spriteId;
- gObjectBankIDs[gBankAttacker] = spriteId;
+ gBankSpriteIds[gBankAttacker] = spriteId;
sub_80B0BC4(sub_80B09E4(sContest.unk19215), FALSE);
gTasks[taskId].data[0] = 4;
return;
@@ -5415,14 +5415,14 @@ void sub_80B28F0(u8 a)
void sub_80B292C(void)
{
- gObjectBankIDs[3] = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy);
- InitSpriteAffineAnim(&gSprites[gObjectBankIDs[gBankTarget]]);
+ gBankSpriteIds[3] = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy);
+ InitSpriteAffineAnim(&gSprites[gBankSpriteIds[gBankTarget]]);
sub_80B2968();
}
void sub_80B2968(void)
{
- struct Sprite *sprite = &gSprites[gObjectBankIDs[3]];
+ struct Sprite *sprite = &gSprites[gBankSpriteIds[3]];
sprite->pos2.x = 0;
sprite->pos2.y = 0;
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 4a580eb41..a60fc1078 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "constants/battle_anim.h"
#include "constants/species.h"
#include "rom_8077ABC.h"
#include "battle.h"
@@ -30,7 +31,7 @@
#define gCastformElevations gUnknownCastformData_0837F5A8
#define gCastformBackSpriteYCoords gUnknown_0837F5AC
#define gTransformPersonalities gTransformedPersonalities
-#define gBattleMonSprites gObjectBankIDs
+#define gBattleMonSprites gBankSpriteIds
struct TransformStatus
{
@@ -850,7 +851,7 @@ bool8 IsBankSpritePresent(u8 slot)
{
if (gBanksBySide[slot] == 0xff)
return FALSE;
- if (GetBankSide(slot))
+ if (GetBankSide(slot) != SIDE_PLAYER)
{
if (GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0)
return TRUE;
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 012a32cc6..12a3864ef 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -118,7 +118,7 @@ gUnknown_02024ACC = .; /* 2024ACC */
gUnknown_02024AD0 = .; /* 2024AD0 */
. += 0x110;
-gObjectBankIDs = .; /* 2024BE0 */
+gBankSpriteIds = .; /* 2024BE0 */
. += 0x4;
gCurrMovePos = .; /* 2024BE4 */
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 08:10:09 +0000