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

Document more battle anim effects

Browse Source
This commit is contained in:
Marcus Huderle 2018-12-31 11:01:37 -06:00
parent 530a20354c
commit fb2d1591c1
9 changed files with 431 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
data/battle_anim_scripts.s
View File

@ -1252,12 +1252,12 @@ Move_REVERSAL:
createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE
delay 10 delay 10
playsewithpan SE_W179, SOUND_PAN_ATTACKER playsewithpan SE_W179, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 0 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 42 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 84 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 126 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 126
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 168 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 168
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 210 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210
waitforvisualfinish waitforvisualfinish
delay 20 delay 20
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
@ -1751,7 +1751,7 @@ Frustration_Strong:
createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28
waitforvisualfinish waitforvisualfinish
delay 5 delay 5
createvisualtask sub_815C3A8, 5 createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5
delay 7 delay 7
playsewithpan SE_W004, SOUND_PAN_TARGET playsewithpan SE_W004, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1
@ -1785,7 +1785,7 @@ Frustration_Medium:
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
goto Frustration_Continue goto Frustration_Continue
Frustration_Weak: Frustration_Weak:
createsprite gUnknown_085CE4D0, ANIM_ATTACKER, 2, 20, -28 createsprite gWeakFrustrationAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 20, -28
waitforvisualfinish waitforvisualfinish
delay 10 delay 10
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2
@ -1815,26 +1815,26 @@ Move_SAFEGUARD:
Move_PAIN_SPLIT: Move_PAIN_SPLIT:
loadspritegfx ANIM_TAG_PAIN_SPLIT loadspritegfx ANIM_TAG_PAIN_SPLIT
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, ANIM_ATTACKER
createsprite gUnknown_085CE590, ANIM_TARGET, 2, -8, -42, 1 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, ANIM_TARGET
delay 10 delay 10
playsewithpan SE_W207B, 0 playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 0
createvisualtask sub_815CA20, 2, 1, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 0
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -24, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, ANIM_ATTACKER
createsprite gUnknown_085CE590, ANIM_TARGET, 2, -24, -42, 1 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, ANIM_TARGET
delay 10 delay 10
playsewithpan SE_W207B, 0 playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 1 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 1
createvisualtask sub_815CA20, 2, 1, 1 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 1
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, 8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, ANIM_ATTACKER
createsprite gUnknown_085CE590, ANIM_TARGET, 2, 8, -42, 1 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, ANIM_TARGET
delay 10 delay 10
playsewithpan SE_W207B, 0 playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 2 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 2
createvisualtask sub_815CA20, 2, 1, 2 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 2
end end
Move_VICE_GRIP: Move_VICE_GRIP:
@ -2888,7 +2888,7 @@ Move_KINESIS:
Move_GLARE: Move_GLARE:
loadspritegfx ANIM_TAG_SMALL_RED_EYE loadspritegfx ANIM_TAG_SMALL_RED_EYE
loadspritegfx ANIM_TAG_EYE_SPARKLE loadspritegfx ANIM_TAG_EYE_SPARKLE
createvisualtask sub_815E114, 5, 0 createvisualtask AnimTask_GlareEyeDots, 5, 0
playsewithpan SE_W060B, SOUND_PAN_ATTACKER playsewithpan SE_W060B, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK
@ -2905,7 +2905,7 @@ Move_GLARE:
Move_BARRAGE: Move_BARRAGE:
loadspritegfx ANIM_TAG_RED_BALL loadspritegfx ANIM_TAG_RED_BALL
createvisualtask sub_815E47C, 3 createvisualtask AnimTask_BarrageBall, 3
playsewithpan SE_W207, SOUND_PAN_ATTACKER playsewithpan SE_W207, SOUND_PAN_ATTACKER
delay 24 delay 24
createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 8, 1, 40, 1 createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 8, 1, 40, 1
@ -2996,7 +2996,7 @@ Move_SPLASH:
Move_ACID_ARMOR: Move_ACID_ARMOR:
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
setalpha 15, 0 setalpha 15, 0
createvisualtask sub_815D240, 2, 0 createvisualtask AnimTask_AcidArmor, 2, ANIM_ATTACKER
playsewithpan SE_W151, SOUND_PAN_ATTACKER playsewithpan SE_W151, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
blendoff blendoff
@ -3096,7 +3096,7 @@ Move_FLAIL:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
createvisualtask sub_815C770, 2, 0 createvisualtask AnimTask_FlailMovement, 2, ANIM_ATTACKER
loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2 loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3 createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3
@ -3219,7 +3219,7 @@ EndureEffect:
Move_CHARM: Move_CHARM:
loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_MAGENTA_HEART
createvisualtask sub_815C478, 5, 0, 2, 0 createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20 createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15 delay 15
@ -3529,18 +3529,18 @@ Move_MEMENTO:
Move_FACADE: Move_FACADE:
loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_SWEAT_DROP
createvisualtask sub_815DCA4, 2, 0, 3 createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 3
createvisualtask sub_815DF0C, 2, 0, 72 createvisualtask AnimTask_FacadeColorBlend, 2, ANIM_ATTACKER, 72
loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3
end end
Move_SMELLING_SALT: Move_SMELLING_SALT:
loadspritegfx ANIM_TAG_TAG_HAND loadspritegfx ANIM_TAG_TAG_HAND
loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT
createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 0, 2 createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 2
createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 1, 2 createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 2
delay 32 delay 32
createvisualtask AnimTask_SmellingSaltSquish, 3, ANIM_TARGET, 2 createvisualtask AnimTask_SmellingSaltsSquish, 3, ANIM_TARGET, 2
loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2 loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2
waitforvisualfinish waitforvisualfinish
delay 4 delay 4
@ -3633,18 +3633,18 @@ Move_HELPING_HAND:
Move_ASSIST: Move_ASSIST:
loadspritegfx ANIM_TAG_PAW_PRINT loadspritegfx ANIM_TAG_PAW_PRINT
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36
delay 2 delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36
playsewithpan SE_W010, 0 playsewithpan SE_W010, 0
delay 2 delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36
playsewithpan SE_W010, 0 playsewithpan SE_W010, 0
delay 2 delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36
playsewithpan SE_W010, 0 playsewithpan SE_W010, 0
delay 2 delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36
playsewithpan SE_W010, 0 playsewithpan SE_W010, 0
end end
@ -3764,24 +3764,24 @@ BrickBreakShatteredWall:
Move_YAWN: Move_YAWN:
loadspritegfx ANIM_TAG_PINK_CLOUD loadspritegfx ANIM_TAG_PINK_CLOUD
createvisualtask sub_815D64C, 2, 0 createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER
playsewithpan SE_W281, SOUND_PAN_ATTACKER playsewithpan SE_W281, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 2 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2
playsewithpan SE_W255, SOUND_PAN_ATTACKER playsewithpan SE_W255, SOUND_PAN_ATTACKER
delay 4 delay 4
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 1 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 1
delay 4 delay 4
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 0 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0
waitforvisualfinish waitforvisualfinish
createvisualtask sub_815D64C, 2, 1 createvisualtask AnimTask_DeepInhale, 2, ANIM_TARGET
playsewithpan SE_W281, SOUND_PAN_TARGET playsewithpan SE_W281, SOUND_PAN_TARGET
end end
Move_ENDEAVOR: Move_ENDEAVOR:
loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_SWEAT_DROP
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
createvisualtask sub_815DCA4, 2, 0, 2 createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 2
loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2
delay 6 delay 6
@ -4171,7 +4171,7 @@ Move_FAKE_TEARS:
loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_MUSIC_NOTES
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31) createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31)
waitforvisualfinish waitforvisualfinish
createvisualtask sub_815C478, 5, 0, 2, 1 createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 1
loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4
delay 8 delay 8
createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 0 createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 0
@ -4275,7 +4275,7 @@ Move_TICKLE:
delay 20 delay 20
createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER
delay 12 delay 12
createvisualtask sub_815C478, 3, 1, 6, 2 createvisualtask AnimTask_RockMonBackAndForth, 3, ANIM_TARGET, 6, 2
loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8 loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8
waitforvisualfinish waitforvisualfinish
end end
@ -4371,7 +4371,7 @@ Move_BLOCK:
Move_HOWL: Move_HOWL:
loadspritegfx ANIM_TAG_NOISE_LINE loadspritegfx ANIM_TAG_NOISE_LINE
createvisualtask sub_815D64C, 2, 0 createvisualtask AnimTask_DeepInhale, 2, 0
delay 12 delay 12
call RoarEffect call RoarEffect
createvisualtask sub_8158D8C, 2, 0, 3 createvisualtask sub_8158D8C, 2, 0, 3
@ -4392,7 +4392,7 @@ Move_BULK_UP:
Move_COVET: Move_COVET:
loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_MAGENTA_HEART
loadspritegfx ANIM_TAG_ITEM_BAG loadspritegfx ANIM_TAG_ITEM_BAG
createvisualtask sub_815C478, 5, 0, 2, 0 createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20 createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15 delay 15
@ -4973,13 +4973,13 @@ Move_ROAR:
end end
RoarEffect: RoarEffect:
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1
delay 15 delay 15
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1
return return
Move_GROWL: Move_GROWL:
@ -8312,38 +8312,38 @@ MorningSun1:
Move_SWEET_SCENT: Move_SWEET_SCENT:
loadspritegfx ANIM_TAG_PINK_PETAL loadspritegfx ANIM_TAG_PINK_PETAL
playsewithpan SE_W230, SOUND_PAN_ATTACKER playsewithpan SE_W230, SOUND_PAN_ATTACKER
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 100 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100
delay 25 delay 25
setpan 0 setpan 0
call SweetScentEffect call SweetScentEffect
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 55, 0 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 55, 0
setpan SOUND_PAN_TARGET setpan SOUND_PAN_TARGET
createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21) createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21)
call SweetScentEffect call SweetScentEffect
waitforvisualfinish waitforvisualfinish
end end
SweetScentEffect: SweetScentEffect:
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 70, 1, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 70, 1, 64
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 60, 0, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 60, 0, 64
delay 5 delay 5
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 80, 1, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 80, 1, 64
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 58, 0, 120 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 58, 0, 120
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 90, 0, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 90, 0, 64
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 48, 0, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 48, 0, 64
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 95, 1, 80 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 95, 1, 80
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 75, 1, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 75, 1, 64
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 85, 0, 120 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 85, 0, 120
delay 2 delay 2
return return
@ -8404,32 +8404,32 @@ Move_FLATTER:
createvisualtask sub_815ABEC, 2 createvisualtask sub_815ABEC, 2
createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085CE5C0, ANIM_TARGET, 2, 0, -8, 80 createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80
delay 0 delay 0
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET
delay 10 delay 10
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET
delay 0 delay 0
createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
delay 5 delay 5
createvisualtask sub_8159210, 5, 229, SOUND_PAN_TARGET createvisualtask sub_8159210, 5, 229, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
@ -8437,9 +8437,9 @@ Move_FLATTER:
waitforvisualfinish waitforvisualfinish
createvisualtask sub_815AC8C, 2 createvisualtask sub_815AC8C, 2
end end
Flatter1: CreateFlatterConfetti:
createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 0 createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_ATTACKER
createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 1 createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_TARGET
return return
Move_ROLE_PLAY: Move_ROLE_PLAY:
@ -8449,7 +8449,7 @@ Move_ROLE_PLAY:
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W161, SOUND_PAN_ATTACKER playsewithpan SE_W161, SOUND_PAN_ATTACKER
waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30 waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30
createvisualtask sub_815CED8, 2 createvisualtask AnimTask_RolePlaySilhouette, 2
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER clearmonbg ANIM_ATK_PARTNER
createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE
@ -10450,31 +10450,31 @@ General_SmokeballEscape:
setalpha 12, 4 setalpha 12, 4
delay 0 delay 0
playsewithpan SE_BOWA2, SOUND_PAN_TARGET playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_TARGET, 0, 0, 32, 28, 30 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_TARGET, 0, 0, 32, 28, 30
delay 4 delay 4
playsewithpan SE_BOWA2, SOUND_PAN_TARGET playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 127, 2, 12, 20, 30 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 127, 2, 12, 20, 30
delay 12 delay 12
playsewithpan SE_BOWA2, SOUND_PAN_TARGET playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 126, 2, -28, 4, 30 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 126, 2, -28, 4, 30
delay 12 delay 12
playsewithpan SE_BOWA2, SOUND_PAN_TARGET playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 124, 2, 14, -20, 30 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 124, 2, 14, -20, 30
delay 4 delay 4
playsewithpan SE_BOWA2, SOUND_PAN_TARGET playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createvisualtask sub_81136E8, 2, 2 createvisualtask sub_81136E8, 2, 2
createsprite gUnknown_085CE734, ANIM_ATTACKER, 123, 3, 4, 4, 30 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 123, 3, 4, 4, 30
delay 14 delay 14
playsewithpan SE_BOWA2, SOUND_PAN_TARGET playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 122, 3, -14, 18, 46 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 46
delay 0 delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 121, 3, 14, -14, 46 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, -14, 46
delay 0 delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 120, 3, -12, -10, 46 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 120, 3, -12, -10, 46
delay 0 delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 119, 3, 14, 14, 46 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 119, 3, 14, 14, 46
delay 0 delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 118, 3, 0, 0, 46 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 118, 3, 0, 0, 46
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
invisible ANIM_ATTACKER invisible ANIM_ATTACKER

