From 479f6be51a4736ba2b614a45b765657cf8d4b927 Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 17 Nov 2020 15:31:18 -0700 Subject: [PATCH] redo power trick anim --- data/battle_anim_scripts.s | 22 ++++++++-------------- src/battle_anim_new.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index fb6b6b1a83..70ed22c9e5 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1403,21 +1403,15 @@ Move_WRING_OUT: end Move_POWER_TRICK: - loadspritegfx ANIM_TAG_THIN_RING - monbg ANIM_ATK_PARTNER + loadspritegfx ANIM_TAG_POWER_TRICK + loopsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET 0xa 0x3 + createvisualtask AnimTask_UproarDistortion 0x2, 0x0 + createsprite gPowerTrickSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 0, SOUND_PAN_TARGET, 0 + delay 0x10 + createvisualtask AnimTask_UproarDistortion 0x2, 0x0 + delay 0x10 + createvisualtask AnimTask_UproarDistortion 0x2, 0x0 waitforvisualfinish - createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_M_SUPERSONIC, -64 - delay 14 - createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_M_SUPERSONIC, -64 - delay 14 - createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_M_SUPERSONIC, -64 - waitforvisualfinish - createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, 0 - waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER end Move_GASTRO_ACID: diff --git a/src/battle_anim_new.c b/src/battle_anim_new.c index 1129af88b9..0b54b4c409 100644 --- a/src/battle_anim_new.c +++ b/src/battle_anim_new.c @@ -65,6 +65,20 @@ static const union AffineAnimCmd sSquishTargetAffineAnimCmds[] = AFFINEANIMCMD_END, }; +//// GEN 4 +// power trick +const struct SpriteTemplate gPowerTrickSpriteTemplate = +{ + .tileTag = ANIM_TAG_POWER_TRICK, + .paletteTag = ANIM_TAG_POWER_TRICK, + .oam = &gOamData_AffineNormal_ObjNormal_64x64, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gAffineAnims_SpinningBone, + .callback = SpriteCB_SpriteOnMonForDuration +}; + + //// GEN 5 //wide guard const struct SpriteTemplate gWideGuardBlueConversionTemplate =