From 46a13d52f52efb52e89de7b59d00a56c68ce18a0 Mon Sep 17 00:00:00 2001 From: feacur Date: Sun, 10 Nov 2024 20:25:45 +0100 Subject: [PATCH] streamline EnGo `*_Draw` function into 3 sections returns are indeed required to match --- src/overlays/actors/ovl_En_Go/z_en_go.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index c472efd493..d93aade977 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -1145,12 +1145,17 @@ void EnGo_Draw(Actor* thisx, PlayState* play) { if (this->actionFunc == EnGo_CurledUp) { EnGo_DrawCurledUp(this, play); - return; // needed for match? - } else if (this->actionFunc == EnGo_GoronLinkRolling || this->actionFunc == func_80A3FEB4 || - this->actionFunc == EnGo_StopRolling || this->actionFunc == func_80A3FEB4) { + return; + } + + if (this->actionFunc == EnGo_GoronLinkRolling || this->actionFunc == func_80A3FEB4 || + this->actionFunc == EnGo_StopRolling || this->actionFunc == func_80A3FEB4) { EnGo_DrawRolling(this, play); - return; // needed for match? - } else { + return; + } + + // draw normal + { Gfx_SetupDL_37Opa(play->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gGoronCsEyeOpenTex));