mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-20 13:55:26 +00:00
Code Issues Projects Releases Wiki Activity

move animsfx

Browse source
This commit is contained in:
fig02 2024-11-21 16:02:07 -05:00
parent 66a30c26d0
commit 90af676481
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -13908,13 +13908,6 @@ void func_8084E988(Player* this) {
} }
void Player_Action_TimeTravelEnd(Player* this, PlayState* play) { void Player_Action_TimeTravelEnd(Player* this, PlayState* play) {
#if OOT_VERSION >= PAL_1_0
static AnimSfxEntry sJumpOffPedestalAnimSfxList[] = {
{ NA_SE_VO_LI_AUTO_JUMP, ANIMSFX_DATA(ANIMSFX_TYPE_VOICE, 5) },
{ 0, -ANIMSFX_DATA(ANIMSFX_TYPE_LANDING, 15) },
};
#endif
if (LinkAnimation_Update(play, &this->skelAnime)) { if (LinkAnimation_Update(play, &this->skelAnime)) {
if (!this->av1.startedAnim) { if (!this->av1.startedAnim) {
if (DECR(this->av2.animDelayTimer) == 0) { if (DECR(this->av2.animDelayTimer) == 0) {
@ -13943,6 +13936,11 @@ void Player_Action_TimeTravelEnd(Player* this, PlayState* play) {
} }
#else #else
if (!LINK_IS_ADULT) { if (!LINK_IS_ADULT) {
static AnimSfxEntry sJumpOffPedestalAnimSfxList[] = {
{ NA_SE_VO_LI_AUTO_JUMP, ANIMSFX_DATA(ANIMSFX_TYPE_VOICE, 5) },
{ 0, -ANIMSFX_DATA(ANIMSFX_TYPE_LANDING, 15) },
};
Player_ProcessAnimSfxList(this, sJumpOffPedestalAnimSfxList); Player_ProcessAnimSfxList(this, sJumpOffPedestalAnimSfxList);
} else { } else {
func_8084E988(this); func_8084E988(this);