diff options
| author | Shishu the Dragon <183069616+ShishuTheDragon@users.noreply.github.com> | 2026-02-15 13:38:32 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-15 00:38:32 +0000 |
| commit | 2d74552d0589543af88e7e1db80f563a5be37974 (patch) | |
| tree | 85e36a68aeeaf29e5b2072995665b0a2014938b8 | |
| parent | 0dc6989438d29513b960866539f63455701d296f (diff) | |
Ivan: Fix intermittent crash with certain items (#6253)
| -rw-r--r-- | soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c index ab379267e..901b0d406 100644 --- a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c +++ b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c @@ -24,7 +24,6 @@ void EnPartner_Update(Actor* thisx, PlayState* play); void EnPartner_Draw(Actor* thisx, PlayState* play); void EnPartner_SpawnSparkles(EnPartner* this, PlayState* play, s32 sparkleLife); -void func_808328EC(Player* this, u16 sfxId); void Player_RequestQuake(PlayState* play, s32 speed, s32 y, s32 countdown); s32 spawn_boomerang_ivan(EnPartner* this, PlayState* play); @@ -194,7 +193,7 @@ void UseBow(Actor* thisx, PlayState* play, u8 started, u8 arrowType) { EnPartner* this = (EnPartner*)thisx; if (started == 1) { - func_808328EC(this, NA_SE_PL_CHANGE_ARMS); + Player_PlaySfx(this, NA_SE_PL_CHANGE_ARMS); this->canMove = 0; } else if (started == 0) { if (this->itemTimer <= 0) { @@ -235,7 +234,7 @@ void UseSlingshot(Actor* thisx, PlayState* play, u8 started) { EnPartner* this = (EnPartner*)thisx; if (started == 1) { - func_808328EC(this, NA_SE_PL_CHANGE_ARMS); + Player_PlaySfx(this, NA_SE_PL_CHANGE_ARMS); this->canMove = 0; } else if (started == 0) { if (this->itemTimer <= 0) { @@ -324,7 +323,7 @@ void UseDekuStick(Actor* thisx, PlayState* play, u8 started) { if (this->itemTimer <= 0) { if (started == 1) { if (AMMO(ITEM_STICK) > 0) { - func_808328EC(this, NA_SE_EV_FLAME_IGNITION); + Player_PlaySfx(this, NA_SE_EV_FLAME_IGNITION); } else { Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } @@ -373,7 +372,7 @@ void UseHookshot(Actor* thisx, PlayState* play, u8 started) { if (this->itemTimer <= 0) { if (started == 1) { - func_808328EC(this, NA_SE_PL_CHANGE_ARMS); + Player_PlaySfx(this, NA_SE_PL_CHANGE_ARMS); this->canMove = 0; this->hookshotTarget = Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_OBJ_HSBLOCK, this->actor.world.pos.x, @@ -385,7 +384,7 @@ void UseHookshot(Actor* thisx, PlayState* play, u8 started) { } else if (started == 0) { Actor_Kill(this->hookshotTarget); this->hookshotTarget = NULL; - func_808328EC(this, NA_SE_PL_CHANGE_ARMS); + Player_PlaySfx(this, NA_SE_PL_CHANGE_ARMS); this->canMove = 1; } else if (started == 2) { this->hookshotTarget->shape.rot.y = this->actor.world.rot.y; |