From 88aa6de9ff5c8bb12b95ccde3142224833158d47 Mon Sep 17 00:00:00 2001 From: cadmic Date: Sun, 28 Jan 2024 10:03:33 -0800 Subject: [PATCH] Match z_en_bom.c (#1639) --- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index b77839265e..0dbbfada97 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -132,7 +132,8 @@ void EnBom_Move(EnBom* this, PlayState* play) { // rebound bomb off the wall it hits if ((this->actor.speed != 0.0f) && (this->actor.bgCheckFlags & BGCHECKFLAG_WALL)) { - if (ABS((s16)(this->actor.wallYaw - this->actor.world.rot.y)) > 0x4000) { + s16 yawDiff = this->actor.wallYaw - this->actor.world.rot.y; + if (ABS(yawDiff) > 0x4000) { this->actor.world.rot.y = ((this->actor.wallYaw - this->actor.world.rot.y) + this->actor.wallYaw) - 0x8000; } Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_BOUND); @@ -358,7 +359,9 @@ void EnBom_Draw(Actor* thisx, PlayState* play) { s32 pad; EnBom* this = (EnBom*)thisx; +#ifdef OOT_DEBUG if (1) {} +#endif OPEN_DISPS(play->state.gfxCtx, "../z_en_bom.c", 913);