27
graphics/battle_anims/sprites/effect.pal
View File

@ -1,27 +0,0 @@
JASC-PAL
0100
24
230 205 8
230 172 41
222 148 65
222 115 90
213 82 123
213 57 148
205 24 172
205 0 205
205 0 189
205 0 164
205 0 131
205 0 106
213 0 82
213 0 49
213 0 24
222 0 0
222 8 0
222 41 0
222 74 0
222 98 0
230 131 0
230 156 0
230 189 0
238 222 0

3
include/battle_anim.h
View File

@ -147,8 +147,7 @@ void sub_80A78AC(struct Sprite *sprite);
void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused); void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused);
u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10); u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10);
void sub_80A749C(struct Sprite *sprite); void sub_80A749C(struct Sprite *sprite);
void sub_80A6814(u8 taskId); void DestroyAnimVisualTaskAndDisableBlend(u8 taskId);
void sub_80A6DEC(struct Sprite *sprite);
void DestroySpriteAndFreeResources_(struct Sprite *sprite); void DestroySpriteAndFreeResources_(struct Sprite *sprite);
void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId); void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId);

6
include/graphics.h
View File

@ -4630,9 +4630,9 @@ extern const u32 gBattleAnimSpritePalette_241[];
extern const u32 gBattleAnimSpritePalette_242[]; extern const u32 gBattleAnimSpritePalette_242[];
extern const u32 gBattleAnimSpritePalette_243[]; extern const u32 gBattleAnimSpritePalette_243[];
extern const u32 gBattleAnimSpritePalette_244[]; extern const u32 gBattleAnimSpritePalette_244[];
extern const u32 gUnknown_08C2DC68[]; extern const u32 gCureBubblesGfx[];
extern const u32 gUnknown_08C2DDA4[]; extern const u32 gCureBubblesPal[];
extern const u32 gUnknown_08C2DDC4[]; extern const u32 gCureBubblesTilemap[];
extern const u32 gBattleAnimSpritePalette_245[]; extern const u32 gBattleAnimSpritePalette_245[];
extern const u32 gBattleAnimSpritePalette_248[]; extern const u32 gBattleAnimSpritePalette_248[];
extern const u32 gBattleAnimSpritePalette_249[]; extern const u32 gBattleAnimSpritePalette_249[];

