diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-16 21:45:30 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-16 21:45:30 -0400 |
| commit | 2f43a411007194aef77849e4ea982e139e37507d (patch) | |
| tree | a93fdffc8a0afcc69ddf4148a2b10ffcd85ad4ea /data/battle_anims/special_effects.asm | |
| parent | Use a macro for BattleTransition_DoubleCircle data (diff) | |
| download | pokeyellow-2f43a411007194aef77849e4ea982e139e37507d.tar.gz pokeyellow-2f43a411007194aef77849e4ea982e139e37507d.tar.xz pokeyellow-2f43a411007194aef77849e4ea982e139e37507d.zip | |
Use a battle_anim macro for move animations' special effects and subanimations
Move animations' sound IDs are off by one from move IDs.
Diffstat (limited to 'data/battle_anims/special_effects.asm')
| -rw-r--r-- | data/battle_anims/special_effects.asm | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/battle_anims/special_effects.asm b/data/battle_anims/special_effects.asm index 50c89ffb..98385d47 100644 --- a/data/battle_anims/special_effects.asm +++ b/data/battle_anims/special_effects.asm @@ -5,28 +5,28 @@ ENDM AnimationIdSpecialEffects: ; animation id, effect routine address - anim_special_effect MEGA_PUNCH, AnimationFlashScreen - anim_special_effect GUILLOTINE, AnimationFlashScreen - anim_special_effect MEGA_KICK, AnimationFlashScreen - anim_special_effect HEADBUTT, AnimationFlashScreen - anim_special_effect TAIL_WHIP, TailWhipAnimationUnused - anim_special_effect GROWL, DoGrowlSpecialEffects - anim_special_effect DISABLE, AnimationFlashScreen - anim_special_effect BLIZZARD, DoBlizzardSpecialEffects - anim_special_effect BUBBLEBEAM, AnimationFlashScreen - anim_special_effect HYPER_BEAM, FlashScreenEveryFourFrameBlocks - anim_special_effect THUNDERBOLT, FlashScreenEveryEightFrameBlocks - anim_special_effect REFLECT, AnimationFlashScreen - anim_special_effect SELFDESTRUCT, DoExplodeSpecialEffects - anim_special_effect SPORE, AnimationFlashScreen - anim_special_effect EXPLOSION, DoExplodeSpecialEffects - anim_special_effect ROCK_SLIDE, DoRockSlideSpecialEffects - anim_special_effect TRADE_BALL_DROP_ANIM, TradeHidePokemon + anim_special_effect MEGA_PUNCH, AnimationFlashScreen + anim_special_effect GUILLOTINE, AnimationFlashScreen + anim_special_effect MEGA_KICK, AnimationFlashScreen + anim_special_effect HEADBUTT, AnimationFlashScreen + anim_special_effect TAIL_WHIP, TailWhipAnimationUnused + anim_special_effect GROWL, DoGrowlSpecialEffects + anim_special_effect DISABLE, AnimationFlashScreen + anim_special_effect BLIZZARD, DoBlizzardSpecialEffects + anim_special_effect BUBBLEBEAM, AnimationFlashScreen + anim_special_effect HYPER_BEAM, FlashScreenEveryFourFrameBlocks + anim_special_effect THUNDERBOLT, FlashScreenEveryEightFrameBlocks + anim_special_effect REFLECT, AnimationFlashScreen + anim_special_effect SELFDESTRUCT, DoExplodeSpecialEffects + anim_special_effect SPORE, AnimationFlashScreen + anim_special_effect EXPLOSION, DoExplodeSpecialEffects + anim_special_effect ROCK_SLIDE, DoRockSlideSpecialEffects + anim_special_effect TRADE_BALL_DROP_ANIM, TradeHidePokemon anim_special_effect TRADE_BALL_SHAKE_ANIM, TradeShakePokeball - anim_special_effect TRADE_BALL_TILT_ANIM, TradeJumpPokeball - anim_special_effect TOSS_ANIM, DoBallTossSpecialEffects - anim_special_effect SHAKE_ANIM, DoBallShakeSpecialEffects - anim_special_effect POOF_ANIM, DoPoofSpecialEffects - anim_special_effect GREATTOSS_ANIM, DoBallTossSpecialEffects - anim_special_effect ULTRATOSS_ANIM, DoBallTossSpecialEffects + anim_special_effect TRADE_BALL_TILT_ANIM, TradeJumpPokeball + anim_special_effect TOSS_ANIM, DoBallTossSpecialEffects + anim_special_effect SHAKE_ANIM, DoBallShakeSpecialEffects + anim_special_effect POOF_ANIM, DoPoofSpecialEffects + anim_special_effect GREATTOSS_ANIM, DoBallTossSpecialEffects + anim_special_effect ULTRATOSS_ANIM, DoBallTossSpecialEffects db -1 ; end |