improve matching (#1543)

src/overlays/actors/ovl_En_Go/z_en_go.c

@@ -1200,9 +1200,12 @@ void EnGo_DrawEffects(EnGo* this, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx, "../z_en_go.c", 2626);
     materialFlag = false;
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    if (1) {}
+
     for (i = 0; i < EN_GO_EFFECT_COUNT; i++, dustEffect++) {
-        if (dustEffect->type) {
+        if (dustEffect->type == 0) {
+            continue;
+        }
+
         if (!materialFlag) {
             POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_0);
             gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD40);
@@ -1223,6 +1226,6 @@ void EnGo_DrawEffects(EnGo* this, PlayState* play) {
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[index]));
         gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD50);
     }
-    }
+
     CLOSE_DISPS(play->state.gfxCtx, "../z_en_go.c", 2678);
 }

src/overlays/actors/ovl_En_Go2/z_en_go2.c

@@ -225,10 +225,12 @@ void EnGo2_DrawEffects(EnGo2* this, PlayState* play) {
 
     materialFlag = false;
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    if (1) {}
 
     for (i = 0; i < EN_GO2_EFFECT_COUNT; i++, dustEffect++) {
-        if (dustEffect->type) {
+        if (dustEffect->type == 0) {
+            continue;
+        }
+
         if (!materialFlag) {
             POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_0);
             gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD40);
@@ -248,7 +250,6 @@ void EnGo2_DrawEffects(EnGo2* this, PlayState* play) {
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sDustTex[index]));
         gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD50);
     }
-    }
 
     CLOSE_DISPS(play->state.gfxCtx, "../z_en_go2_eff.c", 151);
 }

src/overlays/actors/ovl_En_Horse/z_en_horse.c

@@ -686,8 +686,10 @@ s32 EnHorse_Spawn(EnHorse* this, PlayState* play) {
                 spawnPos.z = sHorseSpawns[i].pos.z;
                 dist = Math3D_Vec3f_DistXYZ(&player->actor.world.pos, &spawnPos);
 
-                if (play->sceneId) {}
+                if ((minDist < dist) || func_80A5BBBC(play, this, &spawnPos)) {
-                if (!((minDist < dist) || func_80A5BBBC(play, this, &spawnPos))) {
+                    continue;
+                }
+
                 minDist = dist;
                 this->actor.world.pos.x = sHorseSpawns[i].pos.x;
                 this->actor.world.pos.y = sHorseSpawns[i].pos.y;
@@ -701,7 +703,6 @@ s32 EnHorse_Spawn(EnHorse* this, PlayState* play) {
             }
         }
     }
-    }
 
     return spawn;
 }

src/overlays/actors/ovl_En_In/z_en_in.c

@@ -894,19 +894,22 @@ void func_80A7B024(EnIn* this, PlayState* play) {
         player->rideActor->freezeTimer = 10;
     }
     player->actor.freezeTimer = 10;
-    if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
+
-        if (1) {}
+    if (this->interactInfo.talkState != NPC_TALK_STATE_ACTION) {
+        return;
+    }
+
     if (!GET_EVENTCHKINF(EVENTCHKINF_1B) && GET_INFTABLE(INFTABLE_AB)) {
         SET_EVENTCHKINF(EVENTCHKINF_1B);
         SET_INFTABLE(INFTABLE_AB);
     }
+
     func_80A79BAC(this, play, 0, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST));
     SET_EVENTINF_HORSES_STATE(EVENTINF_HORSES_STATE_0);
     SET_EVENTINF_HORSES_0F(1);
     play->msgCtx.stateTimer = 4;
     play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
     this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
-    }
 }
 
 void EnIn_Update(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_En_Mm2/z_en_mm2.c

@@ -215,14 +215,15 @@ void func_80AAF3C0(EnMm2* this, PlayState* play) {
                         Message_ContinueTextbox(play, 0x6080);
                         this->actor.textId = 0x6080;
                         break;
-                };
+                }
+
                 if (this->unk_1F4 & 4) {
-                    if (1) {}
                     this->unk_1F4 &= ~4;
                     HIGH_SCORE(HS_MARATHON)++;
                 }
             }
-            return;
+            break;
+
         case 0x6081:
             if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
                 this->unk_1F4 |= 4;
@@ -230,9 +231,9 @@ void func_80AAF3C0(EnMm2* this, PlayState* play) {
                 Message_ContinueTextbox(play, 0x607E);
                 this->actor.textId = 0x607E;
             }
-            return;
+            break;
-    }
 
+        default:
             if (Actor_TextboxIsClosing(&this->actor, play)) {
                 if (this->actor.textId == 0x607F) {
                     Interface_SetSubTimer(0);
@@ -243,6 +244,8 @@ void func_80AAF3C0(EnMm2* this, PlayState* play) {
                 this->actionFunc = func_80AAF57C;
                 func_80AAEF70(this, play);
             }
+            break;
+    }
 }
 
 void func_80AAF57C(EnMm2* this, PlayState* play) {

src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c

@@ -518,8 +518,12 @@ void EnNiwLady_Update(Actor* thisx, PlayState* play) {
             SkelAnime_Update(&this->skelAnime);
         }
         this->aneObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_ANE);
-        if (this->aneObjectSlot >= 0) {
+        if (this->aneObjectSlot < 0) {
+            return;
+        }
+
         this->actionFunc(this, play);
+
         if (this->unusedTimer2 != 0) {
             this->unusedTimer2--;
         }
@@ -538,10 +542,8 @@ void EnNiwLady_Update(Actor* thisx, PlayState* play) {
                                 UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
                                     UPDBGCHECKINFO_FLAG_4);
         Collider_UpdateCylinder(thisx, &this->collider);
-            if (1) {}
         CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
     }
-    }
 }
 
 Gfx* EnNiwLady_EmptyDList(GraphicsContext* gfxCtx) {