2
src/battle_anim_80A5C6C.c
View File

@ -703,7 +703,7 @@ void sub_80A67F4(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_80A6814(u8 taskId) void DestroyAnimVisualTaskAndDisableBlend(u8 taskId)
{ {
SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDCNT, 0);
SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0);

2
src/battle_anim_8170478.c
View File

@ -428,7 +428,7 @@ void unref_sub_8170478(u8 taskId)
sub_80A6B30(&unknownStruct); sub_80A6B30(&unknownStruct);
sub_80A6D48(unknownStruct.bgId, gUnknown_08C2EA9C); sub_80A6D48(unknownStruct.bgId, gUnknown_08C2EA9C);
sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2EA50, unknownStruct.tilesOffset); sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2EA50, unknownStruct.tilesOffset);
LoadCompressedPalette(gUnknown_08C2DDA4, unknownStruct.unk8 << 4, 32); LoadCompressedPalette(gCureBubblesPal, unknownStruct.unk8 << 4, 32);
gBattle_BG1_X = -gSprites[spriteId3].pos1.x + 32; gBattle_BG1_X = -gSprites[spriteId3].pos1.x + 32;
gBattle_BG1_Y = -gSprites[spriteId3].pos1.y - 32; gBattle_BG1_Y = -gSprites[spriteId3].pos1.y - 32;

