From 9e06677f462f6a18f4af8f36d2fafd002bc8137f Mon Sep 17 00:00:00 2001 From: Baoulettes Date: Mon, 27 Jun 2022 16:39:29 +0200 Subject: [PATCH] Some if (1) {} remove --- soh/src/boot/z_std_dma.c | 1 - soh/src/code/PreRender.c | 1 - soh/src/code/audio_playback.c | 1 - soh/src/code/audio_synthesis.c | 8 ++------ soh/src/code/code_800E4FE0.c | 3 --- soh/src/code/code_800EC960.c | 2 -- soh/src/code/code_800FC620.c | 1 - soh/src/code/db_camera.c | 3 +-- soh/src/code/padmgr.c | 4 ++-- soh/src/code/ucode_disas.c | 3 +-- soh/src/code/z_camera.c | 1 - soh/src/code/z_eff_blure.c | 6 +----- soh/src/code/z_game_over.c | 2 -- soh/src/code/z_kankyo.c | 2 -- soh/src/code/z_lights.c | 7 ++----- soh/src/code/z_map_exp.c | 1 - soh/src/code/z_message_PAL.c | 3 +-- soh/src/code/z_parameter.c | 3 +-- soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c | 3 +-- soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c | 3 +-- soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c | 3 +-- .../actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 1 - .../actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 2 -- .../overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 3 +-- .../overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 6 ++---- soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c | 3 +-- soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 6 ++---- soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 6 ++---- soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 6 ++---- soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c | 2 -- soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c | 3 +-- soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 1 - soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 3 +-- soh/src/overlays/actors/ovl_En_Door/z_en_door.c | 1 - soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c | 2 -- soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c | 4 +--- soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 3 +-- soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c | 1 - .../overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c | 3 +-- soh/src/overlays/actors/ovl_En_Go/z_en_go.c | 1 - soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c | 1 - soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 3 +-- soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c | 4 ---- soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 1 - soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c | 1 - .../actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c | 3 +-- soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c | 1 - soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c | 1 - soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c | 1 - soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c | 9 +++------ soh/src/overlays/actors/ovl_Fishing/z_fishing.c | 3 +-- soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 5 ----- .../overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c | 2 -- soh/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 1 - .../gamestates/ovl_file_choose/z_file_copy_erase.c | 1 - .../misc/ovl_kaleido_scope/z_kaleido_equipment.c | 1 - 56 files changed, 35 insertions(+), 121 deletions(-) diff --git a/soh/src/boot/z_std_dma.c b/soh/src/boot/z_std_dma.c index a7590cae6..847f35b12 100644 --- a/soh/src/boot/z_std_dma.c +++ b/soh/src/boot/z_std_dma.c @@ -249,7 +249,6 @@ void DmaMgr_ProcessMsg(DmaRequest* req) { while (iter->vromEnd) { if (vrom >= iter->vromStart && vrom < iter->vromEnd) { - if (1) {} // Necessary to match if (iter->romEnd == 0) { if (iter->vromEnd < vrom + size) { diff --git a/soh/src/code/PreRender.c b/soh/src/code/PreRender.c index b86cbe0e1..bed9878bc 100644 --- a/soh/src/code/PreRender.c +++ b/soh/src/code/PreRender.c @@ -435,7 +435,6 @@ void func_800C2500(PreRender* this, s32 x, s32 y) { } } } - if (1) {} if (pxR2 > buffR[i]) { for (j = 1; j < 15; j += 2) { if ((i != j) && (buffR[j] <= buffR[i]) && (buffA[j] == 7)) { diff --git a/soh/src/code/audio_playback.c b/soh/src/code/audio_playback.c index b9f868bd3..85811f68e 100644 --- a/soh/src/code/audio_playback.c +++ b/soh/src/code/audio_playback.c @@ -205,7 +205,6 @@ void Audio_ProcessNotes(void) { out: if (playbackState->priority != 0) { - if (1) {} noteSubEu = ¬e->noteSubEu; if (playbackState->unk_04 >= 1 || noteSubEu->bitField0.finished) { if (playbackState->adsr.action.s.state == ADSR_STATE_DISABLED || noteSubEu->bitField0.finished) { diff --git a/soh/src/code/audio_synthesis.c b/soh/src/code/audio_synthesis.c index a50927b21..79ed0163f 100644 --- a/soh/src/code/audio_synthesis.c +++ b/soh/src/code/audio_synthesis.c @@ -786,10 +786,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS gAudioContext.curLoadedBook = audioFontSample->book->book; break; } - if (1) {} - if (1) {} - if (1) {} - nEntries = 16 * audioFontSample->book->order * audioFontSample->book->npredictors; + nEntries = 16 * audioFontSample->book->order * audioFontSample->book->npredictors; aLoadADPCM(cmd++, nEntries, gAudioContext.curLoadedBook); } } @@ -901,8 +898,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS nSamplesInThisIteration = nSamplesToDecode + nSamplesInFirstFrame - nTrailingSamplesToIgnore; if (nSamplesProcessed == 0) { - if (1) {} - skipBytes = nFirstFrameSamplesToIgnore * 2; + skipBytes = nFirstFrameSamplesToIgnore * 2; } else { phi_s4 = ALIGN16(s5 + 16); } diff --git a/soh/src/code/code_800E4FE0.c b/soh/src/code/code_800E4FE0.c index 865e8ee29..9af1c76d8 100644 --- a/soh/src/code/code_800E4FE0.c +++ b/soh/src/code/code_800E4FE0.c @@ -187,9 +187,6 @@ AudioTask* func_800E5000(void) { if (gAudioContext.resetStatus == 0) { // msg = 0000RREE R = read pos, E = End Pos while (osRecvMesg(gAudioContext.cmdProcQueueP, &sp4C, OS_MESG_NOBLOCK) != -1) { - if (1) {} - if (1) {} - if (1) {} Audio_ProcessCmds(sp4C.data32); j++; } diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c index 8e1694b7c..785a58e2b 100644 --- a/soh/src/code/code_800EC960.c +++ b/soh/src/code/code_800EC960.c @@ -3014,14 +3014,12 @@ void AudioDebug_ProcessInput_SndCont(void) { if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { if (sAudioSndContSel == 0) { - if (1) {} func_800F595C(sAudioSndContWork[sAudioSndContSel]); } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_CRIGHT)) { if (sAudioSndContSel == 0) { - if (1) {} func_800F5ACC(sAudioSndContWork[sAudioSndContSel]); } } diff --git a/soh/src/code/code_800FC620.c b/soh/src/code/code_800FC620.c index 75a6081e5..a25465e2e 100644 --- a/soh/src/code/code_800FC620.c +++ b/soh/src/code/code_800FC620.c @@ -164,7 +164,6 @@ void func_800FCA18(void* blk, u32 nBlk, u32 blkSize, arg3_800FCA18 arg3, s32 arg while (pos > end) { pos -= masked_arg2; arg3((void*)pos, 2); - if (1) {} } if (!masked_arg2) {} diff --git a/soh/src/code/db_camera.c b/soh/src/code/db_camera.c index 09b998fe2..b29399ce9 100644 --- a/soh/src/code/db_camera.c +++ b/soh/src/code/db_camera.c @@ -2156,8 +2156,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) { sLastFileIdx = sCurFileIdx; D_801612EA = sDbCameraCuts[idx1].letter; } - if (1) {} - } else if (!CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_L)) { + } else if (!CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_L)) { if (sLastFileIdx != -1) { switch (sp74[sCurFileIdx]) { case '?': diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c index 7af9fa2c1..4f14a9865 100644 --- a/soh/src/code/padmgr.c +++ b/soh/src/code/padmgr.c @@ -73,7 +73,7 @@ void PadMgr_RumbleControl(PadMgr* padMgr) { if (padMgr->rumbleEnable[i] != 0) { if (padMgr->rumbleCounter[i] < 3) { // clang-format off - if (1) {} osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf(VT_FGCOL(YELLOW)); // clang-format on // "Vibration pack jumble jumble"? @@ -95,7 +95,7 @@ void PadMgr_RumbleControl(PadMgr* padMgr) { } else { if (padMgr->rumbleCounter[i] != 0) { // clang-format off - if (1) {} osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf(VT_FGCOL(YELLOW)); // clang-format on // "Stop vibration pack" diff --git a/soh/src/code/ucode_disas.c b/soh/src/code/ucode_disas.c index 4ca61f3c5..db56416e3 100644 --- a/soh/src/code/ucode_disas.c +++ b/soh/src/code/ucode_disas.c @@ -717,8 +717,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) { : "???"; if ((setscissor.x0frac | setscissor.y0frac | setscissor.x1frac | setscissor.y1frac)) { - if (1) {} - DISAS_LOG("gsDPSetScissorFrac(%s, %d, %d, %d, %d),", modeStr, + DISAS_LOG("gsDPSetScissorFrac(%s, %d, %d, %d, %d),", modeStr, (setscissor.x0 << 2) + setscissor.x0frac, (setscissor.y0 << 2) + setscissor.y0frac, (setscissor.x1 << 2) + setscissor.x1frac, (setscissor.y1 << 2) + setscissor.y1frac); } else { diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index 9df9e9dd4..01f782061 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -5401,7 +5401,6 @@ s32 Camera_Unique9(Camera* camera) { } spB4 = scratchSph.r; - if (1) {} scratchSph.r = !(spB4 < anim->curKeyFrame->eyeTargetInit.z) ? Camera_LERPCeilF(anim->curKeyFrame->eyeTargetInit.z, spB4, anim->curKeyFrame->lerpStepScale, 1.0f) diff --git a/soh/src/code/z_eff_blure.c b/soh/src/code/z_eff_blure.c index 81ae4eeb1..a2ca3fafb 100644 --- a/soh/src/code/z_eff_blure.c +++ b/soh/src/code/z_eff_blure.c @@ -345,7 +345,6 @@ void EffectBlure_GetComputedValues(EffectBlure* this, s32 index, f32 ratio, Vec3 vec1->x = (sp30.x * 0.5f * mode4Param * ratio) + elem->p1.x; vec1->y = (sp30.y * 0.5f * mode4Param * ratio) + elem->p1.y; - if (1) {} // Necessary to match vec1->z = (sp30.z * 0.5f * mode4Param * ratio) + elem->p1.z; vec2->x = -(sp30.x * 0.5f * mode4Param * ratio) + elem->p2.x; @@ -785,8 +784,6 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, gDPPipeSync(POLY_XLU_DISP++); } - if (1) {} // Necessary to match - gSPVertex(POLY_XLU_DISP++, &vtx[j], 4, 0); gSP2Triangles(POLY_XLU_DISP++, 0, 1, 3, 0, 0, 3, 2, 0); @@ -1044,8 +1041,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { } else { gSP1Quadrangle(POLY_XLU_DISP++, j - 2, j - 1, j + 1, j, 0); - if (1) {} // Necessary to match - + if (this->unkFlag == 1) { phi_t2 = 0; } diff --git a/soh/src/code/z_game_over.c b/soh/src/code/z_game_over.c index ff488aae4..86ba7c6e1 100644 --- a/soh/src/code/z_game_over.c +++ b/soh/src/code/z_game_over.c @@ -75,7 +75,6 @@ void GameOver_Update(GlobalContext* globalCtx) { Environment_InitGameOverLights(globalCtx); gGameOverTimer = 20; - if (1) {} v90 = VREG(90); v91 = VREG(91); v92 = VREG(92); @@ -109,7 +108,6 @@ void GameOver_Update(GlobalContext* globalCtx) { case GAMEOVER_REVIVE_RUMBLE: gGameOverTimer = 50; gameOverCtx->state++; - if (1) {} v90 = VREG(90); v91 = VREG(91); diff --git a/soh/src/code/z_kankyo.c b/soh/src/code/z_kankyo.c index 6b8a2b854..f99b75cd8 100644 --- a/soh/src/code/z_kankyo.c +++ b/soh/src/code/z_kankyo.c @@ -958,7 +958,6 @@ void Environment_Update(GlobalContext* globalCtx, EnvironmentContext* envCtx, Li gSPEndDisplayList(displayList++); Graph_BranchDlist(prevDisplayList, displayList); POLY_OPA_DISP = displayList; - if (1) {} CLOSE_DISPS(globalCtx->state.gfxCtx); } @@ -1547,7 +1546,6 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env alpha *= 1.0f - fogInfluence; - if (1) {} if (!(isOffScreen ^ 0)) { Math_SmoothStepToF(&envCtx->unk_88, unk88Target, 0.5f, 0.05f, 0.001f); diff --git a/soh/src/code/z_lights.c b/soh/src/code/z_lights.c index 5125cb7a9..2cd75139b 100644 --- a/soh/src/code/z_lights.c +++ b/soh/src/code/z_lights.c @@ -120,8 +120,7 @@ void Lights_BindPoint(Lights* lights, LightParams* params, Vec3f* vec) { if (light != NULL) { posDiff = sqrtf(posDiff); - if (1) {} - scale = posDiff / scale; + scale = posDiff / scale; scale = 1 - SQ(scale); light->l.col[0] = light->l.colc[0] = params->point.color[0] * scale; @@ -399,9 +398,7 @@ void Lights_GlowCheck(GlobalContext* globalCtx) { if ((multDest.z > 1.0f) && y >= shrink && y <= SCREEN_HEIGHT - shrink) { wZ = (s32)((multDest.z * wDest) * 16352.0f) + 16352; zBuf = OTRGetPixelDepth(x, y) * 4; - if (1) {} - if (1) {} - + if (wZ < (zBuf >> 3)) { params->drawGlow = true; } diff --git a/soh/src/code/z_map_exp.c b/soh/src/code/z_map_exp.c index 4dfda5f4b..0a1993b20 100644 --- a/soh/src/code/z_map_exp.c +++ b/soh/src/code/z_map_exp.c @@ -876,7 +876,6 @@ void Map_Update(GlobalContext* globalCtx) { if (R_MAP_TEX_INDEX != (R_MAP_TEX_INDEX_BASE + Map_GetFloorTextIndexOffset(mapIndex, floor))) { R_MAP_TEX_INDEX = R_MAP_TEX_INDEX_BASE + Map_GetFloorTextIndexOffset(mapIndex, floor); } - if (1) {} // Appears to be necessary to match if (interfaceCtx->mapRoomNum != sLastRoomNum) { // "Current floor = %d Current room = %x Number of rooms = %d" diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index 02214de2f..70fc5c00b 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -2866,8 +2866,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) { break; } - if (1) {} - if (sOcarinaNotesAlphaValues[i] != 255) { + if (sOcarinaNotesAlphaValues[i] != 255) { sOcarinaNotesAlphaValues[i] += VREG(50); if (sOcarinaNotesAlphaValues[i] >= 255) { sOcarinaNotesAlphaValues[i] = 255; diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index a7c65c9b9..07f6a0416 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -998,8 +998,7 @@ void func_80083108(GlobalContext* globalCtx) { gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0]; } } - if (1) {} // Necessary to match - } + } if (sp28) { Interface_LoadItemIcon1(globalCtx, 0); diff --git a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 426ec0285..40cc0e01c 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -118,8 +118,7 @@ void ArrowFire_Hit(ArrowFire* this, GlobalContext* globalCtx) { this->radius = (((1.0f - offset) * scale) + 10.0f); this->unk_158 += ((2.0f - this->unk_158) * 0.1f); if (this->timer < 16) { - if (1) {} - this->alpha = ((this->timer * 0x23) - 0x118); + this->alpha = ((this->timer * 0x23) - 0x118); } } } diff --git a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 561656bc8..484ad4435 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -119,8 +119,7 @@ void ArrowIce_Hit(ArrowIce* this, GlobalContext* globalCtx) { this->radius = (((1.0f - offset) * scale) + 10.0f); this->unk_160 += ((2.0f - this->unk_160) * 0.1f); if (this->timer < 16) { - if (1) {} - this->alpha = ((this->timer * 0x23) - 0x118); + this->alpha = ((this->timer * 0x23) - 0x118); } } } diff --git a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 5c63210d9..01d2d6709 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -118,8 +118,7 @@ void ArrowLight_Hit(ArrowLight* this, GlobalContext* globalCtx) { this->radius = (((1.0f - offset) * scale) + 10.0f); this->unk_160 += ((2.0f - this->unk_160) * 0.1f); if (this->timer < 16) { - if (1) {} - this->alpha = ((this->timer * 0x23) - 0x118); + this->alpha = ((this->timer * 0x23) - 0x118); } } } diff --git a/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index e02315768..e71aa8668 100644 --- a/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -366,7 +366,6 @@ void func_8086C874(BgBdanObjects* this, GlobalContext* globalCtx) { } } if (this->switchFlag == 0) { - if (1) {} Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], this->cameraSetting); func_8005ACFC(globalCtx->cameraPtrs[MAIN_CAM], 4); } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index d0f9a7595..4af3e01ac 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -306,7 +306,6 @@ void func_80888860(BgHidanHamstep* this, GlobalContext* globalCtx) { } else { this->dyna.actor.velocity.y *= -0.24f; - if (1) {} if (this->unk_244 == 1) { quakeIndex = Quake_Add(GET_ACTIVE_CAM(globalCtx), 3); @@ -365,7 +364,6 @@ void func_80888A58(BgHidanHamstep* this, GlobalContext* globalCtx) { } else { this->dyna.actor.velocity.y *= -0.24f; - if (1) {} if (this->unk_244 == 1) { quakeIndex = Quake_Add(GET_ACTIVE_CAM(globalCtx), 3); diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index fd803a245..4806921dc 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -309,8 +309,7 @@ void BgJyaCobra_UpdateShadowFromSide(BgJyaCobra* this) { if (!(temp_x & ~0x3F)) { temp_s2[temp_z + temp_x] |= D_8089731C[k][l]; } - if (1) {} - } + } } } } diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index bc7a0c524..bae198189 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -143,16 +143,14 @@ void BgMizuWater_Init(Actor* thisx, GlobalContext* globalCtx) { case 3: if (Flags_GetSwitch(globalCtx, this->switchFlag)) { this->actor.world.pos.y = this->baseY + 110.0f; - if (1) {} - this->targetY = this->actor.world.pos.y; + this->targetY = this->actor.world.pos.y; } waterBoxes[8].ySurface = this->actor.world.pos.y; break; case 4: if (Flags_GetSwitch(globalCtx, this->switchFlag)) { this->actor.world.pos.y = this->baseY + 160.0f; - if (1) {} - this->targetY = this->actor.world.pos.y; + this->targetY = this->actor.world.pos.y; } waterBoxes[16].ySurface = this->actor.world.pos.y; break; diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index fa9098d23..fddf246bc 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -418,8 +418,7 @@ void BossGanon_Init(Actor* thisx, GlobalContext* globalCtx2) { } else { thisx->update = func_808E1EB4; thisx->draw = func_808E229C; - if (1) {} - thisx->speedXZ = 11.0f; + thisx->speedXZ = 11.0f; if (thisx->params == 0xC8) { this->timers[0] = 7; diff --git a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 87291120b..e00c0159d 100644 --- a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -1411,8 +1411,7 @@ void BossMo_IntroCs(BossMo* this, GlobalContext* globalCtx) { this->cameraEyeVel.x = fabsf(this->cameraEye.x - 111.0f) * 0.1f; this->cameraEyeVel.y = fabsf(this->cameraEye.y - 133.0f) * 0.1f; this->cameraEyeVel.z = fabsf(this->cameraEye.z - -191.0f) * 0.1f; - if (1) {} - this->csState = MO_INTRO_FINISH; + this->csState = MO_INTRO_FINISH; this->timers[2] = 110; this->cameraNextEye.x = 111.0f; this->cameraNextEye.y = 133.0f; @@ -1590,8 +1589,7 @@ void BossMo_DeathCs(BossMo* this, GlobalContext* globalCtx) { this->cameraSpeedMod = 0.0f; this->cameraAccel = 0.02f; this->cameraNextAt.y = 320.0f; - if (1) {} - this->timers[0] = 100; + this->timers[0] = 100; sMorphaTent1->drawActor = true; sMorphaTent1->work[MO_TENT_ACTION_STATE] = MO_TENT_DEATH_3; sMorphaTent1->actor.shape.rot.x = 0; diff --git a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index dd81daa30..c7b2fec84 100644 --- a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -2708,8 +2708,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, GlobalContext* globalCtx) { BossTw_AddFlameEffect(globalCtx, &pos, &velocity, &accel, Rand_ZeroFloat(2.0f) + 5, 1); // fake code needed to match, tricks the compiler into allocating more stack - if (1) {} - if (zero) { + if (zero) { accel.x *= 2.0; } @@ -4314,8 +4313,7 @@ s32 BossTw_BlastShieldCheck(BossTw* this, GlobalContext* globalCtx) { } else { if (sShieldFireCharge != 0) { sShieldFireCharge = 0; - if (1) {} - BossTw_AddShieldDeflectEffect(globalCtx, 10.0f, 0); + BossTw_AddShieldDeflectEffect(globalCtx, 10.0f, 0); } else { BossTw_AddShieldHitEffect(globalCtx, 10.0f, 0); sShieldIceCharge++; diff --git a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 4b6f0c9de..b8fdb88ad 100644 --- a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -3459,8 +3459,7 @@ void BossVa_UpdateEffects(GlobalContext* globalCtx) { } else if (effect->mode == GORE_FADING) { if (effect->timer == 0) { effect->type = VA_NONE; - if (1) {} - } + } } else { Math_SmoothStepToF(&effect->scaleMod, 0.075f, 1.0f, 0.005f, 0.0f); @@ -3501,8 +3500,7 @@ void BossVa_UpdateEffects(GlobalContext* globalCtx) { } break; } - if (1) {} - } + } } } } diff --git a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 6145afe2b..06236cc41 100644 --- a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1098,7 +1098,6 @@ void DemoEffect_UpdateLightEffect(DemoEffect* this, GlobalContext* globalCtx) { } if (globalCtx->sceneNum == SCENE_TOKINOMA && gSaveContext.sceneSetupIndex == 14) { - if (1) {} if (globalCtx->csCtx.npcActions[this->csActionId]->action == 2) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG); @@ -1837,7 +1836,6 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) { this->godLgt.rotation++; if (this->godLgt.rotation > 120) { this->godLgt.rotation = 0; - if (1) {} } Matrix_RotateZ((((s32)this->godLgt.rotation) * 3.0f) * (M_PI / 180.0f), MTXMODE_APPLY); diff --git a/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c index ac73605ef..3f1fac41e 100644 --- a/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -1297,8 +1297,7 @@ void EnBb_Draw(Actor* thisx, GlobalContext* globalCtx) { //! the above bugs mean unk_2A8 can be nonzero without damage effects ever having been set. //! This routine will then increment colorFilterTimer, and on the next frame Actor_Draw will try //! to draw the unset colorFilterParams. This causes a divide-by-zero error, crashing the game. - if (1) {} - this->fireIceTimer--; + this->fireIceTimer--; if ((this->fireIceTimer % 4) == 0) { Vec3f sp70; s32 index = this->fireIceTimer >> 2; diff --git a/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 7fb13c61f..7e79f0bea 100644 --- a/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -172,7 +172,6 @@ void EnBomChu_UpdateFloorPoly(EnBomChu* this, CollisionPoly* floorPoly, GlobalCo this->axisUp = normal; - if (1) {} // mf = (axisLeft | axisUp | axisForwards) diff --git a/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 276fcffe6..2a92779ca 100644 --- a/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -354,8 +354,7 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) { if ((thisx->speedXZ != 0.0f) && (thisx->bgCheckFlags & 8)) { if (ABS((s16)(thisx->wallYaw - thisx->world.rot.y)) > 0x4000) { - if (1) {} - thisx->world.rot.y = ((thisx->wallYaw - thisx->world.rot.y) + thisx->wallYaw) - 0x8000; + thisx->world.rot.y = ((thisx->wallYaw - thisx->world.rot.y) + thisx->wallYaw) - 0x8000; } Audio_PlayActorSound2(thisx, NA_SE_EV_BOMB_BOUND); Actor_MoveForward(thisx); diff --git a/soh/src/overlays/actors/ovl_En_Door/z_en_door.c b/soh/src/overlays/actors/ovl_En_Door/z_en_door.c index 655c91303..12f01a08e 100644 --- a/soh/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/soh/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -339,7 +339,6 @@ void EnDoor_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnDoor_OverrideLimbDraw, NULL, &this->actor); if (this->actor.world.rot.y != 0) { - if (1) {} if (this->actor.world.rot.y > 0) { gSPDisplayList(POLY_OPA_DISP++, gDoorRightDL); } else { diff --git a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 38a481937..2d867a047 100644 --- a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -849,7 +849,6 @@ void func_80A03CF8(EnElf* this, GlobalContext* globalCtx) { EnElf_GetCutsceneNextPos(&nextPos, globalCtx, 8); if (globalCtx->csCtx.npcActions[8]->action == 5) { - if (1) {} EnElf_SpawnSparkles(this, globalCtx, 16); } @@ -863,7 +862,6 @@ void func_80A03CF8(EnElf* this, GlobalContext* globalCtx) { if ((globalCtx->sceneNum == SCENE_LINK_HOME) && (gSaveContext.sceneSetupIndex == 4)) { // play dash sound as Navi enters Links house in the intro - if (1) {} if (globalCtx->csCtx.frames == 55) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_FAIRY_DASH); } diff --git a/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index c86ec3125..fc2f8fe1a 100644 --- a/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -141,9 +141,7 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, GlobalContext* globalCtx) { leever = (EnReeba*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_REEBA, spawnPos.x, spawnPos.y, spawnPos.z, 0, 0, 0, spawnParams); - if (1) {} - if (1) {} - if (leever != NULL) { + if (leever != NULL) { this->curNumSpawn++; leever->unk_280 = this->leeverIndex++; if (this->leeverIndex >= 5) { diff --git a/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 5bbfc7048..6580ee17a 100644 --- a/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -282,8 +282,7 @@ void EnExRuppy_WaitInGame(EnExRuppy* this, GlobalContext* globalCtx) { if (divingGame->phase == ENDIVINGGAME_PHASE_ENDED) { this->timer = 20; this->actionFunc = EnExRuppy_Kill; - if (1) {} - } else if (this->actor.xyzDistToPlayerSq < SQ(localConst)) { + } else if (this->actor.xyzDistToPlayerSq < SQ(localConst)) { Rupees_ChangeBy(this->rupeeValue); func_80078884(NA_SE_SY_GET_RUPY); divingGame->grabbedRupeesCounter++; diff --git a/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c index 87d45be91..56e32c967 100644 --- a/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -929,7 +929,6 @@ void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, eff->color.r, eff->color.g, eff->color.b, (u8)(eff->color.a * (this->fadeAlpha / 255.0f))); gDPPipeSync(POLY_XLU_DISP++); - if (1) {} Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); diff --git a/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index 2ee8016ed..b6d407fa4 100644 --- a/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -133,8 +133,7 @@ void EnGanonMant_Tear(EnGanonMant* this) { if ((0 <= tx && tx < MANT_TEX_WIDTH) && (0 <= ty && ty < MANT_TEX_HEIGHT)) { for (areaX = 0; areaX <= tearAreaSizes[i]; areaX++) { texIdx = 0; - if (1) {} - for (areaY = 0; areaY <= tearAreaSizes[i]; areaY++) { + for (areaY = 0; areaY <= tearAreaSizes[i]; areaY++) { texIdx = (s16)((s16)tx + ((s16)ty * MANT_TEX_WIDTH)) + ((s16)areaX + ((s16)areaY * MANT_TEX_WIDTH)); if (texIdx < MANT_TEX_WIDTH * MANT_TEX_HEIGHT) { ((u16*)gMantTexProper)[texIdx] = 0; diff --git a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c index 8b4ff20c0..e958729c0 100644 --- a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -1159,7 +1159,6 @@ void EnGo_AddDust(EnGo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 init if (dustEffect->type != 1) { dustEffect->scale = scale; dustEffect->scaleStep = scaleStep; - if (1) {} timer = initialTimer; dustEffect->timer = timer; dustEffect->type = 1; diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 843726986..3cdaf0471 100644 --- a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -178,7 +178,6 @@ void EnGo2_AddDust(EnGo2* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 in if (dustEffect->type != 1) { dustEffect->scale = scale; dustEffect->scaleStep = scaleStep; - if (1) {} timer = initialTimer; dustEffect->timer = timer; dustEffect->type = 1; diff --git a/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index e4fe5018f..fb15de462 100644 --- a/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -218,8 +218,7 @@ void func_80AAF3C0(EnMm2* this, GlobalContext* globalCtx) { break; }; if (this->unk_1F4 & 4) { - if (1) {} - this->unk_1F4 &= ~4; + this->unk_1F4 &= ~4; HIGH_SCORE(HS_MARATHON) += 1; } } diff --git a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 106c41edb..79bf913fd 100644 --- a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -539,10 +539,6 @@ void func_80AB6570(EnNiw* this, GlobalContext* globalCtx) { posY += 20.0f; } if (posZ < 0.0f) { - if (1) {} // Required to match - if (1) {} - if (1) {} - if (1) {} posZ -= 20.0f; } else { posZ += 20.0f; diff --git a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index b633b047b..37b818e6e 100644 --- a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -532,7 +532,6 @@ void EnNiwLady_Update(Actor* thisx, GlobalContext* globalCtx) { } Actor_UpdateBgCheckInfo(globalCtx, thisx, 20.0f, 20.0f, 60.0f, 0x1D); Collider_UpdateCylinder(thisx, &this->collider); - if (1) {} CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); } } diff --git a/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c index 6e359bc80..d9b7b8738 100644 --- a/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -291,7 +291,6 @@ void func_80AF95C4(EnSda* this, u8* shadowTexture, Player* player, GlobalContext Matrix_RotateX((sp178.x / 32768.0f) * M_PI, MTXMODE_APPLY); for (i = 0; i < 22; i++) { Matrix_MultVec3f(&D_80AFA180[i], &sp188); - if (1) {} sp64[i].x = (((KREG(82) / 100.0f) + 4.0f) * sp188.x) + sp16C.x; sp64[i].y = (((KREG(82) / 100.0f) + 4.0f) * sp188.y) + sp16C.y; sp64[i].z = (((KREG(82) / 100.0f) + 4.0f) * sp188.z) + sp16C.z; diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index f152924e6..c238c74ae 100644 --- a/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -143,8 +143,7 @@ void EnSyatekiItm_StartRound(EnSyatekiItm* this, GlobalContext* globalCtx) { i = Rand_ZeroFloat(5.99f); while (this->roundFlags[i]) { i = Rand_ZeroFloat(5.99f); - if (1) {} - } + } this->roundNum = i + 1; this->roundFlags[i] = true; } else { diff --git a/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c index d425f3426..a20ca3be9 100644 --- a/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -879,7 +879,6 @@ void EnTite_CheckDamage(Actor* thisx, GlobalContext* globalCtx) { if (this->flipState == TEKTITE_FLIPPED) { EnTite_SetupFlipUpright(this); } else if ((this->action >= TEKTITE_IDLE) || (this->action >= TEKTITE_IDLE)) { - if (1) {} EnTite_SetupFlipOnBack(this); } } diff --git a/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c index 79617b6a2..d2244e12e 100644 --- a/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -1448,7 +1448,6 @@ void EnWf_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->fireTimer != 0) { this->actor.colorFilterTimer++; - if (1) {} this->fireTimer--; if ((this->fireTimer % 4) == 0) { diff --git a/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 93c5fd90c..ec4fc6715 100644 --- a/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -2261,7 +2261,6 @@ void EnZf_Draw(Actor* thisx, GlobalContext* globalCtx) { EffectSsEnIce_SpawnFlyingVec3f(globalCtx, thisx, &this->bodyPartsPos[icePosIndex], 150, 150, 150, 250, 235, 245, 255, 1.4f); } - if (1) {} } } else { // fades out when dead func_80093D84(globalCtx->state.gfxCtx); diff --git a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 847a64ca9..8432d11df 100644 --- a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -187,8 +187,7 @@ void EnZo_DrawRipples(EnZo* this, GlobalContext* globalCtx) { if (effect->type == ENZO_EFFECT_RIPPLE) { FrameInterpolation_RecordOpenChild(effect, effect->epoch); if (!setup) { - if (1) {} - gDPPipeSync(POLY_XLU_DISP++); + gDPPipeSync(POLY_XLU_DISP++); gSPDisplayList(POLY_XLU_DISP++, gZoraRipplesMaterialDL); gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0); setup = true; @@ -219,8 +218,7 @@ void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) { if (effect->type == ENZO_EFFECT_BUBBLE) { FrameInterpolation_RecordOpenChild(effect, effect->epoch); if (!setup) { - if (1) {} - gSPDisplayList(POLY_XLU_DISP++, gZoraBubblesMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, gZoraBubblesMaterialDL); gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 150, 150, 150, 0); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); @@ -255,8 +253,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) { if (effect->type == ENZO_EFFECT_SPLASH) { FrameInterpolation_RecordOpenChild(effect, effect->epoch); if (!setup) { - if (1) {} - gSPDisplayList(POLY_XLU_DISP++, gZoraSplashesMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, gZoraSplashesMaterialDL); gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 200, 0); setup = true; diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c index 68dec9e94..80c288a5a 100644 --- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -3592,8 +3592,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) { if (D_80B7E124 == 0) { if ((D_80B7FEA0 < 20) && ((D_80B7E0AE & 3) == 0)) { D_80B7FEA0++; - if (1) {} - } + } } if ((D_80B7E122 != 0) && (D_80B7E124 == 0)) { diff --git a/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 199912b7d..e5ab32654 100644 --- a/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -440,11 +440,6 @@ void MirRay_ReflectedBeam(MirRay* this, GlobalContext* globalCtx, MirRayShieldRe currentReflection->mtx.zw = 0.0f; - if (1) {} - if (1) {} - if (1) {} - if (1) {} // All four required to match - currentReflection->mtx.xx = currentReflection->mtx.yy = currentReflection->mtx.zz = currentReflection->mtx.ww = 1.0f; currentReflection->mtx.yx = currentReflection->mtx.zx = currentReflection->mtx.wx = diff --git a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index 3a639daa2..2d0adb971 100644 --- a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -688,8 +688,6 @@ void ObjectKankyo_DrawSnow(ObjectKankyo* this2, GlobalContext* globalCtx2) { break; } - if (1) {} - if (1) {} Matrix_Translate(this->effects[i].base.x + this->effects[i].pos.x, this->effects[i].base.y + this->effects[i].pos.y, this->effects[i].base.z + this->effects[i].pos.z, MTXMODE_NEW); diff --git a/soh/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/soh/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 5d3f27cc4..c3b0d8b05 100644 --- a/soh/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/soh/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -165,7 +165,6 @@ void ShotSun_UpdateHyliaSun(ShotSun* this, GlobalContext* globalCtx) { if (INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_NONE) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_ETCETERA, 700.0f, -800.0f, 7261.0f, 0, 0, 0, 7); globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gLakeHyliaFireArrowsCS); - if (1) {} gSaveContext.cutsceneTrigger = 1; } else { spawnPos.x = 700.0f; diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c index 3060a3531..76829c340 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c @@ -931,7 +931,6 @@ void FileChoose_EraseAnim1(GameState* thisx) { // probably a fake match, there should be a better chained assignment this->confirmButtonAlpha[0] = this->confirmButtonAlpha[1] = 0; - if (1) {} this->fileInfoAlpha[this->selectedFileIndex] = this->nameBoxAlpha[this->selectedFileIndex] = this->confirmButtonAlpha[1]; diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 02ca258d3..6e80478e7 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -617,7 +617,6 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) { if (LINK_AGE_IN_YEARS == YEARS_CHILD) { point = CUR_UPG_VALUE(sChildUpgrades[i]); - if (1) {} if ((point != 0) && (CUR_UPG_VALUE(sChildUpgrades[i]) != 0)) { KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gItemIcons[sChildUpgradeItemBases[i] + point - 1], 32, 32, 0);