Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Axe Kick animation #5039

Merged
merged 4 commits into from
Jul 28, 2024
Merged

Add Axe Kick animation #5039

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4792d3
Add Axe Kick animation
kittenchilly Jul 25, 2024
f22666c
Merge branch 'master' into axekick-anim
kittenchilly Jul 28, 2024
9979fe0
Update battle_anim_scripts.s
kittenchilly Jul 28, 2024
904d592
Shorten squish anim
kittenchilly Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions data/battle_anim_scripts.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17423,7 +17423,7 @@ Move_LAST_RESPECTS::
restorebg
waitbgfadein
end

Move_TIDY_UP::
loadspritegfx ANIM_TAG_PINK_CLOUD
monbg ANIM_ATTACKER
Expand All @@ -17444,7 +17444,7 @@ Move_TIDY_UP::
clearmonbg ANIM_ATTACKER
blendoff
end

Move_KOWTOW_CLEAVE::
loadspritegfx ANIM_TAG_SLASH
loadspritegfx ANIM_TAG_CROSS_IMPACT
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
kittenchilly marked this conversation as resolved.
Show resolved Hide resolved
createsprite gAxeKickSpriteTemplate, ANIM_TARGET, 3
delay 0x2
kittenchilly marked this conversation as resolved.
Show resolved Hide resolved
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, ANIM_TARGET, 1
createvisualtask AnimTask_SquishTarget, 0x2
kittenchilly marked this conversation as resolved.
Show resolved Hide resolved
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4
end

Move_TERA_BLAST::
Move_ORDER_UP::
Move_SPICY_EXTRACT::
Move_SPIN_OUT::
Expand Down
11 changes: 11 additions & 0 deletions src/battle_anim_new.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
Loading