atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shorten squish anim

Browse source
This commit is contained in:
kittenchilly 2024-07-28 11:55:57 -05:00
parent 9979fe01ac
commit 904d59220d
2 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
data/battle_anim_scripts.s
View file

@ -17845,15 +17845,15 @@ ElectroShotUnleash:
end end
Move_IVY_CUDGEL:: Move_IVY_CUDGEL::
loadspritegfx ANIM_TAG_IVY_CUDGEL_GRASS loadspritegfx ANIM_TAG_IVY_CUDGEL_GRASS
loadspritegfx ANIM_TAG_WOOD_HAMMER loadspritegfx ANIM_TAG_WOOD_HAMMER
loadspritegfx ANIM_TAG_WOOD_HAMMER_HAMMER loadspritegfx ANIM_TAG_WOOD_HAMMER_HAMMER
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 4 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 4
jumpifmovetypeequal TYPE_FIRE, IvyCudgelFire jumpifmovetypeequal TYPE_FIRE, IvyCudgelFire
jumpifmovetypeequal TYPE_ROCK, IvyCudgelRock jumpifmovetypeequal TYPE_ROCK, IvyCudgelRock
jumpifmovetypeequal TYPE_WATER, IvyCudgelWater jumpifmovetypeequal TYPE_WATER, IvyCudgelWater
createsprite gIvyCudgelSpriteTemplate, ANIM_TARGET, 2 createsprite gIvyCudgelSpriteTemplate, ANIM_TARGET, 2
delay 60 delay 60
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
@ -17862,9 +17862,9 @@ Move_IVY_CUDGEL::
delay 6 delay 6
call WoodHammerImpact call WoodHammerImpact
waitforvisualfinish waitforvisualfinish
end end
IvyCudgelFire: IvyCudgelFire:
loadspritegfx ANIM_TAG_IVY_CUDGEL_FIRE loadspritegfx ANIM_TAG_IVY_CUDGEL_FIRE
createsprite gIvyCudgelFireSpriteTemplate, ANIM_TARGET, 2 createsprite gIvyCudgelFireSpriteTemplate, ANIM_TARGET, 2
delay 60 delay 60
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
@ -17873,9 +17873,9 @@ IvyCudgelFire:
delay 6 delay 6
call WoodHammerImpact call WoodHammerImpact
waitforvisualfinish waitforvisualfinish
end end
IvyCudgelRock: IvyCudgelRock:
loadspritegfx ANIM_TAG_IVY_CUDGEL_ROCK loadspritegfx ANIM_TAG_IVY_CUDGEL_ROCK
createsprite gIvyCudgelRockSpriteTemplate, ANIM_TARGET, 2 createsprite gIvyCudgelRockSpriteTemplate, ANIM_TARGET, 2
delay 60 delay 60
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
@ -17884,9 +17884,9 @@ IvyCudgelRock:
delay 6 delay 6
call WoodHammerImpact call WoodHammerImpact
waitforvisualfinish waitforvisualfinish
end end
IvyCudgelWater: IvyCudgelWater:
loadspritegfx ANIM_TAG_IVY_CUDGEL_WATER loadspritegfx ANIM_TAG_IVY_CUDGEL_WATER
createsprite gIvyCudgelWaterSpriteTemplate, ANIM_TARGET, 2 createsprite gIvyCudgelWaterSpriteTemplate, ANIM_TARGET, 2
delay 60 delay 60
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
@ -17895,7 +17895,7 @@ IvyCudgelWater:
delay 6 delay 6
call WoodHammerImpact call WoodHammerImpact
waitforvisualfinish waitforvisualfinish
end end
Move_AXE_KICK:: Move_AXE_KICK::
loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_HANDS_AND_FEET
@ -17907,7 +17907,7 @@ Move_AXE_KICK::
delay 2 delay 2
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, ANIM_TARGET, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, ANIM_TARGET, 1
createvisualtask AnimTask_SquishTarget, 2 createvisualtask AnimTask_SquishTargetShort, 2
waitforvisualfinish waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4
end end

17
src/battle_anim_new.c
View file

@ -110,6 +110,14 @@ static const union AffineAnimCmd sSquishTargetAffineAnimCmds[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd sSquishTargetShortAffineAnimCmds[] =
{
AFFINEANIMCMD_FRAME(0, 64, 0, 4), //Flatten
AFFINEANIMCMD_FRAME(0, 0, 0, 16),
AFFINEANIMCMD_FRAME(0, -64, 0, 4),
AFFINEANIMCMD_END,
};
// GEN 4 // GEN 4
// shadow sneak // shadow sneak
const struct SpriteTemplate gShadowSneakImpactSpriteTemplate = const struct SpriteTemplate gShadowSneakImpactSpriteTemplate =
@ -8525,6 +8533,15 @@ void AnimTask_SquishTarget(u8 taskId)
task->func = AnimTask_WaitAffineAnim; task->func = AnimTask_WaitAffineAnim;
} }
void AnimTask_SquishTargetShort(u8 taskId)
{
struct Task* task = &gTasks[taskId];
u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
PrepareAffineAnimInTaskData(task, spriteId, sSquishTargetShortAffineAnimCmds);
task->func = AnimTask_WaitAffineAnim;
}
void CoreEnforcerLoadBeamTarget(struct Sprite *sprite) void CoreEnforcerLoadBeamTarget(struct Sprite *sprite)
{ {
sprite->data[0] = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[2];