nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Ivan: Fix intermittent crash with certain items (#6253)

Browse Source
This commit is contained in:
Shishu the Dragon
2026-02-15 13:38:32 +13:00
committed by GitHub
parent 0dc6989438
commit 2d74552d05
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c
View File

@@ -24,7 +24,6 @@ void EnPartner_Update(Actor* thisx, PlayState* play);
void EnPartner_Draw(Actor* thisx, PlayState* play); void EnPartner_Draw(Actor* thisx, PlayState* play);
void EnPartner_SpawnSparkles(EnPartner* this, PlayState* play, s32 sparkleLife); 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); void Player_RequestQuake(PlayState* play, s32 speed, s32 y, s32 countdown);
s32 spawn_boomerang_ivan(EnPartner* this, PlayState* play); 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; EnPartner* this = (EnPartner*)thisx;
if (started == 1) { if (started == 1) {
func_808328EC(this, NA_SE_PL_CHANGE_ARMS); Player_PlaySfx(this, NA_SE_PL_CHANGE_ARMS);
this->canMove = 0; this->canMove = 0;
} else if (started == 0) { } else if (started == 0) {
if (this->itemTimer <= 0) { if (this->itemTimer <= 0) {
@@ -235,7 +234,7 @@ void UseSlingshot(Actor* thisx, PlayState* play, u8 started) {
EnPartner* this = (EnPartner*)thisx; EnPartner* this = (EnPartner*)thisx;
if (started == 1) { if (started == 1) {
func_808328EC(this, NA_SE_PL_CHANGE_ARMS); Player_PlaySfx(this, NA_SE_PL_CHANGE_ARMS);
this->canMove = 0; this->canMove = 0;
} else if (started == 0) { } else if (started == 0) {
if (this->itemTimer <= 0) { if (this->itemTimer <= 0) {
@@ -324,7 +323,7 @@ void UseDekuStick(Actor* thisx, PlayState* play, u8 started) {
if (this->itemTimer <= 0) { if (this->itemTimer <= 0) {
if (started == 1) { if (started == 1) {
if (AMMO(ITEM_STICK) > 0) { if (AMMO(ITEM_STICK) > 0) {
func_808328EC(this, NA_SE_EV_FLAME_IGNITION); Player_PlaySfx(this, NA_SE_EV_FLAME_IGNITION);
} else { } else {
Sfx_PlaySfxCentered(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
} }
@@ -373,7 +372,7 @@ void UseHookshot(Actor* thisx, PlayState* play, u8 started) {
if (this->itemTimer <= 0) { if (this->itemTimer <= 0) {
if (started == 1) { if (started == 1) {
func_808328EC(this, NA_SE_PL_CHANGE_ARMS); Player_PlaySfx(this, NA_SE_PL_CHANGE_ARMS);
this->canMove = 0; this->canMove = 0;
this->hookshotTarget = this->hookshotTarget =
Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_OBJ_HSBLOCK, this->actor.world.pos.x, 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) { } else if (started == 0) {
Actor_Kill(this->hookshotTarget); Actor_Kill(this->hookshotTarget);
this->hookshotTarget = NULL; this->hookshotTarget = NULL;
func_808328EC(this, NA_SE_PL_CHANGE_ARMS); Player_PlaySfx(this, NA_SE_PL_CHANGE_ARMS);
this->canMove = 1; this->canMove = 1;
} else if (started == 2) { } else if (started == 2) {
this->hookshotTarget->shape.rot.y = this->actor.world.rot.y; this->hookshotTarget->shape.rot.y = this->actor.world.rot.y;