ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-05 02:40:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

battle_anims_effects_2

Browse Source
This commit is contained in:
Sewef 2019-10-20 11:55:02 +02:00 committed by huderlem
parent e90c708383
commit 8531a17e10
3 changed files with 183 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
data/battle_anim_scripts.s
View File

@ -1992,26 +1992,26 @@ Move_ATTRACT:
loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3
createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER
delay 15 delay 15
createsprite gUnknown_085939A0, ANIM_TARGET, 3, 20, -8 createsprite gRedHeartProjectileSpriteTemplate, ANIM_TARGET, 3, 20, -8
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W213, SOUND_PAN_TARGET playsewithpan SE_W213, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 160, -32 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -32
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -256, -40 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -40
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 128, -16 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -16
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 416, -38 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -128, -22 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31
waitforvisualfinish waitforvisualfinish
waitplaysewithpan SE_W213B, 0, 15 waitplaysewithpan SE_W213B, 0, 15
createvisualtask AnimTask_HeartsBackground, 5 createvisualtask AnimTask_HeartsBackground, 5
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 16, 256, 0 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 16, 256, 0
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 224, 240, 15 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 224, 240, 15
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 126, 272, 30 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 126, 272, 30
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 80, 224, 45 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 80, 224, 45
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 170, 272, 60 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 170, 272, 60
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 40, 256, 75 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 40, 256, 75
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 112, 256, 90 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 112, 256, 90
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 200, 272, 90 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 200, 272, 90
delay 75 delay 75
createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27) createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27)
end end
@ -2893,8 +2893,8 @@ Move_GLARE:
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8
createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8
createvisualtask sub_81064F8, 5 createvisualtask sub_81064F8, 5
playsewithpan SE_W043, SOUND_PAN_ATTACKER playsewithpan SE_W043, SOUND_PAN_ATTACKER
delay 2 delay 2
@ -3047,8 +3047,8 @@ Move_STRUGGLE:
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
createsprite gUnknown_08593B80, ANIM_ATTACKER, 2, 0, 0, 2 createsprite gMovmentWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2
createsprite gUnknown_08593B80, ANIM_ATTACKER, 2, 0, 1, 2 createsprite gMovmentWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 2
loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4 loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4
waitforvisualfinish waitforvisualfinish
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2
@ -3392,7 +3392,7 @@ ExtremeSpeedContinue:
waitbgfadeout waitbgfadeout
createvisualtask sub_8117660, 5, -2304, 0, 1, -1 createvisualtask sub_8117660, 5, -2304, 0, 1, -1
waitbgfadein waitbgfadein
createvisualtask sub_810577C, 2 createvisualtask AnimTask_StretchAttacker, 2
loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3 loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3
waitforvisualfinish waitforvisualfinish
delay 1 delay 1
@ -4266,8 +4266,8 @@ Move_TICKLE:
loadspritegfx ANIM_TAG_EYE_SPARKLE loadspritegfx ANIM_TAG_EYE_SPARKLE
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 0, 16, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 0, 16, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8
createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8
playsewithpan SE_W197, SOUND_PAN_ATTACKER playsewithpan SE_W197, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 16, 0, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 16, 0, RGB_BLACK
@ -7700,24 +7700,24 @@ Move_HEAL_BELL:
createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8105CB4, 5 createvisualtask sub_8105CB4, 5
createsprite gUnknown_08593938, ANIM_ATTACKER, 2, 0, -24, 0, 1 createsprite gBellSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 1
delay 12 delay 12
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 48, -18, 35, 0, 0 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 48, -18, 35, 0, 0
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -48, 20, 30, 1, 1 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -48, 20, 30, 1, 1
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -38, -29, 30, 2, 2 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -38, -29, 30, 2, 2
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 36, 18, 30, 3, 3 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 36, 18, 30, 3, 3
call HealBell1 call HealBell1
delay 0x21 delay 0x21
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 19, 26, 35, 4, 4 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 19, 26, 35, 4, 4
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -34, -12, 30, 5, 5 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -34, -12, 30, 5, 5
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 41, -20, 34, 6, 2 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 41, -20, 34, 6, 2
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -15, 26, 32, 7, 0 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -15, 26, 32, 7, 0
call HealBell1 call HealBell1
delay 0x21 delay 0x21
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -48, 18, 31, 0, 2 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -48, 18, 31, 0, 2
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 48, -20, 30, 2, 5 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 48, -20, 30, 2, 5
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 38, 29, 33, 4, 3 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 38, 29, 33, 4, 3
createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -36, -18, 30, 6, 1 createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -36, -18, 30, 6, 1
call HealBell1 call HealBell1
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8105D60, 5 createvisualtask sub_8105D60, 5
@ -7747,7 +7747,7 @@ HealBell1:
Move_FAKE_OUT: Move_FAKE_OUT:
playsewithpan SE_W260, 0 playsewithpan SE_W260, 0
createvisualtask sub_8105EB0, 5 createvisualtask AnimTask_FakeOut, 5
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W166, SOUND_PAN_TARGET playsewithpan SE_W166, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
@ -7765,8 +7765,8 @@ Move_SCARY_FACE:
playsewithpan SE_W043, SOUND_PAN_ATTACKER playsewithpan SE_W043, SOUND_PAN_ATTACKER
createvisualtask sub_81064F8, 5 createvisualtask sub_81064F8, 5
delay 13 delay 13
createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8
createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8
waitforvisualfinish waitforvisualfinish
createvisualtask sub_810A094, 3, 20, 1, 0 createvisualtask sub_810A094, 3, 20, 1, 0
playsewithpan SE_W081B, SOUND_PAN_TARGET playsewithpan SE_W081B, SOUND_PAN_TARGET
@ -7777,33 +7777,33 @@ Move_SCARY_FACE:
Move_SWEET_KISS: Move_SWEET_KISS:
loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_RED_HEART
loadspritegfx ANIM_TAG_ANGEL loadspritegfx ANIM_TAG_ANGEL
createsprite gUnknown_08593AA8, ANIM_TARGET, 2, 16, -48 createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48
playsewithpan SE_W215, SOUND_PAN_TARGET playsewithpan SE_W215, SOUND_PAN_TARGET
delay 23 delay 23
playsewithpan SE_W215, SOUND_PAN_TARGET playsewithpan SE_W215, SOUND_PAN_TARGET
delay 23 delay 23
playsewithpan SE_W215, SOUND_PAN_TARGET playsewithpan SE_W215, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 160, -30 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -30
playsewithpan SE_W213, SOUND_PAN_TARGET playsewithpan SE_W213, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -256, -42 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -42
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 128, -14 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -14
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 416, -38 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -128, -22 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31
end end
Move_LOVELY_KISS: Move_LOVELY_KISS:
loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_PINK_HEART
loadspritegfx ANIM_TAG_DEVIL loadspritegfx ANIM_TAG_DEVIL
createsprite gUnknown_08593AF0, ANIM_TARGET, 2, 0, -24 createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24
playsewithpan SE_W060B, SOUND_PAN_TARGET playsewithpan SE_W060B, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W213, SOUND_PAN_TARGET playsewithpan SE_W213, SOUND_PAN_TARGET
createsprite gUnknown_08593AC0, ANIM_TARGET, 3, -256, -42 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -256, -42
createsprite gUnknown_08593AC0, ANIM_TARGET, 3, 128, -14 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 128, -14
createsprite gUnknown_08593AC0, ANIM_TARGET, 3, 416, -38 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 416, -38
createsprite gUnknown_08593AC0, ANIM_TARGET, 3, -128, -22 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -128, -22
end end
Move_FURY_SWIPES: Move_FURY_SWIPES:
@ -7811,13 +7811,13 @@ Move_FURY_SWIPES:
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5
delay 4 delay 4
playsewithpan SE_W010, SOUND_PAN_TARGET playsewithpan SE_W010, SOUND_PAN_TARGET
createsprite gUnknown_08593B38, ANIM_TARGET, 2, 16, 0, 1 createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, 16, 0, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1
delay 10 delay 10
createsprite gHorizontalLungeSpriteTemplate, ANIM_TARGET, 2, 5, 5 createsprite gHorizontalLungeSpriteTemplate, ANIM_TARGET, 2, 5, 5
delay 4 delay 4
playsewithpan SE_W010, SOUND_PAN_TARGET playsewithpan SE_W010, SOUND_PAN_TARGET
createsprite gUnknown_08593B38, ANIM_TARGET, 2, -16, 0, 0 createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, -16, 0, 0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1
end end
@ -8194,14 +8194,14 @@ Move_SPIT_UP:
delay 45 delay 45
playsewithpan SE_W255, SOUND_PAN_ATTACKER playsewithpan SE_W255, SOUND_PAN_ATTACKER
delay 3 delay 3
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 0, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 12
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 32, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 32, 12
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 64, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 64, 12
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 96, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 96, 12
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 128, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 128, 12
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 160, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 160, 12
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 192, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 192, 12
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 224, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 224, 12
delay 5 delay 5
jumpifmoveturn 2, SpitUpStrong jumpifmoveturn 2, SpitUpStrong
jumpifmoveturn 3, SpitUpStrongest jumpifmoveturn 3, SpitUpStrongest
@ -8216,20 +8216,20 @@ SpitUpContinue:
waitforvisualfinish waitforvisualfinish
end end
SpitUpStrong: SpitUpStrong:
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 16 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 16
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 80 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 80
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 144 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 144
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 208 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 208
goto SpitUpContinue goto SpitUpContinue
SpitUpStrongest: SpitUpStrongest:
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 16 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 16
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 48 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 48
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 80 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 80
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 112 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 112
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 144 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 144
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 176 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 176
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 208 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 208
createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 240 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 240
goto SpitUpContinue goto SpitUpContinue
Move_SWALLOW: Move_SWALLOW:

