diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-13 23:26:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-13 23:26:46 -0500 |
| commit | f42eafc85b007cd27e90bc9a1350d589e31bda43 (patch) | |
| tree | 7a09999f6ac2fc2d1b36ece5ec484ec6527a201f /data/battle_anim_scripts.s | |
| parent | 4c4fa1f25e55e41f469604a984a820f5a7f30e90 (diff) | |
| parent | 8d18d03c791c40bad532c62f217b0f82aadec6d2 (diff) | |
Merge branch 'master' into doc-banim
Diffstat (limited to 'data/battle_anim_scripts.s')
| -rw-r--r-- | data/battle_anim_scripts.s | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 2c5c9ba04..7e970ed17 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -2,6 +2,7 @@ #include "constants/battle_anim.h" #include "constants/rgb.h" #include "constants/songs.h" +#include "constants/sound.h" #include "constants/moves.h" .include "asm/macros.inc" .include "asm/macros/battle_anim_script.inc" @@ -4960,7 +4961,7 @@ Move_ROAR: monbg ANIM_ATTACKER splitbgprio ANIM_ATTACKER setalpha 8, 8 - createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, 2 + createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_ROAR createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 call RoarEffect delay 20 @@ -4985,7 +4986,7 @@ RoarEffect: Move_GROWL: loadspritegfx ANIM_TAG_NOISE_LINE - createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, 255 + createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_GROWL call RoarEffect delay 10 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1 @@ -8499,14 +8500,15 @@ Move_BLAZE_KICK: Move_HYPER_VOICE: loadspritegfx ANIM_TAG_THIN_RING - createvisualtask SoundTask_PlayCryWithEcho, 5, 0 + createvisualtask SoundTask_PlayCryWithEcho, 5, FALSE call HyperVoiceEffect waitforvisualfinish delay 8 - createvisualtask SoundTask_PlayCryWithEcho, 5, 1 + createvisualtask SoundTask_PlayCryWithEcho, 5, TRUE call HyperVoiceEffect waitforvisualfinish end + HyperVoiceEffect: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 8, 0, RGB_YELLOW createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_ATTACKER, 0 |