From b4792d3f7e3149d2d30e6560db590aa844cea366 Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Thu, 25 Jul 2024 14:06:02 -0500 Subject: [PATCH] Add Axe Kick animation --- data/battle_anim_scripts.s | 22 ++++++++++++++++++---- src/battle_anim_new.c | 11 +++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index aa62732c7d..6bcf1271ec 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -17423,7 +17423,7 @@ Move_LAST_RESPECTS:: restorebg waitbgfadein end - + Move_TIDY_UP:: loadspritegfx ANIM_TAG_PINK_CLOUD monbg ANIM_ATTACKER @@ -17444,7 +17444,7 @@ Move_TIDY_UP:: clearmonbg ANIM_ATTACKER blendoff end - + Move_KOWTOW_CLEAVE:: loadspritegfx ANIM_TAG_SLASH loadspritegfx ANIM_TAG_CROSS_IMPACT @@ -17738,7 +17738,7 @@ Move_HYDRO_STEAM:: createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 3, 9, 0, RGB_RED waitforvisualfinish end - + Move_POUNCE:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -17844,8 +17844,22 @@ ElectroShotUnleash: blendoff end -Move_TERA_BLAST:: Move_AXE_KICK:: + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 + delay 0x7 + createsprite gAxeKickSpriteTemplate, ANIM_TARGET, 3 + delay 0x2 + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, ANIM_TARGET, 1 + createvisualtask AnimTask_SquishTarget, 0x2 + waitforvisualfinish + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 + end + +Move_TERA_BLAST:: Move_ORDER_UP:: Move_SPICY_EXTRACT:: Move_SPIN_OUT:: diff --git a/src/battle_anim_new.c b/src/battle_anim_new.c index fed928e747..24ccaa2983 100644 --- a/src/battle_anim_new.c +++ b/src/battle_anim_new.c @@ -4771,6 +4771,17 @@ const struct SpriteTemplate gUltraBurstSymbolSpriteTemplate = .callback = AnimSpriteOnMonPos }; +const struct SpriteTemplate gAxeKickSpriteTemplate = +{ + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, + .oam = &gOamData_AffineOff_ObjNormal_32x32, + .anims = &gAnims_HandsAndFeet[2], + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = AnimBounceBallLand, +}; + // Z MOVES //activate const struct SpriteTemplate gZMoveSymbolSpriteTemplate =