546
src/battle_anim_effects_3.c
View File

File diff suppressed because it is too large Load Diff

7
src/battle_anim_utility_funcs.c
View File

@ -767,7 +767,8 @@ void sub_81177E4(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette)
void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u8 *gfx, const u8 *tilemap, const u16 *palette)
{ {
u16 species; u16 species;
u8 spriteId, spriteId2; u8 spriteId, spriteId2;
@ -818,8 +819,8 @@ void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5,
spriteId2 = sub_80A89C8(battler2, gBattlerSpriteIds[battler2], species); spriteId2 = sub_80A89C8(battler2, gBattlerSpriteIds[battler2], species);
sub_80A6B30(&unknownStruct); sub_80A6B30(&unknownStruct);
sub_80A6D60(&unknownStruct, arg9, 0); sub_80A6D60(&unknownStruct, tilemap, 0);
sub_80A6CC0(unknownStruct.bgId, arg8, unknownStruct.tilesOffset); sub_80A6CC0(unknownStruct.bgId, gfx, unknownStruct.tilesOffset);
LoadCompressedPalette(palette, unknownStruct.unk8 << 4, 32); LoadCompressedPalette(palette, unknownStruct.unk8 << 4, 32);
gBattle_BG1_X = 0; gBattle_BG1_X = 0;

6
src/graphics.c
View File

@ -897,9 +897,9 @@ const u32 gBattleStatMask6_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat6
const u32 gBattleStatMask7_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat7.gbapal.lz"); const u32 gBattleStatMask7_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat7.gbapal.lz");
const u32 gBattleStatMask8_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat8.gbapal.lz"); const u32 gBattleStatMask8_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat8.gbapal.lz");
const u32 gUnknown_08C2DC68[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.4bpp.lz"); const u32 gCureBubblesGfx[] = INCBIN_U8("graphics/battle_anims/masks/cure_bubbles.4bpp.lz");
const u32 gUnknown_08C2DDA4[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.gbapal.lz"); const u32 gCureBubblesPal[] = INCBIN_U16("graphics/battle_anims/masks/cure_bubbles.gbapal.lz");
const u32 gUnknown_08C2DDC4[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.bin.lz"); const u32 gCureBubblesTilemap[] = INCBIN_U8("graphics/battle_anims/masks/cure_bubbles.bin.lz");
const u32 gBattleAnimSpritePalette_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.gbapal.lz"); const u32 gBattleAnimSpritePalette_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.gbapal.lz");
const u32 gBattleAnimSpriteSheet_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.4bpp.lz"); const u32 gBattleAnimSpriteSheet_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.4bpp.lz");