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

2
data/battle_anim_scripts.s
View file

@ -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];