From 5f3db569f9420e034da3a6da9fd1eaf011e31f22 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Mar 2020 20:39:12 -0400 Subject: [PATCH] else if --- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index 9e5f5f585c..109f159e0c 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -67,19 +67,15 @@ static void BgGateShutter_Destroy(BgGateShutter* this, GlobalContext* globalCtx) } static void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx) { - if (this->unk_168 == 1) { - if (!(gSaveContext.inf_table[7] & 0x40)) { - this->unk_178 = 2; - this->actionFunc = (ActorFunc)func_80878300; - return; - } - } - if (this->unk_168 == 2) { + if (this->unk_168 == 1 && !(gSaveContext.inf_table[7] & 0x40)) { this->unk_178 = 2; this->actionFunc = (ActorFunc)func_80878300; - return; } - if (this->unk_168 < 0) { + else if (this->unk_168 == 2) { + this->unk_178 = 2; + this->actionFunc = (ActorFunc)func_80878300; + } + else if (this->unk_168 < 0) { this->unk_178 = 2; this->actionFunc = (ActorFunc)func_808783D4; }