218
src/battle_anim_effects_2.c
View File

@ -39,20 +39,20 @@ void AnimHyperVoiceRing(struct Sprite *);
void AnimUproarRing(struct Sprite *); void AnimUproarRing(struct Sprite *);
void AnimSoftBoiledEgg(struct Sprite *); void AnimSoftBoiledEgg(struct Sprite *);
void AnimSpeedDust(struct Sprite *); void AnimSpeedDust(struct Sprite *);
void sub_8105DE8(struct Sprite *); void AnimHealBellMusicNote(struct Sprite *);
void sub_8105E60(struct Sprite *); void AnimMagentaHeart(struct Sprite *);
void sub_8106140(struct Sprite *); void AnimRedHeartProjectile(struct Sprite *);
void sub_81061C4(struct Sprite *); void AnimParticuleBurst(struct Sprite *);
void sub_810624C(struct Sprite *); void AnimRedHeartRising(struct Sprite *);
void AnimOrbitFast(struct Sprite *); void AnimOrbitFast(struct Sprite *);
void AnimOrbitScatter(struct Sprite *); void AnimOrbitScatter(struct Sprite *);
void sub_8106944(struct Sprite *); void AnimSpitUpOrb(struct Sprite *);
void sub_81069B8(struct Sprite *); void AnimEyeSparkle(struct Sprite *);
void sub_81069D0(struct Sprite *); void AnimAngel(struct Sprite *);
void sub_8106AD0(struct Sprite *); void AnimPinkHeart(struct Sprite *);
void sub_8106B54(struct Sprite *); void AnimDevil(struct Sprite *);
void sub_8106C80(struct Sprite *); void AnimFurySwipes(struct Sprite *);
void sub_8106CD0(struct Sprite *); void AnimMovmentWaves(struct Sprite *);
void sub_8106E00(struct Sprite *); void sub_8106E00(struct Sprite *);
void sub_8106F00(struct Sprite *); void sub_8106F00(struct Sprite *);
void sub_8106F60(struct Sprite *); void sub_8106F60(struct Sprite *);
@ -91,10 +91,10 @@ static void sub_81057B8(u8);
static void sub_8105878(u8); static void sub_8105878(u8);
static void sub_81059E0(u8); static void sub_81059E0(u8);
static void SpeedDust_Step1(u8); static void SpeedDust_Step1(u8);
static void sub_8105F30(u8); static void FakeOutStep1(u8);
static void sub_8105F84(u8); static void FakeOutStep2(u8);
static void sub_810618C(struct Sprite *); static void AnimRedHeartProjectile_Step(struct Sprite *);
static void sub_810627C(struct Sprite *); static void AnimRedHeartRising_Step(struct Sprite *);
static void sub_81063A8(u8); static void sub_81063A8(u8);
static void sub_81065EC(u8); static void sub_81065EC(u8);
static void AnimOrbitFastStep(struct Sprite *); static void AnimOrbitFastStep(struct Sprite *);
@ -803,7 +803,7 @@ const struct SpriteTemplate gUproarRingSpriteTemplate =
.callback = AnimUproarRing, .callback = AnimUproarRing,
}; };
const union AffineAnimCmd gUnknown_085938B0[] = const union AffineAnimCmd gStretchAttackerAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(96, -13, 0, 8), AFFINEANIMCMD_FRAME(96, -13, 0, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
@ -835,7 +835,7 @@ const struct SpriteTemplate gSpeedDustSpriteTemplate =
.callback = AnimSpeedDust, .callback = AnimSpeedDust,
}; };
const s8 gUnknown_085938F4[][2] = const s8 gSpeedDustPosTable[][2] =
{ {
{30, 28}, {30, 28},
{-20, 24}, {-20, 24},
@ -843,7 +843,7 @@ const s8 gUnknown_085938F4[][2] =
{-10, 28}, {-10, 28},
}; };
const union AnimCmd gUnknown_085938FC[] = const union AnimCmd gBellAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(16, 6), ANIMCMD_FRAME(16, 6),
@ -861,30 +861,30 @@ const union AnimCmd gUnknown_085938FC[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_08593934[] = const union AnimCmd *const gBellAnimTable[] =
{ {
gUnknown_085938FC, gBellAnimCmds,
}; };
const struct SpriteTemplate gUnknown_08593938 = const struct SpriteTemplate gBellSpriteTemplate =
{ {
.tileTag = ANIM_TAG_BELL, .tileTag = ANIM_TAG_BELL,
.paletteTag = ANIM_TAG_BELL, .paletteTag = ANIM_TAG_BELL,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_08593934, .anims = gBellAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimSparklingParticle, .callback = AnimSparklingParticle,
}; };
const u16 gUnknown_08593950[] = const u16 gMusicNotePaletteTagsTable[] =
{ {
ANIM_TAG_MUSIC_NOTES_2, ANIM_TAG_MUSIC_NOTES_2,
ANIM_SPRITES_START - 1, ANIM_SPRITES_START - 1,
ANIM_SPRITES_START - 2, ANIM_SPRITES_START - 2,
}; };
const struct SpriteTemplate gUnknown_08593958 = const struct SpriteTemplate gHealBellMusicNoteSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MUSIC_NOTES_2, .tileTag = ANIM_TAG_MUSIC_NOTES_2,
.paletteTag = ANIM_TAG_MUSIC_NOTES_2, .paletteTag = ANIM_TAG_MUSIC_NOTES_2,
@ -892,7 +892,7 @@ const struct SpriteTemplate gUnknown_08593958 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8105DE8, .callback = AnimHealBellMusicNote,
}; };
const struct SpriteTemplate gMagentaHeartSpriteTemplate = const struct SpriteTemplate gMagentaHeartSpriteTemplate =
@ -903,7 +903,7 @@ const struct SpriteTemplate gMagentaHeartSpriteTemplate =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8105E60, .callback = AnimMagentaHeart,
}; };
const union AffineAnimCmd gUnknown_08593988[] = const union AffineAnimCmd gUnknown_08593988[] =
@ -913,7 +913,7 @@ const union AffineAnimCmd gUnknown_08593988[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const struct SpriteTemplate gUnknown_085939A0 = const struct SpriteTemplate gRedHeartProjectileSpriteTemplate =
{ {
.tileTag = ANIM_TAG_RED_HEART, .tileTag = ANIM_TAG_RED_HEART,
.paletteTag = ANIM_TAG_RED_HEART, .paletteTag = ANIM_TAG_RED_HEART,
@ -921,10 +921,10 @@ const struct SpriteTemplate gUnknown_085939A0 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8106140, .callback = AnimRedHeartProjectile,
}; };
const struct SpriteTemplate gBattleAnimSpriteTemplate_85939B8 = const struct SpriteTemplate gRedHeartBurstSpriteTemplate =
{ {
.tileTag = ANIM_TAG_RED_HEART, .tileTag = ANIM_TAG_RED_HEART,
.paletteTag = ANIM_TAG_RED_HEART, .paletteTag = ANIM_TAG_RED_HEART,
@ -932,10 +932,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_85939B8 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_81061C4, .callback = AnimParticuleBurst,
}; };
const struct SpriteTemplate gUnknown_085939D0 = const struct SpriteTemplate gRedHeartRisingSpriteTemplate =
{ {
.tileTag = ANIM_TAG_RED_HEART, .tileTag = ANIM_TAG_RED_HEART,
.paletteTag = ANIM_TAG_RED_HEART, .paletteTag = ANIM_TAG_RED_HEART,
@ -943,19 +943,19 @@ const struct SpriteTemplate gUnknown_085939D0 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_810624C, .callback = AnimRedHeartRising,
}; };
const union AffineAnimCmd gUnknown_085939E8[] = const union AffineAnimCmd gHiddenPowerOrbAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0), AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 1), AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 1),
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
const union AffineAnimCmd *const gUnknown_08593A00[] = const union AffineAnimCmd *const gHiddenPowerOrbAffineAnimTable[] =
{ {
gUnknown_085939E8, gHiddenPowerOrbAffineAnimCmds,
}; };
const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate =
@ -965,7 +965,7 @@ const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate =
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_08593A00, .affineAnims = gHiddenPowerOrbAffineAnimTable,
.callback = AnimOrbitFast, .callback = AnimOrbitFast,
}; };
@ -976,34 +976,34 @@ const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate =
.oam = &gOamData_AffineDouble_ObjNormal_16x16, .oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_08593A00, .affineAnims = gHiddenPowerOrbAffineAnimTable,
.callback = AnimOrbitScatter, .callback = AnimOrbitScatter,
}; };
const union AffineAnimCmd gUnknown_08593A34[] = const union AffineAnimCmd gSpitUpOrbAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0), AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 1), AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 1),
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
const union AffineAnimCmd *const gUnknown_08593A4C[] = const union AffineAnimCmd *const gSpitUpOrbAffineAnimTable[] =
{ {
gUnknown_08593A34, gSpitUpOrbAffineAnimCmds,
}; };
const struct SpriteTemplate gUnknown_08593A50 = const struct SpriteTemplate gSpitUpOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_RED_ORB_2, .tileTag = ANIM_TAG_RED_ORB_2,
.paletteTag = ANIM_TAG_RED_ORB_2, .paletteTag = ANIM_TAG_RED_ORB_2,
.oam = &gOamData_AffineDouble_ObjNormal_8x8, .oam = &gOamData_AffineDouble_ObjNormal_8x8,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_08593A4C, .affineAnims = gSpitUpOrbAffineAnimTable,
.callback = sub_8106944, .callback = AnimSpitUpOrb,
}; };
const union AnimCmd gUnknown_08593A68[] = const union AnimCmd gEyeSparkleAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(4, 4), ANIMCMD_FRAME(4, 4),
@ -1013,45 +1013,45 @@ const union AnimCmd gUnknown_08593A68[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_08593A80[] = const union AnimCmd *const gEyeSparkleAnimTable[] =
{ {
gUnknown_08593A68, gEyeSparkleAnimCmds,
}; };
const struct SpriteTemplate gUnknown_08593A84 = const struct SpriteTemplate gEyeSparkleSpriteTemplate =
{ {
.tileTag = ANIM_TAG_EYE_SPARKLE, .tileTag = ANIM_TAG_EYE_SPARKLE,
.paletteTag = ANIM_TAG_EYE_SPARKLE, .paletteTag = ANIM_TAG_EYE_SPARKLE,
.oam = &gOamData_AffineOff_ObjNormal_16x16, .oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_08593A80, .anims = gEyeSparkleAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_81069B8, .callback = AnimEyeSparkle,
}; };
const union AnimCmd gUnknown_08593A9C[] = const union AnimCmd gAngelSpriteAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 24), ANIMCMD_FRAME(0, 24),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_08593AA4[] = const union AnimCmd *const gAngelSpriteAnimTable[] =
{ {
gUnknown_08593A9C, gAngelSpriteAnimCmds,
}; };
const struct SpriteTemplate gUnknown_08593AA8 = const struct SpriteTemplate gAngelSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ANGEL, .tileTag = ANIM_TAG_ANGEL,
.paletteTag = ANIM_TAG_ANGEL, .paletteTag = ANIM_TAG_ANGEL,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_08593AA4, .anims = gAngelSpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_81069D0, .callback = AnimAngel,
}; };
const struct SpriteTemplate gUnknown_08593AC0 = const struct SpriteTemplate gPinkHeartSpriteTemplate =
{ {
.tileTag = ANIM_TAG_PINK_HEART, .tileTag = ANIM_TAG_PINK_HEART,
.paletteTag = ANIM_TAG_PINK_HEART, .paletteTag = ANIM_TAG_PINK_HEART,
@ -1059,36 +1059,36 @@ const struct SpriteTemplate gUnknown_08593AC0 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8106AD0, .callback = AnimPinkHeart,
}; };
const union AnimCmd gUnknown_08593AD8[] = const union AnimCmd gDevilAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd gUnknown_08593AE0[] = const union AnimCmd gDevilAnimCmds2[] =
{ {
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd *const gUnknown_08593AE8[] = const union AnimCmd *const gDevilAnimTable[] =
{ {
gUnknown_08593AD8, gDevilAnimCmds1,
gUnknown_08593AE0, gDevilAnimCmds2,
}; };
const struct SpriteTemplate gUnknown_08593AF0 = const struct SpriteTemplate gDevilSpriteTemplate =
{ {
.tileTag = ANIM_TAG_DEVIL, .tileTag = ANIM_TAG_DEVIL,
.paletteTag = ANIM_TAG_DEVIL, .paletteTag = ANIM_TAG_DEVIL,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_08593AE8, .anims = gDevilAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8106B54, .callback = AnimDevil,
}; };
const union AnimCmd gUnknown_08593B08[] = const union AnimCmd gUnknown_08593B08[] =
@ -1109,24 +1109,24 @@ const union AnimCmd gUnknown_08593B1C[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_08593B30[] = const union AnimCmd *const gFurySwipesAnimTable[] =
{ {
gUnknown_08593B08, gUnknown_08593B08,
gUnknown_08593B1C, gUnknown_08593B1C,
}; };
const struct SpriteTemplate gUnknown_08593B38 = const struct SpriteTemplate gFurySwipesSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SWIPE, .tileTag = ANIM_TAG_SWIPE,
.paletteTag = ANIM_TAG_SWIPE, .paletteTag = ANIM_TAG_SWIPE,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_08593B30, .anims = gFurySwipesAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8106C80, .callback = AnimFurySwipes,
}; };
const union AnimCmd gUnknown_08593B50[] = const union AnimCmd gMovementWavesAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(16, 8), ANIMCMD_FRAME(16, 8),
@ -1135,7 +1135,7 @@ const union AnimCmd gUnknown_08593B50[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_08593B64[] = const union AnimCmd gMovementWavesAnimCmds2[] =
{ {
ANIMCMD_FRAME(16, 8, .hFlip = TRUE), ANIMCMD_FRAME(16, 8, .hFlip = TRUE),
ANIMCMD_FRAME(32, 8, .hFlip = TRUE), ANIMCMD_FRAME(32, 8, .hFlip = TRUE),
@ -1144,21 +1144,21 @@ const union AnimCmd gUnknown_08593B64[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_08593B78[] = const union AnimCmd *const gMovementWavesAnimTable[] =
{ {
gUnknown_08593B50, gMovementWavesAnimCmds1,
gUnknown_08593B64, gMovementWavesAnimCmds2,
}; };
const struct SpriteTemplate gUnknown_08593B80 = const struct SpriteTemplate gMovmentWavesSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MOVEMENT_WAVES, .tileTag = ANIM_TAG_MOVEMENT_WAVES,
.paletteTag = ANIM_TAG_MOVEMENT_WAVES, .paletteTag = ANIM_TAG_MOVEMENT_WAVES,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_08593B78, .anims = gMovementWavesAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8106CD0, .callback = AnimMovmentWaves,
}; };
const union AffineAnimCmd gUnknown_08593B98[] = const union AffineAnimCmd gUnknown_08593B98[] =
@ -2773,12 +2773,12 @@ static void AnimSoftBoiledEgg_Step4_Callback(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_810577C(u8 taskId) void AnimTask_StretchAttacker(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
task->data[0] = spriteId; task->data[0] = spriteId;
PrepareAffineAnimInTaskData(task, spriteId, gUnknown_085938B0); PrepareAffineAnimInTaskData(task, spriteId, gStretchAttackerAffineAnimCmds);
task->func = sub_81057B8; task->func = sub_81057B8;
} }
@ -2969,8 +2969,8 @@ static void SpeedDust_Step1(u8 taskId)
{ {
gSprites[spriteId].data[0] = taskId; gSprites[spriteId].data[0] = taskId;
gSprites[spriteId].data[1] = 13; gSprites[spriteId].data[1] = 13;
gSprites[spriteId].pos2.x = gUnknown_085938F4[task->data[2]][0]; gSprites[spriteId].pos2.x = gSpeedDustPosTable[task->data[2]][0];
gSprites[spriteId].pos2.y = gUnknown_085938F4[task->data[2]][1]; gSprites[spriteId].pos2.y = gSpeedDustPosTable[task->data[2]][1];
task->data[13]++; task->data[13]++;
if (++task->data[2] > 3) if (++task->data[2] > 3)
{ {
@ -3020,21 +3020,21 @@ void sub_8105D60(u8 taskId)
{ {
int i; int i;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
FreeSpritePaletteByTag(gUnknown_08593950[i]); FreeSpritePaletteByTag(gMusicNotePaletteTagsTable[i]);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
static void sub_8105D88(struct Sprite *sprite, u8 a, u8 b) static void SetMusicNotePalette(struct Sprite *sprite, u8 a, u8 b)
{ {
u8 tile; u8 tile;
tile = (b & 1); tile = (b & 1);
tile = ((-tile | tile) >> 31) & 32; tile = ((-tile | tile) >> 31) & 32;
sprite->oam.tileNum += tile + (a << 2); sprite->oam.tileNum += tile + (a << 2);
sprite->oam.paletteNum = IndexOfSpritePaletteTag(gUnknown_08593950[b >> 1]); sprite->oam.paletteNum = IndexOfSpritePaletteTag(gMusicNotePaletteTagsTable[b >> 1]);
} }
void sub_8105DE8(struct Sprite *sprite) void AnimHealBellMusicNote(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, FALSE); InitSpritePosToAnimAttacker(sprite, FALSE);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@ -3045,10 +3045,10 @@ void sub_8105DE8(struct Sprite *sprite)
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3]; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3];
sprite->callback = StartAnimLinearTranslation; sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
sub_8105D88(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]); SetMusicNotePalette(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]);
} }
void sub_8105E60(struct Sprite *sprite) void AnimMagentaHeart(struct Sprite *sprite)
{ {
if (++sprite->data[0] == 1) if (++sprite->data[0] == 1)
InitSpritePosToAnimAttacker(sprite, FALSE); InitSpritePosToAnimAttacker(sprite, FALSE);
@ -3061,7 +3061,7 @@ void sub_8105E60(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_8105EB0(u8 taskId) void AnimTask_FakeOut(u8 taskId)
{ {
u16 win0h = IsContest() ? 0x98 : 0xF0; u16 win0h = IsContest() ? 0x98 : 0xF0;
u16 win0v = 0; u16 win0v = 0;
@ -3076,17 +3076,17 @@ void sub_8105EB0(u8 taskId)
SetGpuReg(REG_OFFSET_BLDY, 0x10); SetGpuReg(REG_OFFSET_BLDY, 0x10);
gTasks[taskId].data[0] = win0v; gTasks[taskId].data[0] = win0v;
gTasks[taskId].data[1] = win0h; gTasks[taskId].data[1] = win0h;
gTasks[taskId].func = sub_8105F30; gTasks[taskId].func = FakeOutStep1;
} }
static void sub_8105F30(u8 taskId) static void FakeOutStep1(u8 taskId)
{ {
gTasks[taskId].data[0] += 13; gTasks[taskId].data[0] += 13;
gTasks[taskId].data[1] -= 13; gTasks[taskId].data[1] -= 13;
if (gTasks[taskId].data[0] >= gTasks[taskId].data[1]) if (gTasks[taskId].data[0] >= gTasks[taskId].data[1])
{ {
gBattle_WIN0H = 0; gBattle_WIN0H = 0;
gTasks[taskId].func = sub_8105F84; gTasks[taskId].func = FakeOutStep2;
} }
else else
{ {
@ -3094,7 +3094,7 @@ static void sub_8105F30(u8 taskId)
} }
} }
static void sub_8105F84(u8 taskId) static void FakeOutStep2(u8 taskId)
{ {
if (++gTasks[taskId].data[10] == 5) if (++gTasks[taskId].data[10] == 5)
{ {
@ -3154,7 +3154,7 @@ void sub_81060B0(u8 taskId)
} }
} }
void sub_8106140(struct Sprite *sprite) void AnimRedHeartProjectile(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, TRUE); InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = 95; sprite->data[0] = 95;
@ -3163,10 +3163,10 @@ void sub_8106140(struct Sprite *sprite)
sprite->data[3] = sprite->pos1.y; sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
InitAnimLinearTranslation(sprite); InitAnimLinearTranslation(sprite);
sprite->callback = sub_810618C; sprite->callback = AnimRedHeartProjectile_Step;
} }
static void sub_810618C(struct Sprite *sprite) static void AnimRedHeartProjectile_Step(struct Sprite *sprite)
{ {
if (!AnimTranslateLinear(sprite)) if (!AnimTranslateLinear(sprite))
{ {
@ -3179,7 +3179,7 @@ static void sub_810618C(struct Sprite *sprite)
} }
} }
void sub_81061C4(struct Sprite *sprite) void AnimParticuleBurst(struct Sprite *sprite)
{ {
if (sprite->data[0] == 0) if (sprite->data[0] == 0)
{ {
@ -3201,17 +3201,17 @@ void sub_81061C4(struct Sprite *sprite)
} }
} }
void sub_810624C(struct Sprite *sprite) void AnimRedHeartRising(struct Sprite *sprite)
{ {
sprite->pos1.x = gBattleAnimArgs[0]; sprite->pos1.x = gBattleAnimArgs[0];
sprite->pos1.y = 160; sprite->pos1.y = 160;
sprite->data[0] = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = gBattleAnimArgs[1]; sprite->data[1] = gBattleAnimArgs[1];
sprite->callback = WaitAnimForDuration; sprite->callback = WaitAnimForDuration;
StoreSpriteCallbackInData6(sprite, sub_810627C); StoreSpriteCallbackInData6(sprite, AnimRedHeartRising_Step);
} }
static void sub_810627C(struct Sprite *sprite) static void AnimRedHeartRising_Step(struct Sprite *sprite)
{ {
s16 y; s16 y;
sprite->data[2] += sprite->data[1]; sprite->data[2] += sprite->data[1];
@ -3462,7 +3462,7 @@ static void AnimOrbitScatterStep(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_8106914(struct Sprite *sprite) static void AnimSpitUpOrb_Step(struct Sprite *sprite)
{ {
sprite->pos2.x += sprite->data[0]; sprite->pos2.x += sprite->data[0];
sprite->pos2.y += sprite->data[1]; sprite->pos2.y += sprite->data[1];
@ -3470,14 +3470,14 @@ static void sub_8106914(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_8106944(struct Sprite *sprite) void AnimSpitUpOrb(struct Sprite *sprite)
{ {
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
sprite->data[0] = Sin(gBattleAnimArgs[0], 10); sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
sprite->data[1] = Cos(gBattleAnimArgs[0], 7); sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
sprite->data[2] = gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[1];
sprite->callback = sub_8106914; sprite->callback = AnimSpitUpOrb_Step;
} }
static void sub_810699C(struct Sprite *sprite) static void sub_810699C(struct Sprite *sprite)
@ -3486,13 +3486,13 @@ static void sub_810699C(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_81069B8(struct Sprite *sprite) void AnimEyeSparkle(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, TRUE); InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->callback = sub_810699C; sprite->callback = sub_810699C;
} }
void sub_81069D0(struct Sprite *sprite) void AnimAngel(struct Sprite *sprite)
{ {
s16 var0; s16 var0;
if (!sprite->data[0]) if (!sprite->data[0])
@ -3530,7 +3530,7 @@ static void sub_8106A64(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_8106AD0(struct Sprite *sprite) void AnimPinkHeart(struct Sprite *sprite)
{ {
if (sprite->data[0] == 0) if (sprite->data[0] == 0)
{ {
@ -3556,7 +3556,7 @@ void sub_8106AD0(struct Sprite *sprite)
} }
} }
void sub_8106B54(struct Sprite *sprite) void AnimDevil(struct Sprite *sprite)
{ {
if (sprite->data[3] == 0) if (sprite->data[3] == 0)
{ {
@ -3585,7 +3585,7 @@ void sub_8106B54(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_8106C80(struct Sprite *sprite) void AnimFurySwipes(struct Sprite *sprite)
{ {
if (sprite->data[0] == 0) if (sprite->data[0] == 0)
{ {
@ -3600,7 +3600,7 @@ void sub_8106C80(struct Sprite *sprite)
} }
} }
void sub_8106CD0(struct Sprite *sprite) void AnimMovmentWaves(struct Sprite *sprite)
{ {
if (!gBattleAnimArgs[2]) if (!gBattleAnimArgs[2])
{ {

4
src/battle_anim_effects_3.c
View File

@ -63,7 +63,7 @@ void AnimForesightMagnifyingGlass(struct Sprite *);
void AnimMeteorMashStar(struct Sprite *); void AnimMeteorMashStar(struct Sprite *);
void AnimBlockX(struct Sprite *); void AnimBlockX(struct Sprite *);
void sub_815FE80(struct Sprite *); void sub_815FE80(struct Sprite *);
void sub_81061C4(struct Sprite *); void AnimParticuleBurst(struct Sprite *);
void AnimKnockOffStrike(struct Sprite *); void AnimKnockOffStrike(struct Sprite *);
void AnimRecycle(struct Sprite *); void AnimRecycle(struct Sprite *);
static void sub_815A114(struct Sprite *); static void sub_815A114(struct Sprite *);
@ -1079,7 +1079,7 @@ const struct SpriteTemplate gUnknown_085CE8F4 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_81061C4, .callback = AnimParticuleBurst,
}; };
const struct SpriteTemplate gBlockXSpriteTemplate = const struct SpriteTemplate gBlockXSpriteTemplate =