diff --git a/soh/src/boot/z_std_dma.c b/soh/src/boot/z_std_dma.c index c6d0729dd..d7948b104 100644 --- a/soh/src/boot/z_std_dma.c +++ b/soh/src/boot/z_std_dma.c @@ -60,7 +60,6 @@ s32 DmaMgr_DmaRomToRam(uintptr_t rom, uintptr_t ram, size_t size) { osCreateMesgQueue(&queue, &msg, 1); while (size > buffSize) { - if (1) {} // Necessary to match ioMsg.hdr.pri = OS_MESG_PRI_NORMAL; ioMsg.hdr.retQueue = &queue; @@ -92,7 +91,6 @@ s32 DmaMgr_DmaRomToRam(uintptr_t rom, uintptr_t ram, size_t size) { ram += buffSize; } - if (1) {} // Also necessary to match ioMsg.hdr.pri = OS_MESG_PRI_NORMAL; ioMsg.hdr.retQueue = &queue; diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c index 107e8f015..44804692f 100644 --- a/soh/src/code/audio_load.c +++ b/soh/src/code/audio_load.c @@ -922,7 +922,6 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo #define BASE_OFFSET(x) (void*)((u32)(x) + (u32)(mem)) reloc2 = ptrs[0]; - if (1) {} if ((reloc2 != 0 || !gUseLegacySD) && (numDrums != 0)) { ptrs[0] = BASE_OFFSET(reloc2); @@ -963,7 +962,6 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo } reloc2 = ptrs[1]; - if (1) {} if ((reloc2 != 0 || !gUseLegacySD) && (numSfx != 0)) { ptrs[1] = BASE_OFFSET(reloc2); for (i = 0; i < numSfx; i++) { @@ -1805,7 +1803,6 @@ void AudioLoad_FinishAsyncLoad(AudioAsyncLoad* asyncLoad) { u32 sampleBankId2; RelocInfo relocInfo; - if (1) {} switch (ASYNC_TBLTYPE(retMsg)) { case SEQUENCE_TABLE: AudioLoad_SetSeqLoadStatus(ASYNC_ID(retMsg), ASYNC_STATUS(retMsg)); @@ -1829,7 +1826,6 @@ void AudioLoad_FinishAsyncLoad(AudioAsyncLoad* asyncLoad) { } doneMsg.data32 = asyncLoad->retMsg; - if (1) {} asyncLoad->status = LOAD_STATUS_WAITING; osSendMesg(asyncLoad->retQueue, doneMsg, OS_MESG_NOBLOCK); } @@ -2139,7 +2135,6 @@ s32 AudioLoad_GetSamplesForFont(s32 fontId, SoundFontSample** sampleSet) { for (i = 0; i < numDrums; i++) { Drum* drum = Audio_GetDrum(fontId, i); - if (1) {} if (drum != NULL) { numSamples = AudioLoad_AddToSampleSet(drum->sound.sample, numSamples, sampleSet); } diff --git a/soh/src/code/audio_synthesis.c b/soh/src/code/audio_synthesis.c index 79ed0163f..67f7033ea 100644 --- a/soh/src/code/audio_synthesis.c +++ b/soh/src/code/audio_synthesis.c @@ -786,7 +786,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS gAudioContext.curLoadedBook = audioFontSample->book->book; break; } - nEntries = 16 * audioFontSample->book->order * audioFontSample->book->npredictors; + nEntries = 16 * audioFontSample->book->order * audioFontSample->book->npredictors; aLoadADPCM(cmd++, nEntries, gAudioContext.curLoadedBook); } } @@ -898,7 +898,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS nSamplesInThisIteration = nSamplesToDecode + nSamplesInFirstFrame - nTrailingSamplesToIgnore; if (nSamplesProcessed == 0) { - skipBytes = nFirstFrameSamplesToIgnore * 2; + skipBytes = nFirstFrameSamplesToIgnore * 2; } else { phi_s4 = ALIGN16(s5 + 16); } diff --git a/soh/src/code/code_800A9F30.c b/soh/src/code/code_800A9F30.c index b8f4e1ce8..6ba9c9783 100644 --- a/soh/src/code/code_800A9F30.c +++ b/soh/src/code/code_800A9F30.c @@ -60,7 +60,6 @@ void func_800AA0B4(void) { gPadMgr.retraceCallback = func_800A9F30; gPadMgr.retraceCallbackValue = 0; - if (1) {} } void func_800AA0F0(void) { diff --git a/soh/src/code/code_800E4FE0.c b/soh/src/code/code_800E4FE0.c index 9af1c76d8..6eb3ae369 100644 --- a/soh/src/code/code_800E4FE0.c +++ b/soh/src/code/code_800E4FE0.c @@ -215,7 +215,6 @@ AudioTask* func_800E5000(void) { task->dram_stack_size = 0; task->output_buff = NULL; task->output_buff_size = NULL; - if (1) {} task->data_ptr = (u64*)gAudioContext.abiCmdBufs[index]; task->data_size = abiCmdCnt * sizeof(Acmd); task->yield_data_ptr = NULL; diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c index 785a58e2b..c5d150984 100644 --- a/soh/src/code/code_800EC960.c +++ b/soh/src/code/code_800EC960.c @@ -1558,7 +1558,6 @@ void func_800ED458(s32 arg0) { if ((D_8016BA10 == 0) || ((D_8016BA10 & sOcarinaAllowedBtnMask) != (sCurOcarinaBtnPress & sOcarinaAllowedBtnMask))) { D_8016BA10 = 0; - if (1) {} sCurOcarinaBtnVal = 0xFF; sCurOcarinaBtnIdx = 0xFF; phi_v1_2 = (sCurOcarinaBtnPress & sOcarinaAllowedBtnMask) & (sPrevOcarinaBtnPress & sOcarinaAllowedBtnMask); @@ -1802,7 +1801,6 @@ void func_800EDD68(u8 arg0) { lastNote = song[i].noteIdx; } - if (1) {} if (sRecordSongPos != (i + 1)) { sRecordSongPos = i + 2; @@ -2030,7 +2028,6 @@ s32 Audio_OcaMemoryGameGenNote(void) { sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos].unk_02 = 0; sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos + 1].noteIdx = 0xFF; sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos + 1].unk_02 = 0; - if (1) {} return 0; } diff --git a/soh/src/code/db_camera.c b/soh/src/code/db_camera.c index b29399ce9..273f8aac8 100644 --- a/soh/src/code/db_camera.c +++ b/soh/src/code/db_camera.c @@ -2156,7 +2156,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) { sLastFileIdx = sCurFileIdx; D_801612EA = sDbCameraCuts[idx1].letter; } - } 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/fault.c b/soh/src/code/fault.c index c4d6d746e..c55a63a00 100644 --- a/soh/src/code/fault.c +++ b/soh/src/code/fault.c @@ -577,9 +577,6 @@ void Fault_WaitForButtonCombo() u32 kDown; u32 kCur; - if (1) {} - if (1) {} - osSyncPrintf( VT_FGCOL(WHITE) "KeyWaitB (LRZ " VT_FGCOL(WHITE) "上" VT_FGCOL(YELLOW) "下 " VT_FGCOL(YELLOW) "上" VT_FGCOL(WHITE) "下 " VT_FGCOL(WHITE) "左" VT_FGCOL( YELLOW) "左 " VT_FGCOL(YELLOW) "右" VT_FGCOL(WHITE) "右 " VT_FGCOL(GREEN) "B" VT_FGCOL(BLUE) "A" VT_FGCOL(RED) "START" VT_FGCOL(WHITE) ")" VT_RST diff --git a/soh/src/code/game.c b/soh/src/code/game.c index f6d55828d..6f0df77dd 100644 --- a/soh/src/code/game.c +++ b/soh/src/code/game.c @@ -182,8 +182,6 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { Graph_BranchDlist(polyOpaP, newDList); POLY_OPA_DISP = newDList; - if (1) {} - CLOSE_DISPS(gfxCtx); func_80063D7C(gfxCtx); @@ -223,8 +221,6 @@ void func_800C49F4(GraphicsContext* gfxCtx) { Graph_BranchDlist(polyOpaP, newDlist); POLY_OPA_DISP = newDlist; - if (1) {} - CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c index 949ce48d9..6d90e1cc1 100644 --- a/soh/src/code/graph.c +++ b/soh/src/code/graph.c @@ -229,8 +229,6 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { task->data_size = (uintptr_t)WORK_DISP - (uintptr_t)gfxCtx->workBuffer; CLOSE_DISPS(gfxCtx); - { s32 pad2; } // Necessary to match stack usage - task->yield_data_ptr = (u64*)gGfxSPTaskYieldBuffer; task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer); @@ -258,8 +256,6 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { scTask->framebuffer = cfb; sGraphCfbInfoIdx = sGraphCfbInfoIdx % ARRAY_COUNT(sGraphCfbInfos); - if (1) {} - gfxCtx->schedMsgQ = &gSchedContext.cmdQ; osSendMesgPtr(&gSchedContext.cmdQ, scTask, OS_MESG_BLOCK); diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c index 69fb8f5fb..b8f00e20e 100644 --- a/soh/src/code/padmgr.c +++ b/soh/src/code/padmgr.c @@ -223,8 +223,6 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) { for (i = 0; i < padMgr->nControllers; i++, input++, padnow1++) { input->prev = input->cur; - if (1) {} // Necessary to match - switch (padnow1->err_no) { case 0: input->cur = *padnow1; diff --git a/soh/src/code/sys_matrix.c b/soh/src/code/sys_matrix.c index dc3336842..80ff7253e 100644 --- a/soh/src/code/sys_matrix.c +++ b/soh/src/code/sys_matrix.c @@ -851,8 +851,6 @@ void Matrix_RotateAxis(f32 angle, Vec3f* axis, u8 mode) { cmf->yy = axis->y * axis->y * rCos + cos; cmf->zz = axis->z * axis->z * rCos + cos; - if (0) {} - temp2 = axis->x * rCos * axis->y; temp3 = axis->z * sin; cmf->yx = temp2 + temp3; diff --git a/soh/src/code/ucode_disas.c b/soh/src/code/ucode_disas.c index db56416e3..56e3aad9a 100644 --- a/soh/src/code/ucode_disas.c +++ b/soh/src/code/ucode_disas.c @@ -247,8 +247,6 @@ void UCodeDisas_PrintVertices(UCodeDisas* this, Vtx* vtx, s32 count, s32 start) vtx->v.cn[3], start + i); } vtx++; - - if (1) {} } } @@ -717,7 +715,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) { : "???"; if ((setscissor.x0frac | setscissor.y0frac | setscissor.x1frac | setscissor.y1frac)) { - 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_actor.c b/soh/src/code/z_actor.c index b331c63eb..38cb2e2bd 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -3821,8 +3821,6 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) OPEN_DISPS(globalCtx->state.gfxCtx); - if (0) {} // Necessary to match - POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, alpha); @@ -5801,8 +5799,6 @@ s32 func_80037D98(GlobalContext* globalCtx, Actor* actor, s16 arg2, s32* arg3) { Actor_GetScreenPos(globalCtx, actor, &sp2C, &sp2A); - if (0) {} // Necessary to match - if ((sp2C < 0) || (sp2C > SCREEN_WIDTH) || (sp2A < 0) || (sp2A > SCREEN_HEIGHT)) { return false; } diff --git a/soh/src/code/z_bgcheck.c b/soh/src/code/z_bgcheck.c index 810d68d20..0d00f2598 100644 --- a/soh/src/code/z_bgcheck.c +++ b/soh/src/code/z_bgcheck.c @@ -216,7 +216,6 @@ void func_80038A28(CollisionPoly* poly, f32 tx, f32 ty, f32 tz, MtxF* dest) { phi_f12 = -(nz * inv_phi_f2); } else { phi_f14 = sqrtf(1.0f - SQ(ny)); - if (1) {} if (!IS_ZERO(phi_f14)) { inv_phi_f14 = (1.0f / phi_f14); phi_f12 = nx * inv_phi_f14; diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index 01f782061..c89fb7463 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -949,7 +949,6 @@ s32 func_800458D4(Camera* camera, VecSph* eyeAtDir, f32 arg2, f32* arg3, s16 arg eyeAtAngle = Math_FAtan2F(deltaY, OLib_Vec3fDistXZ(&camera->at, &camera->eye)); if (eyeAtAngle > DEGF_TO_RADF(OREG(32))) { - if (1) {} phi_f2 = 1.0f - sinf(DEGF_TO_RADF(eyeAtAngle - OREG(32))); } else if (eyeAtAngle < DEGF_TO_RADF(OREG(33))) { phi_f2 = 1.0f - sinf(DEGF_TO_RADF(OREG(33)) - eyeAtAngle); @@ -1876,7 +1875,6 @@ s32 Camera_Normal3(Camera* camera) { camera->yawUpdateRateInv, sp98, 0.1f); camera->pitchUpdateRateInv = Camera_LERPCeilF((f32)OREG(7) + (anim->swing.swingUpdateRateTimer * 2), camera->pitchUpdateRateInv, sp94, 0.1f); - if (1) {} anim->swing.swingUpdateRateTimer--; } else { camera->yawUpdateRateInv = Camera_LERPCeilF(norm3->yawUpdateSpeed, camera->yawUpdateRateInv, sp98, 0.1f); @@ -6665,7 +6663,6 @@ s32 Camera_Special9(Camera* camera) { sCameraInterfaceFlags = params->interfaceFlags; switch (camera->animState) { - if (1) {} case 0: camera->unk_14C &= ~(0x4 | 0x2); @@ -6750,7 +6747,6 @@ s32 Camera_Special9(Camera* camera) { } break; } - if (1) {} spAC = playerPosRot->pos; spAC.y += playerYOffset; camera->dist = OLib_Vec3fDist(&spAC, eye); @@ -7781,7 +7777,6 @@ s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags) { } if (flags & 8) { - if (1) {} camera->camDataIdx = camera->prevCamDataIdx; camera->prevCamDataIdx = -1; } else if (!(flags & 4)) { diff --git a/soh/src/code/z_debug.c b/soh/src/code/z_debug.c index 6a4a7c4d8..4cf762f40 100644 --- a/soh/src/code/z_debug.c +++ b/soh/src/code/z_debug.c @@ -244,8 +244,6 @@ void func_80063D7C(GraphicsContext* gfxCtx) { Graph_BranchDlist(sp78, sp7C); POLY_OPA_DISP = sp7C; - if (1) {} - CLOSE_DISPS(gfxCtx); GfxPrint_Destroy(&printer); diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c index f912949b1..2134f323c 100644 --- a/soh/src/code/z_demo.c +++ b/soh/src/code/z_demo.c @@ -1910,10 +1910,7 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) { Gfx* displayList; Gfx* prevDisplayList; - if (0) {} // Necessary to match - if (gSaveContext.cutsceneIndex >= 0xFFF0) { - if (0) {} // Also necessary to match if (BREG(0) != 0) { OPEN_DISPS(globalCtx->state.gfxCtx); diff --git a/soh/src/code/z_eff_blure.c b/soh/src/code/z_eff_blure.c index 2683d47b0..dc2793b75 100644 --- a/soh/src/code/z_eff_blure.c +++ b/soh/src/code/z_eff_blure.c @@ -280,8 +280,6 @@ void EffectBlure_UpdateFlags(EffectBlureElement* elem) { f32 sp30; f32 sp2C; - if (1) {} // Necessary to match - Math_Vec3s_DiffToVec3f(&sp64, &elem->p1, &prev->p1); Math_Vec3s_DiffToVec3f(&sp58, &elem->p2, &prev->p2); Math_Vec3s_DiffToVec3f(&sp4C, &next->p1, &elem->p1); @@ -432,8 +430,6 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* vtx[0].v.cn[2] = sp78.b; vtx[0].v.cn[3] = sp78.a; - if (1) {} // Necessary to match - sp60.x = sp8C.x; sp60.y = sp8C.y; sp60.z = sp8C.z; @@ -463,8 +459,6 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* vtx[2].v.cn[2] = sp7C.b; vtx[2].v.cn[3] = sp7C.a; - if (1) {} // Necessary to match - sp60.x = sp84.x; sp60.y = sp84.y; sp60.z = sp84.z; diff --git a/soh/src/code/z_eff_ss_dead.c b/soh/src/code/z_eff_ss_dead.c index 63e4d0112..f03fcd343 100644 --- a/soh/src/code/z_eff_ss_dead.c +++ b/soh/src/code/z_eff_ss_dead.c @@ -23,8 +23,6 @@ void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a POLY_OPA_DISP = displayListHead; - if (1) {} // Necessary to match - CLOSE_DISPS(globalCtx->state.gfxCtx); } @@ -44,8 +42,6 @@ void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a POLY_OPA_DISP = displayListHead; - if (1) {} // Necessary to match - CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -84,8 +80,6 @@ void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a POLY_XLU_DISP = displayListHead; - if (1) {} // Necessary to match - CLOSE_DISPS(globalCtx->state.gfxCtx); } @@ -104,8 +98,6 @@ void func_80026860(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a POLY_XLU_DISP = displayListHead; - if (1) {} // Necessary to match - CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_effect.c b/soh/src/code/z_effect.c index d024d0892..5c2a12215 100644 --- a/soh/src/code/z_effect.c +++ b/soh/src/code/z_effect.c @@ -169,13 +169,10 @@ void Effect_DrawAll(GraphicsContext* gfxCtx) { if (sEffectContext.blures[i].status.active) { sEffectInfoTable[EFFECT_BLURE1].draw(&sEffectContext.blures[i].effect, gfxCtx); } - if (1) {} // Necessary to match - if (1) {} } for (i = 0; i < SHIELD_PARTICLE_COUNT; i++) { if (sEffectContext.shieldParticles[i].status.active) { - if (gfxCtx) {} // Necessary to match sEffectInfoTable[EFFECT_SHIELD_PARTICLE].draw(&sEffectContext.shieldParticles[i].effect, gfxCtx); } } diff --git a/soh/src/code/z_en_a_keep.c b/soh/src/code/z_en_a_keep.c index 6eaba02b1..8ea7fb5bb 100644 --- a/soh/src/code/z_en_a_keep.c +++ b/soh/src/code/z_en_a_keep.c @@ -283,7 +283,6 @@ void EnAObj_BoulderFragment(EnAObj* this, GlobalContext* globalCtx) { if (this->dyna.actor.speedXZ != 0.0f && this->dyna.actor.bgCheckFlags & 0x8) { this->dyna.actor.world.rot.y = this->dyna.actor.wallYaw - this->dyna.actor.world.rot.y + this->dyna.actor.wallYaw - 0x8000; - if (1) {} this->dyna.actor.bgCheckFlags &= ~0x8; } diff --git a/soh/src/code/z_lights.c b/soh/src/code/z_lights.c index b3b8f82b8..4264332c5 100644 --- a/soh/src/code/z_lights.c +++ b/soh/src/code/z_lights.c @@ -82,8 +82,6 @@ void Lights_Draw(Lights* lights, GraphicsContext* gfxCtx) { light++; } - if (0) {} - i++; // abmient light is total number of lights + 1 gSPLight(POLY_OPA_DISP++, &lights->l.a, i); gSPLight(POLY_XLU_DISP++, &lights->l.a, i); @@ -120,7 +118,7 @@ void Lights_BindPoint(Lights* lights, LightParams* params, Vec3f* vec) { if (light != NULL) { posDiff = sqrtf(posDiff); - scale = posDiff / scale; + scale = posDiff / scale; scale = 1 - SQ(scale); light->l.col[0] = light->l.colc[0] = params->point.color[0] * scale; diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index 70fc5c00b..09098894d 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -2866,7 +2866,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) { break; } - if (sOcarinaNotesAlphaValues[i] != 255) { + if (sOcarinaNotesAlphaValues[i] != 255) { sOcarinaNotesAlphaValues[i] += VREG(50); if (sOcarinaNotesAlphaValues[i] >= 255) { sOcarinaNotesAlphaValues[i] = 255; @@ -2977,7 +2977,6 @@ void Message_Draw(GlobalContext* globalCtx) { Graph_BranchDlist(polyOpaP, plusOne); POLY_OPA_DISP = plusOne; } - if (1) {} plusOne = Graph_GfxPlusOne(polyOpaP = POLY_OPA_DISP); gSPDisplayList(OVERLAY_DISP++, plusOne); Message_DrawMain(globalCtx, &plusOne); diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index f754713b3..204058ace 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -998,7 +998,7 @@ void func_80083108(GlobalContext* globalCtx) { gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0]; } } - } + } if (sp28) { Interface_LoadItemIcon1(globalCtx, 0); diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index cfdd0e73a..e500610c7 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -1647,7 +1647,6 @@ s32 Gameplay_CameraSetAtEyeUp(GlobalContext* globalCtx, s16 camId, Vec3f* at, Ve s32 Gameplay_CameraSetFov(GlobalContext* globalCtx, s16 camId, f32 fov) { s32 ret = Camera_SetParam(globalCtx->cameraPtrs[camId], 0x20, &fov) & 1; - if (1) {} return ret; } diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index a7448ff5d..cce0e501e 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -630,8 +630,6 @@ s32 func_8008F2F8(GlobalContext* globalCtx) { if (!Player_InCsMode(globalCtx)) { triggerEntry = &sTextTriggers[var]; - if (0) {} - if ((triggerEntry->flag != 0) && !(gSaveContext.textTriggerFlags & triggerEntry->flag) && (((var == 0) && (this->currentTunic != PLAYER_TUNIC_GORON && CVar_GetS32("gSuperTunic", 0) == 0)) || (((var == 1) || (var == 3)) && (this->currentBoots == PLAYER_BOOTS_IRON) && @@ -1223,8 +1221,6 @@ void Player_DrawHookshotReticle(GlobalContext* globalCtx, Player* this, f32 arg2 D_801260C8.z = arg2; Matrix_MultVec3f(&D_801260C8, &sp80); - if (1) {} - if (BgCheck_AnyLineTest3(&globalCtx->colCtx, &sp8C, &sp80, &sp74, &sp9C, 1, 1, 1, 1, &bgId)) { OPEN_DISPS(globalCtx->state.gfxCtx); diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c index 814d72c7f..45b4b8fb8 100644 --- a/soh/src/code/z_room.c +++ b/soh/src/code/z_room.c @@ -106,7 +106,6 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { func_80093C80(globalCtx); gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); } - if (1) {} if (flags & 2) { func_8003435C(&D_801270A0, globalCtx); //gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); diff --git a/soh/src/code/z_scene.c b/soh/src/code/z_scene.c index ae0d89db9..63370bb90 100644 --- a/soh/src/code/z_scene.c +++ b/soh/src/code/z_scene.c @@ -294,8 +294,6 @@ void func_8009899C(GlobalContext* globalCtx, SceneCmd* cmd) { ASSERT(cmd->objectList.num <= OBJECT_EXCHANGE_BANK_MAX); - if (1) {} - while (k < cmd->objectList.num) { nextPtr = func_800982FC(&globalCtx->objectCtx, i, *objectEntry); if (i < OBJECT_EXCHANGE_BANK_MAX - 1) { @@ -439,8 +437,6 @@ void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd) { if (gSaveContext.sceneSetupIndex != 0) { altHeader = ((SceneCmd**)SEGMENTED_TO_VIRTUAL(cmd->altHeaders.segment))[gSaveContext.sceneSetupIndex - 1]; - if (1) {} - if (altHeader != NULL) { Scene_ExecuteCommands(globalCtx, SEGMENTED_TO_VIRTUAL(altHeader)); (cmd + 1)->base.code = 0x14; diff --git a/soh/src/code/z_scene_table.c b/soh/src/code/z_scene_table.c index ec03e1f07..e9201884f 100644 --- a/soh/src/code/z_scene_table.c +++ b/soh/src/code/z_scene_table.c @@ -1317,8 +1317,6 @@ void func_8009B0FC(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx); - if (1) {} // Necessary to match - spB0 = (globalCtx->roomCtx.unk_74[1] >> 8) & 0xFF; spAC = globalCtx->roomCtx.unk_74[1] & 0xFF; gameplayFrames = globalCtx->gameplayFrames; @@ -1445,8 +1443,6 @@ void func_8009BC44(GlobalContext* globalCtx) { u32 gameplayFrames; s8 sp83; - if (1) {} // Necessary to match - sp83 = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; OPEN_DISPS(globalCtx->state.gfxCtx); @@ -1503,8 +1499,6 @@ void func_8009C0AC(GlobalContext* globalCtx) { u32 gameplayFrames; s8 sp7B; - if (1) {} // Necessary to match - sp7B = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; OPEN_DISPS(globalCtx->state.gfxCtx); @@ -1549,8 +1543,6 @@ void* sIceCavernEntranceTextures[] = { void func_8009C3EC(GlobalContext* globalCtx) { u32 gameplayFrames; - if (0) {} // Necessary to match - OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; @@ -1653,8 +1645,6 @@ void* sGTGEntranceTextures[] = { void func_8009CC00(GlobalContext* globalCtx) { u32 gameplayFrames; - if (0) {} // Necessary to match - OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; @@ -1828,8 +1818,6 @@ void* sForestTempleEntranceTextures[] = { void func_8009D758(GlobalContext* globalCtx) { u32 gameplayFrames; - if (0) {} // Necessary to match - OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; @@ -1973,9 +1961,6 @@ void func_8009E0B8(GlobalContext* globalCtx) { spA0 = 500; displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 6 * sizeof(Gfx)); - if (1) {} - if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; @@ -2135,8 +2120,6 @@ void func_8009EAD8(GlobalContext* globalCtx) { void func_8009EE44(GlobalContext* globalCtx) { u32 gameplayFrames; - if (0) {} // Necessary to match - OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; diff --git a/soh/src/code/z_skelanime.c b/soh/src/code/z_skelanime.c index 57ac5e7e6..ef27aa95c 100644 --- a/soh/src/code/z_skelanime.c +++ b/soh/src/code/z_skelanime.c @@ -46,8 +46,6 @@ void SkelAnime_DrawLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skele } } - if (1) {} - if (postLimbDraw != NULL) { postLimbDraw(globalCtx, limbIndex, &dList, &rot, arg); } @@ -267,8 +265,6 @@ void SkelAnime_DrawLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** skele } } - if (1) {} - if (postLimbDraw != NULL) { postLimbDraw(globalCtx, limbIndex, &dList, &rot, arg); } diff --git a/soh/src/code/z_skin_matrix.c b/soh/src/code/z_skin_matrix.c index d822d6c13..51b414853 100644 --- a/soh/src/code/z_skin_matrix.c +++ b/soh/src/code/z_skin_matrix.c @@ -351,8 +351,6 @@ void SkinMatrix_SetRotateZYX(MtxF* mf, s16 x, s16 y, s16 z) { } else { mf->xx = cosZ; - if (1) {} - if (1) {} xz = sinZ; // required to match mf->yx = sinZ; mf->zx = mf->xz = mf->yz = 0; @@ -368,7 +366,6 @@ void SkinMatrix_SetRotateZYX(MtxF* mf, s16 x, s16 y, s16 z) { mf->xy = (xy * cos) + (xz * sin); mf->xz = (xz * cos) - (xy * sin); - if (1) {} yz = mf->yz; yy = mf->yy; mf->yy = (yy * cos) + (yz * sin); @@ -419,8 +416,6 @@ void SkinMatrix_SetRotateYXZ(MtxF* mf, s16 x, s16 y, s16 z) { } else { mf->zz = cosY; - if (1) {} - if (1) {} xy = sinY; // required to match mf->xz = sinY; mf->xy = mf->zy = mf->yz = 0; @@ -434,7 +429,6 @@ void SkinMatrix_SetRotateYXZ(MtxF* mf, s16 x, s16 y, s16 z) { xy = mf->xy; mf->xx = (xx * cos) + (xy * sin); mf->xy = xy * cos - (xx * sin); - if (1) {} zy = mf->zy; zx = mf->zx; mf->zx = (zx * cos) + (zy * sin); diff --git a/soh/src/libultra/io/contpfs.c b/soh/src/libultra/io/contpfs.c index 26ac77b6f..e14641a6a 100644 --- a/soh/src/libultra/io/contpfs.c +++ b/soh/src/libultra/io/contpfs.c @@ -202,8 +202,6 @@ s32 __osGetId(OSPfs* pfs) { bcopy(id, pfs->id, BLOCKSIZE); - if (0) {} - pfs->version = id->version; pfs->banks = id->banks; diff --git a/soh/src/libultra/io/pfsinitpak.c b/soh/src/libultra/io/pfsinitpak.c index 59fb8eda9..c7563c84c 100644 --- a/soh/src/libultra/io/pfsinitpak.c +++ b/soh/src/libultra/io/pfsinitpak.c @@ -58,8 +58,6 @@ s32 osPfsInitPak(OSMesgQueue* queue, OSPfs* pfs, s32 channel) { bcopy(id, pfs->id, BLOCKSIZE); - if (1) {} - pfs->version = id->version; pfs->banks = id->banks; pfs->inodeStartPage = 1 + DEF_DIR_PAGES + (2 * pfs->banks); diff --git a/soh/src/libultra/os/settimer.c b/soh/src/libultra/os/settimer.c index b0c4a05e9..239a0c4c4 100644 --- a/soh/src/libultra/os/settimer.c +++ b/soh/src/libultra/os/settimer.c @@ -21,7 +21,6 @@ s32 osSetTimer(OSTimer* timer, OSTime countdown, OSTime interval, OSMesgQueue* m prevInt = __osDisableInt(); if (__osTimerList->next != __osTimerList) { - if (1) {} next = __osTimerList->next; count = osGetCount(); 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 c4902c411..30c902430 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,7 +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) { - this->alpha = ((this->timer * 0x23) - 0x118); + this->alpha = ((this->timer * 0x23) - 0x118); } } } @@ -197,10 +197,8 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) { stateFrames = globalCtx->state.frames; arrow = (EnArrow*)this->actor.parent; - if (1) {} if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { - if (1) {} tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor; OPEN_DISPS(globalCtx->state.gfxCtx); 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 4a07337bf..0c082b6b3 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,7 +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) { - this->alpha = ((this->timer * 0x23) - 0x118); + this->alpha = ((this->timer * 0x23) - 0x118); } } } @@ -196,10 +196,7 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 stateFrames = globalCtx->state.frames; EnArrow* arrow = (EnArrow*)this->actor.parent; - if (1) {} - if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { - if (1) {} tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor; OPEN_DISPS(globalCtx->state.gfxCtx); 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 b7f5cf7c8..d1e6f4549 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,7 +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) { - this->alpha = ((this->timer * 0x23) - 0x118); + this->alpha = ((this->timer * 0x23) - 0x118); } } } @@ -194,10 +194,7 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) { EnArrow* arrow = (EnArrow*)this->actor.parent; Actor* tranform; - if (1) {} - if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { - if (1) {} tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor; OPEN_DISPS(globalCtx->state.gfxCtx); diff --git a/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index 16471d07d..6dbfd062d 100644 --- a/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -88,7 +88,6 @@ void BgBowlWall_SpawnBullseyes(BgBowlWall* this, GlobalContext* globalCtx) { this->bullseyeCenter.x = sBullseyeOffset[type].x + this->dyna.actor.world.pos.x; this->bullseyeCenter.y = sBullseyeOffset[type].y + this->dyna.actor.world.pos.y; this->bullseyeCenter.z = sBullseyeOffset[type].z + this->dyna.actor.world.pos.z; - if (1) {} bullseye = (EnWallTubo*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_WALL_TUBO, this->bullseyeCenter.x, this->bullseyeCenter.y, this->bullseyeCenter.z, 0, 0, 0, this->dyna.actor.params); diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index 6c70afa00..de7a93706 100644 --- a/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -102,7 +102,6 @@ void BgGndDarkmeiro_Destroy(Actor* thisx, GlobalContext* globalCtx2) { BgGndDarkmeiro* this = (BgGndDarkmeiro*)thisx; if ((this->dyna.actor.params & 0xFF) == 1) { - if (1) {} DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index ce19a135f..7cc2309b7 100644 --- a/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -53,7 +53,6 @@ void BgGndFiremeiro_Destroy(Actor* thisx, GlobalContext* globalCtx2) { BgGndFiremeiro* this = (BgGndFiremeiro*)thisx; if (this->dyna.actor.params == 0) { - if (1) {} DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index a62b8465a..bc384a9fa 100644 --- a/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -197,8 +197,6 @@ void BgGndSoulmeiro_Draw(Actor* thisx, GlobalContext* globalCtx) { }; s32 params = thisx->params & 0xFF; - if (1) {} - switch (params) { case 0: OPEN_DISPS(globalCtx->state.gfxCtx); diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index cad35a76a..248fcd077 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -321,8 +321,6 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, GlobalContext* globalCtx) { if (this->vFlameScale > 0) { OPEN_DISPS(globalCtx->state.gfxCtx); - if (1) {} - func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 4d1ecffc4..00f3f5f86 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -229,7 +229,6 @@ void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, GlobalContext* globalCtx) { MTXMODE_NEW); Matrix_RotateY(this->dyna.actor.shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_Scale(0.07f, 0.04f, 0.07f, MTXMODE_APPLY); - if (1) {} gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 0, 170, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 255, 255); gSPSegment(POLY_XLU_DISP++, 0x08, diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index 292ebc32a..0143bd89b 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -147,7 +147,6 @@ void BgJyaBigmirror_HandleMirRay(Actor* thisx, GlobalContext* globalCtx) { } } lightBeamToggles[0] = puzzleSolved; // Only spawn if puzzle solved - if (1) {} lightBeamToggles[1] = lightBeamToggles[2] = this->puzzleFlags & (BIGMIR_PUZZLE_IN_1ST_TOP_ROOM | BIGMIR_PUZZLE_IN_2ND_TOP_ROOM); @@ -227,7 +226,6 @@ void BgJyaBigmirror_DrawLightBeam(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gBigMirror1DL); if (lift != NULL) { - if (1) {} Matrix_SetTranslateRotateYXZ(lift->world.pos.x, lift->world.pos.y, lift->world.pos.z, &D_80893F4C); Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), 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 b816eb81c..9f59a03bc 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,7 +309,7 @@ void BgJyaCobra_UpdateShadowFromSide(BgJyaCobra* this) { if (!(temp_x & ~0x3F)) { temp_s2[temp_z + temp_x] |= D_8089731C[k][l]; } - } + } } } } diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index c85fccdda..52455dc39 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -506,7 +506,6 @@ void BgMizuBwall_Draw(Actor* thisx, GlobalContext* globalCtx2) { u32 frames; OPEN_DISPS(globalCtx->state.gfxCtx); - if (1) {} frames = globalCtx->gameplayFrames; func_80093D18(globalCtx->state.gfxCtx); diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index 7f40b514a..6d1dc68fb 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -363,8 +363,6 @@ void BgMizuMovebg_Draw(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; u32 frames; - if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx); frames = globalCtx->gameplayFrames; 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 ba66eccab..7d0d0badb 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,14 +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; - 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; - 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_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 378b4a58d..81352407e 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -284,7 +284,6 @@ void BgMoriHashigo_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - if (1) {} gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), diff --git a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 962a92a52..0a9eb3776 100644 --- a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -112,7 +112,6 @@ void BgPoEvent_InitPaintings(BgPoEvent* this, GlobalContext* globalCtx) { } for (i1 = 0; i1 < sTrisInit.count; i1++) { item = &sTrisInit.elements[i1]; - if (1) {} // This section looks like a macro of some sort. for (i2 = 0; i2 < 3; i2++) { vtxVec = &item->dim.vtx[i2]; sp9C[i2].x = (vtxVec->x * coss) + (this->dyna.actor.home.pos.x + (sins * vtxVec->z)); diff --git a/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 9fc24ca91..fe64dd87f 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -295,8 +295,6 @@ void func_808B5240(BgSpot16Bombstone* this, GlobalContext* globalCtx) { Vec3f position; Vec3f* actorPosition = &this->actor.world.pos; - if (1) {} - while (true) { if ((u32)this->unk_158 >= ARRAY_COUNTU(D_808B5EB0) || this->unk_154 < D_808B5EB0[this->unk_158][0]) { break; diff --git a/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index 0784d38cf..c32979444 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -126,8 +126,6 @@ void BgSpot16Doughnut_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - if (1) {} - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->fireFlag & 1) { diff --git a/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index 1e32c2780..73b79aeb4 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -69,7 +69,5 @@ void func_808B7478(Actor* thisx, GlobalContext* globalCtx) { (0 - globalCtx->gameplayFrames) & 0x7F, 0x20, 0x20)); gSPDisplayList(POLY_XLU_DISP++, gCraterSmokeConeDL); - if (1) {} - CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index d7d6b147a..964792fee 100644 --- a/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -61,8 +61,6 @@ void BgSstFloor_Update(BgSstFloor* thisx, GlobalContext* globalCtx) { colHeader->vtxList = SEGMENTED_TO_VIRTUAL(colHeader->vtxList); - if (1) {} - if (func_80043590(&this->dyna) && (this->dyna.actor.yDistToPlayer < 1000.0f)) { Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_BOSS_BONGO); } else { @@ -119,7 +117,6 @@ void BgSstFloor_Update(BgSstFloor* thisx, GlobalContext* globalCtx) { if (this->drumPhase != 0) { this->drumPhase--; } - if (1) {} func_8003EE6C(globalCtx, &globalCtx->colCtx.dyna); } diff --git a/soh/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/soh/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index 27fbb485a..945c053ae 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/soh/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -167,8 +167,6 @@ void func_808BF108(BgYdanMaruta* this, GlobalContext* globalCtx) { this->actionFunc = func_808BF1EC; } - if (1) {} - temp = (this->unk_16A % 4) - 2; if (temp == -2) { temp = 0; diff --git a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index aeaea4f81..ce3bac58b 100644 --- a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -1041,7 +1041,6 @@ void BossFd_Wait(BossFd* this, GlobalContext* globalCtx) { temp_rand = Rand_ZeroFloat(8.9f); } while (temp_rand == this->holeIndex); this->holeIndex = temp_rand; - if (1) {} // Needed for matching this->targetPosition.x = sHoleLocations[this->holeIndex].x; this->targetPosition.y = sHoleLocations[this->holeIndex].y - 200.0f; this->targetPosition.z = sHoleLocations[this->holeIndex].z; @@ -1079,8 +1078,6 @@ void BossFd_Effects(BossFd* this, GlobalContext* globalCtx) { f32 temp_z; s16 i; - if (1) {} // Needed for match - if (this->fogMode == 0) { globalCtx->envCtx.unk_BF = 0; globalCtx->envCtx.unk_D8 = 0.5f + 0.5f * Math_SinS(this->work[BFD_VAR_TIMER] * 0x500); diff --git a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index 31bb94de4..ecbcaf19b 100644 --- a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -1166,7 +1166,6 @@ void BossFd2_DrawMane(BossFd2* this, GlobalContext* globalCtx) { s16 i; OPEN_DISPS(globalCtx->state.gfxCtx); - if (1) {} for (i = 0; i < 10; i++) { this->centerMane.scale[i] = 1.5f + 0.3f * Math_SinS(5596.0f * this->work[FD2_VAR_TIMER] + i * 0x3200); this->rightMane.scale[i] = 1.5f + 0.3f * Math_SinS(5496.0f * this->work[FD2_VAR_TIMER] + i * 0x3200); 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 62f1dbd68..5525b2826 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,7 +418,7 @@ void BossGanon_Init(Actor* thisx, GlobalContext* globalCtx2) { } else { thisx->update = func_808E1EB4; thisx->draw = func_808E229C; - thisx->speedXZ = 11.0f; + thisx->speedXZ = 11.0f; if (thisx->params == 0xC8) { this->timers[0] = 7; @@ -4215,7 +4215,6 @@ void func_808E1EB4(Actor* thisx, GlobalContext* globalCtx2) { this->unk_2EC[this->unk_1A6] = this->actor.world.pos; if (this->unk_1C2 == 0) { - if (1) {} if (this->timers[0] == 0) { this->unk_1C2 = 1; } @@ -4344,7 +4343,6 @@ void func_808E2544(Actor* thisx, GlobalContext* globalCtx) { this->unk_3C4[this->unk_1A6].y = BINANG_TO_RAD(this->actor.world.rot.y); switch (this->unk_1C2) { - if (1) {} case 0: this->actor.speedXZ = 40.0f; Math_ApproachF(&this->fwork[1], 255.0f, 1.0f, 40.0f); diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 230aa27d7..9bc1fd7a8 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -2483,7 +2483,6 @@ void func_80904340(BossGanon2* this, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, this->unk_328); BossGanon2_InitRand(this->unk_340 + 1, 0x71AC - this->unk_340, 0x263A); rand = BossGanon2_RandZeroOne(); - if (1) {} for (i = 0; i < 5; i++) { angle = (i * (2 * M_PI / 5)) + (rand * M_PI); diff --git a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index bea126fcb..c6547f47e 100644 --- a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -1921,8 +1921,6 @@ void BossGoma_Update(Actor* thisx, GlobalContext* globalCtx) { this->sfxFaintTimer--; } - if (1) {} - this->eyeState = EYESTATE_IRIS_FOLLOW_BONUS_IFRAMES; this->actionFunc(this, globalCtx); this->actor.shape.rot.y = this->actor.world.rot.y; 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 432c9e8a3..ebd1828ca 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,7 +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; - this->csState = MO_INTRO_FINISH; + this->csState = MO_INTRO_FINISH; this->timers[2] = 110; this->cameraNextEye.x = 111.0f; this->cameraNextEye.y = 133.0f; @@ -1589,7 +1589,7 @@ void BossMo_DeathCs(BossMo* this, GlobalContext* globalCtx) { this->cameraSpeedMod = 0.0f; this->cameraAccel = 0.02f; this->cameraNextAt.y = 320.0f; - 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; @@ -2568,7 +2568,6 @@ void BossMo_DrawWater(BossMo* this, GlobalContext* globalCtx) { s32 pad; OPEN_DISPS(globalCtx->state.gfxCtx); - if (1) {} Matrix_Push(); func_80093D84(globalCtx->state.gfxCtx); @@ -2728,7 +2727,6 @@ void BossMo_DrawTent(Actor* thisx, GlobalContext* globalCtx) { u16 scroll; OPEN_DISPS(globalCtx->state.gfxCtx); - if (1) {} func_80093D18(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, (s8)(this->baseAlpha * 1.5f)); gDPSetEnvColor(POLY_OPA_DISP++, 150, 150, 150, 0); diff --git a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 8806bffb1..cd8d2c540 100644 --- a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -1089,7 +1089,6 @@ void BossSst_HeadDarken(BossSst* this, GlobalContext* globalCtx) { if (this->timer != 0) { this->timer--; } - if (1) {} if (this->timer >= 80) { if (this->timer == 80) { 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 c31d1d3ff..ccad41cc3 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,7 +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 (zero) { + if (zero) { accel.x *= 2.0; } @@ -2792,7 +2792,6 @@ void BossTw_TwinrovaDeathCS(BossTw* this, GlobalContext* globalCtx) { } if (this->subCamId) { - if (1) {} Gameplay_CameraSetAtEye(globalCtx, this->subCamId, &this->subCamAt, &this->subCamEye); } } @@ -2827,9 +2826,6 @@ void BossTw_Update(Actor* thisx, GlobalContext* globalCtx) { this->blastTailPos[this->work[TAIL_IDX]] = this->actor.world.pos; - if (1) {} - if (1) {} - for (i = 0; i < 5; i++) { if (this->timers[i] != 0) { this->timers[i]--; @@ -4286,8 +4282,6 @@ s32 BossTw_BlastShieldCheck(BossTw* this, GlobalContext* globalCtx) { s32 ret = false; ColliderInfo* info; - if (1) {} - if (this->csState1 == 1) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; @@ -4313,7 +4307,7 @@ s32 BossTw_BlastShieldCheck(BossTw* this, GlobalContext* globalCtx) { } else { if (sShieldFireCharge != 0) { sShieldFireCharge = 0; - 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 96394e4b4..baf083495 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,7 +3459,7 @@ void BossVa_UpdateEffects(GlobalContext* globalCtx) { } else if (effect->mode == GORE_FADING) { if (effect->timer == 0) { effect->type = VA_NONE; - } + } } else { Math_SmoothStepToF(&effect->scaleMod, 0.075f, 1.0f, 0.005f, 0.0f); @@ -3500,7 +3500,7 @@ void BossVa_UpdateEffects(GlobalContext* globalCtx) { } break; } - } + } } } } diff --git a/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 91cdec987..3fb579361 100644 --- a/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -727,8 +727,6 @@ void func_80968B70(Actor* thisx, GlobalContext* globalCtx) { u8 primColor[4]; u8 envColor[3]; - if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -777,8 +775,6 @@ void func_80968FB0(Actor* thisx, GlobalContext* globalCtx) { f32 scaleFactor; s32 pad; - if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); 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 307ebc1b2..00b8ede9e 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 @@ -1081,8 +1081,6 @@ void DemoEffect_UpdateLightEffect(DemoEffect* this, GlobalContext* globalCtx) { if (globalCtx->csCtx.frames == 640) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_WHITE_OUT); } - - if (0) {} } if (globalCtx->sceneNum == SCENE_SPOT08 && gSaveContext.sceneSetupIndex == 4) { @@ -1092,9 +1090,6 @@ void DemoEffect_UpdateLightEffect(DemoEffect* this, GlobalContext* globalCtx) { if (globalCtx->csCtx.frames == 648) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_WHITE_OUT); } - - // Necessary to match - if (0) {} } if (globalCtx->sceneNum == SCENE_TOKINOMA && gSaveContext.sceneSetupIndex == 14) { @@ -1671,7 +1666,6 @@ void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx2) { OPEN_DISPS(globalCtx->state.gfxCtx); if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { - if (1) {} if (!(this->effectFlags & 0x1)) { switch (this->jewel.type) { @@ -1865,7 +1859,6 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) { if (this->light.flicker == 0) { this->light.flicker = 1; } else { - disp = (uintptr_t)gEffFlash1DL; // necessary to match, should be able to remove after fake matches are fixed alpha = &this->light.alpha; func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, this->primXluColor[0], this->primXluColor[1], @@ -1878,7 +1871,6 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateZ(this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); - if (disp) {}; gSPDisplayList(POLY_XLU_DISP++, disp); Matrix_Pop(); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); diff --git a/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 00854c098..e6dbbde0e 100644 --- a/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -95,9 +95,6 @@ void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[objBankIndex].segment); gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[objBankIndex].segment); - // Necessary to match - if (!globalCtx) {} - CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index b2404ffb6..9a2e2c0db 100644 --- a/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -148,7 +148,6 @@ void DemoGj_SpawnSmoke(GlobalContext* globalCtx, Vec3f* pos, f32 arg2) { static Color_RGBA8 envColor = { 0, 0, 0, 0 }; f32 temp = arg2 * 0.2f; - if (1) {} func_800283D4(globalCtx, pos, &velocity, &accel, &primColor, &envColor, temp * Rand_ZeroOne() + arg2, 15, 90); } @@ -588,7 +587,6 @@ void DemoGj_SpawnSmokePreBattle1(DemoGj* this, GlobalContext* globalCtx) { if (!this->isTransformedIntoGanon) { gameplayFrames = globalCtx->gameplayFrames % 3; - if (1) {} if (gameplayFrames == 0) { if (!globalCtx->gameplayFrames) {} DemoGj_SpawnSmoke(globalCtx, &pos, 300.0f); @@ -653,7 +651,6 @@ void DemoGj_SpawnSmokePreBattle2(DemoGj* this, GlobalContext* globalCtx) { if (!this->isTransformedIntoGanon) { gameplayFrames = globalCtx->gameplayFrames % 3; - if (1) {} if (gameplayFrames == 1) { if (!globalCtx->gameplayFrames) {} DemoGj_SpawnSmoke(globalCtx, &pos, 300.0f); @@ -910,7 +907,6 @@ void DemoGj_SpawnSmokePreBattle3(DemoGj* this, GlobalContext* globalCtx) { if (!this->isTransformedIntoGanon) { gameplayFrames = globalCtx->gameplayFrames % 3; - if (1) {} if (gameplayFrames == 2) { if (!globalCtx->gameplayFrames) {} DemoGj_SpawnSmoke(globalCtx, &pos, 300.0f); diff --git a/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 369eb28ec..c1d66bf99 100644 --- a/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -63,8 +63,6 @@ void func_8097D7D8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velOffset, f32 s velocity.y += velOffset->y; velocity.z += velOffset->z; - if (0) {} - accel.x *= scale; accel.y *= scale; accel.z *= scale; diff --git a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 977d0d283..d863e1976 100644 --- a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -278,7 +278,6 @@ void DemoKekkai_DrawTrialBarrier(Actor* thisx, GlobalContext* globalCtx2) { s32 i; if (this->orbScale != 0.0f) { - if (1) {} alphas[2] = (s32)(this->energyAlpha * 202.0f); alphas[1] = (s32)(this->energyAlpha * 126.0f); alphas[0] = 0; diff --git a/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index afc952851..e3f15aa3a 100644 --- a/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -102,8 +102,6 @@ void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; u32 unk_14E = this->unk_14E; - if (1) {} // Necessary to match, can be anywhere in the function - OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); diff --git a/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 7d793f220..584ab281a 100644 --- a/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -300,8 +300,6 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) { initialPositions++; distanceTraveled++; - // Needed for matching. - if (0) {} } CLOSE_DISPS(gfxCtx); diff --git a/soh/src/overlays/actors/ovl_En_Am/z_en_am.c b/soh/src/overlays/actors/ovl_En_Am/z_en_am.c index 09b7def23..230ec7141 100644 --- a/soh/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/soh/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -954,7 +954,6 @@ void EnAm_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->iceTimer != 0) { this->dyna.actor.colorFilterTimer++; - if (1) {}; this->iceTimer--; if ((this->iceTimer % 4) == 0) { diff --git a/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 954af5154..6d785c12b 100644 --- a/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -180,8 +180,6 @@ void EnAnubiceFire_Update(Actor* thisx, GlobalContext* globalCtx) { func_8002D7EC(&this->actor); this->unk_160[0] = this->actor.world.pos; - if (1) {} - for (i = 4; i >= 0; i--) { this->unk_160[i + 1] = this->unk_160[i]; } 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 ebb99a7d3..6f85d0695 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,7 +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. - 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/z_en_bom.c b/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 946d66506..631a79dda 100644 --- a/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -360,8 +360,6 @@ void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnBom* this = (EnBom*)thisx; - if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx); if (thisx->params == BOMB_BODY) { 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 f0fa6bc58..6ec326365 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,7 +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) { - 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); @@ -481,8 +481,6 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnBombf* this = (EnBombf*)thisx; - if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx); if (thisx->params <= BOMBFLOWER_BODY) { diff --git a/soh/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/soh/src/overlays/actors/ovl_En_Changer/z_en_changer.c index 3f306c64e..c729fcc76 100644 --- a/soh/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/soh/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -78,8 +78,6 @@ void EnChanger_Init(Actor* thisx, GlobalContext* globalCtx2) { s16 new_var; s32 rewardParams; - if (1) {} - minigameRoomNum = globalCtx->roomCtx.curRoom.num - 1; if (minigameRoomNum < 0) { minigameRoomNum = 0; diff --git a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 5185adfc2..86ecaf22b 100644 --- a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -454,13 +454,10 @@ void EnDaiku_InitSubCamera(EnDaiku* this, GlobalContext* globalCtx) { this->subCamEyeInit.x = this->subCamEye.x = this->actor.world.pos.x + eyePosDeltaWorld.x; this->subCamEyeInit.y = this->subCamEye.y = this->actor.world.pos.y + eyePosDeltaWorld.y; - if (1) {} this->subCamEyeInit.z = this->subCamEye.z = this->actor.world.pos.z + eyePosDeltaWorld.z; - if (1) {} this->subCamAtTarget.x = this->subCamAt.x = this->actor.world.pos.x; this->subCamAtTarget.y = this->subCamAt.y = this->actor.world.pos.y + 60.0f; - if (1) {} this->subCamAtTarget.z = this->subCamAt.z = this->actor.world.pos.z; this->subCamId = Gameplay_CreateSubCamera(globalCtx); diff --git a/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index e0897f561..b6e78a48f 100644 --- a/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -1278,7 +1278,6 @@ void EnDekubaba_Draw(Actor* thisx, GlobalContext* globalCtx) { EnDekubaba* this = (EnDekubaba*)thisx; f32 scale; - if (1) {} OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); diff --git a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 837fcfd64..fb26c86b6 100644 --- a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -498,8 +498,6 @@ void EnDivingGame_Update(Actor* thisx, GlobalContext* globalCtx2) { this->spawnRuppyTimer--; } - if (1) {} - if (gSaveContext.timer1Value == 10) { func_800F5918(); } diff --git a/soh/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/soh/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 88a2be0dd..2a6c0396d 100644 --- a/soh/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/soh/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -924,7 +924,6 @@ void EnDodongo_Draw(Actor* thisx, GlobalContext* globalCtx2) { if (this->iceTimer != 0) { this->actor.colorFilterTimer++; - if (1) {} this->iceTimer--; if ((this->iceTimer % 4) == 0) { index = this->iceTimer >> 2; 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 b48d83ad9..6d2887e15 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,7 +282,7 @@ void EnExRuppy_WaitInGame(EnExRuppy* this, GlobalContext* globalCtx) { if (divingGame->phase == ENDIVINGGAME_PHASE_ENDED) { this->timer = 20; this->actionFunc = EnExRuppy_Kill; - } 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 81874f14a..651d1e1f8 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 @@ -773,7 +773,6 @@ void EnFd_Draw(Actor* thisx, GlobalContext* globalCtx) { EnFd_DrawFlames(this, globalCtx); Matrix_Pop(); if (this->actionFunc != EnFd_Reappear && !(this->fadeAlpha < 0.9f)) { - if (1) {} func_80093D84(globalCtx->state.gfxCtx); clampedHealth = CLAMP(thisx->colChkInfo.health - 1, 0, 23); gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, primColors[clampedHealth / 8].r, primColors[clampedHealth / 8].g, @@ -884,7 +883,6 @@ void EnFd_DrawFlames(EnFd* this, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx); firstDone = false; - if (1) {} func_80093D84(globalCtx->state.gfxCtx); for (i = 0; i < ARRAY_COUNT(this->effects); i++, eff++) { if (eff->type == FD_EFFECT_FLAME) { diff --git a/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index ebb9b6f77..324cda3c9 100644 --- a/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -254,9 +254,6 @@ void EnFdFire_Draw(Actor* thisx, GlobalContext* globalCtx) { sp84 = fabsf(Math_CosS(sp8E)); sp88 = Math_SinS(sp8E); sp80 = Math_Vec3f_DistXZ(&scale, &this->actor.velocity) / 1.5f; - if (1) {} - if (1) {} - if (1) {} Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) + 0x8000) * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_RotateZ(((sp88 * -10.0f) * sp80) * (M_PI / 180.0f), MTXMODE_APPLY); scale.x = scale.y = scale.z = this->scale * 0.001f; diff --git a/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 8ed8cb4fb..176fd1013 100644 --- a/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -150,7 +150,6 @@ void EnFirefly_Init(Actor* thisx, GlobalContext* globalCtx) { if ((this->actor.params & 0x8000) != 0) { this->actor.flags |= ACTOR_FLAG_7; - if (1) {} this->actor.draw = EnFirefly_DrawInvisible; this->actor.params &= 0x7FFF; } diff --git a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 676857a58..8685a4958 100644 --- a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -819,7 +819,6 @@ s32 EnFr_IsFrogSongComplete(EnFr* this, GlobalContext* globalCtx) { if (this->ocarinaNote == (*msgCtx).lastOcaNoteIdx) { // required to match, possibly an array? this->ocarinaNoteIndex++; ocarinaNoteIndex = this->ocarinaNoteIndex; - if (1) {} if (ocarinaNoteIndex >= 14) { // Frog Song is completed this->ocarinaNoteIndex = 13; return true; diff --git a/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c index f45dd9ce1..49e8ebac2 100644 --- a/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -462,7 +462,6 @@ void EnFw_DrawDust(EnFw* this, GlobalContext* globalCtx) { firstDone = false; func_80093D84(globalCtx->state.gfxCtx); - if (1) {} for (i = 0; i < ARRAY_COUNT(this->effects); i++, eff++) { if (eff->type != 0) { diff --git a/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 14d79380f..989ece0ce 100644 --- a/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -719,8 +719,6 @@ void EnFz_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx); - if (1) {} - if (this->actor.colChkInfo.health == 0) { index = 2; } diff --git a/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 892c3789c..e7b3cdc7f 100644 --- a/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -472,7 +472,6 @@ void EnGSwitch_DrawRupee(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnGSwitch* this = (EnGSwitch*)thisx; - if (1) {} if (!this->broken) { OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); 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 d0edf6a46..c7c37b9de 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,7 +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; - 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_Ganon_Organ/z_en_ganon_organ.c b/soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index 9842c6659..4bafd8518 100644 --- a/soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -66,8 +66,6 @@ Gfx* func_80A280BC(GraphicsContext* gfxCtx, BossGanon* dorf) { displayList = Graph_Alloc(gfxCtx, 4 * sizeof(Gfx)); displayListHead = displayList; gDPPipeSync(displayListHead++); - if (1) {} - if (1) {} gDPSetEnvColor(displayListHead++, 25, 20, 0, dorf->organAlpha); gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2); gSPEndDisplayList(displayListHead); @@ -82,8 +80,6 @@ Gfx* func_80A28148(GraphicsContext* gfxCtx, BossGanon* dorf) { displayListHead = displayList; gDPPipeSync(displayListHead++); - if (1) {} - if (1) {} gDPSetEnvColor(displayListHead++, 0, 0, 0, dorf->organAlpha); gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2); gSPEndDisplayList(displayListHead); diff --git a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 262eb9386..2fab87aff 100644 --- a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -1552,7 +1552,6 @@ void EnGeldB_Draw(Actor* thisx, GlobalContext* globalCtx) { EnGeldB* this = (EnGeldB*)thisx; OPEN_DISPS(globalCtx->state.gfxCtx); - if (1) {} if ((this->spinAttackState >= 2) && SkelAnime_Update(&this->skelAnime)) { if (this->spinAttackState == 2) { 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 371c9de0f..0b4dbf095 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 @@ -1208,7 +1208,6 @@ void EnGo_DrawDust(EnGo* this, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx); firstDone = false; func_80093D84(globalCtx->state.gfxCtx); - if (1) {} for (i = 0; i < ARRAY_COUNT(this->dustEffects); i++, dustEffect++) { if (dustEffect->type) { if (!firstDone) { 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 68c6fe91a..f88e48ab9 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 @@ -226,7 +226,6 @@ void EnGo2_DrawDust(EnGo2* this, GlobalContext* globalCtx) { firstDone = false; func_80093D84(globalCtx->state.gfxCtx); - if (1) {} for (i = 0; i < ARRAY_COUNT(this->dustEffects); i++, dustEffect++) { if (dustEffect->type) { @@ -2047,7 +2046,6 @@ void EnGo2_Draw(Actor* thisx, GlobalContext* globalCtx) { if ((this->actionFunc == EnGo2_CurledUp) && (this->skelAnime.playSpeed == 0.0f) && (this->skelAnime.curFrame == 0.0f)) { - if (1) {} EnGo2_DrawCurledUp(this, globalCtx); } else if (this->actionFunc == EnGo2_SlowRolling || this->actionFunc == EnGo2_ReverseRolling || this->actionFunc == EnGo2_ContinueRolling) { diff --git a/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 18d1ada24..978450222 100644 --- a/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -375,7 +375,6 @@ s32 EnGoroiwa_MoveDownToNextWaypoint(EnGoroiwa* this, GlobalContext* globalCtx) this->actor.world.pos.x = nextPointPos->x; this->actor.world.pos.z = nextPointPos->z; thisY = this->actor.world.pos.y; - if (1) {} this->actor.world.pos.y += this->actor.velocity.y; if (this->actor.velocity.y < 0.0f && this->actor.world.pos.y <= nextPointY) { if (this->bounceCount == 0) { diff --git a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 0d3910553..af3bad5c5 100644 --- a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -1101,8 +1101,6 @@ s32 EnHy_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, u8 i; UNK_PTR ptr; - if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 15) { diff --git a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 35faa3f25..03e9467a8 100644 --- a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -688,8 +688,6 @@ void func_80A75C38(EnIk* this, GlobalContext* globalCtx) { this->unk_2FD = temp_v0_3 & 0xFF; this->bodyCollider.base.acFlags &= ~AC_HIT; - if (1) {} - if ((this->unk_2FD == 0) || (this->unk_2FD == 0xD) || ((this->unk_2FB == 0) && (this->unk_2FD == 0xE))) { if (this->unk_2FD != 0) { CollisionCheck_SpawnShieldParticlesMetal(globalCtx, &sp38); diff --git a/soh/src/overlays/actors/ovl_En_In/z_en_in.c b/soh/src/overlays/actors/ovl_En_In/z_en_in.c index e7d13846b..0953c736e 100644 --- a/soh/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/soh/src/overlays/actors/ovl_En_In/z_en_in.c @@ -890,7 +890,6 @@ void func_80A7B024(EnIn* this, GlobalContext* globalCtx) { } player->actor.freezeTimer = 10; if (this->unk_308.unk_00 == 2) { - if (1) {} if (!(gSaveContext.eventChkInf[1] & 0x800) && (gSaveContext.infTable[10] & 0x800)) { gSaveContext.eventChkInf[1] |= 0x800; gSaveContext.infTable[10] |= 0x800; diff --git a/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 22846ffc5..e4e9cd8b6 100644 --- a/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -284,7 +284,6 @@ void EnKarebaba_Spin(EnKarebaba* this, GlobalContext* globalCtx) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 12.0f)) { - if (1) {} // Here for matching purposes only. Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEKU_JR_MOUTH); } diff --git a/soh/src/overlays/actors/ovl_En_Light/z_en_light.c b/soh/src/overlays/actors/ovl_En_Light/z_en_light.c index 3c6fea4bd..e581b9e99 100644 --- a/soh/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/soh/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -156,8 +156,6 @@ void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx) { FlameParams* flameParams; Gfx* dList; - if (1) {} - flameParams = &D_80A9E840[this->actor.params & 0xF]; OPEN_DISPS(globalCtx->state.gfxCtx); diff --git a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 58a70b673..c42020435 100644 --- a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -875,7 +875,6 @@ void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) { EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 153, 72, 72, 8, 1024, 1024); EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 151, 126, 96, 8, 1024, 1024); - if (1) {} } func_8009457C(&gfx); diff --git a/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 15a017fb9..0517fdaf4 100644 --- a/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -515,8 +515,6 @@ void EnMm_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnMm* this = (EnMm*)thisx; - if (0) {} - OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); 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 551db44d4..8b57a3740 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,7 +218,7 @@ void func_80AAF3C0(EnMm2* this, GlobalContext* globalCtx) { break; }; if (this->unk_1F4 & 4) { - 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 bba33e98a..6b5547e5a 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 @@ -886,10 +886,6 @@ void EnNiw_Update(Actor* thisx, GlobalContext* globalCtx) { f32 camResult; s32 pad3[10]; - if (1) {} // Required to match - if (1) {} - if (1) {} - this->unk_294++; if (this->actionFunc != func_80AB6570) { diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 99c55e639..3f7eaa3e3 100644 --- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -449,7 +449,6 @@ void EnOssan_UpdateShopOfferings(EnOssan* this, GlobalContext* globalCtx) { if (this->actor.params == OSSAN_TYPE_MASK) { storeItems = sShopkeeperStores[this->actor.params]; - if (1) {} for (i = 0; i < 8; i++) { shopItem = &storeItems[i]; if (shopItem->shopItemIndex >= 0 && this->shelfSlots[i] == NULL) { @@ -930,8 +929,6 @@ void EnOssan_State_StartConversation(EnOssan* this, GlobalContext* globalCtx, Pl EnOssan_StartShopping(globalCtx, this); } } - - if (1) {} } s32 EnOssan_FacingShopkeeperDialogResult(EnOssan* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 44cbdd957..d11ea451d 100644 --- a/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -389,7 +389,6 @@ void EnPoRelay_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, this->lightColor.r, this->lightColor.g, this->lightColor.b, 128); gSPDisplayList(POLY_OPA_DISP++, gDampeLanternDL); - if (1) {} CLOSE_DISPS(globalCtx->state.gfxCtx); Matrix_MultVec3f(&D_80AD8D48, &vec); Lights_PointNoGlowSetInfo(&this->lightInfo, vec.x, vec.y, vec.z, this->lightColor.r, this->lightColor.g, diff --git a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 9f9ff6dfe..56eb72ecb 100644 --- a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -195,7 +195,6 @@ void EnPoSisters_Init(Actor* thisx, GlobalContext* globalCtx) { CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); this->unk_194 = (thisx->params >> 8) & 3; this->actor.naviEnemyId = this->unk_194 + 0x50; - if (1) {} this->unk_195 = (thisx->params >> 0xA) & 3; this->unk_196 = 32; this->unk_197 = 20; diff --git a/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c index fd9e623bd..51e24fb1f 100644 --- a/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -846,7 +846,6 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx) { Mtx* segMtx = Graph_Alloc(globalCtx->state.gfxCtx, 4 * sizeof(Mtx)); OPEN_DISPS(globalCtx->state.gfxCtx); - if (1) {} func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x0C, segMtx); gSPSegment(POLY_XLU_DISP++, 0x08, diff --git a/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index 1979e3ffc..2ecad648b 100644 --- a/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -292,7 +292,6 @@ void EnShopnuts_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis } Matrix_Scale(x, y, z, MTXMODE_APPLY); - if (1) {} gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBusinessScrubNoseDL); diff --git a/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 4a7236508..956b13b94 100644 --- a/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -164,7 +164,6 @@ void EnSkb_Init(Actor* thisx, GlobalContext* globalCtx) { paramOffsetBody = this->actor.params + 0xA; this->collider.elements[0].dim.worldSphere.radius = paramOffsetBody; this->collider.elements[0].dim.modelSphere.radius = paramOffsetBody; - if (1) {}; paramOffsetArm = (this->actor.params * 2) + 0x14; this->collider.elements[1].dim.worldSphere.radius = paramOffsetArm; this->collider.elements[1].dim.modelSphere.radius = paramOffsetArm; diff --git a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c index dc38147d7..9e6c02f33 100644 --- a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -827,7 +827,6 @@ void EnSkj_Fight(EnSkj* this, GlobalContext* globalCtx) { Matrix_MultVec3f(&pos1, &pos2); prevPosX = this->actor.world.pos.x; prevPosZ = this->actor.world.pos.z; - if (1) {} this->actor.world.pos.x = this->center.x + pos2.x; this->actor.world.pos.z = this->center.z + pos2.z; diff --git a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 09677fa9c..222cf1cfc 100644 --- a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -662,7 +662,6 @@ void EnSsh_Talk(EnSsh* this, GlobalContext* globalCtx) { } void EnSsh_Idle(EnSsh* this, GlobalContext* globalCtx) { - if (1) {} if (Actor_ProcessTalkRequest(&this->actor, globalCtx)) { this->actionFunc = EnSsh_Talk; if (this->actor.params == ENSSH_FATHER) { diff --git a/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c index e3d3cad6b..51a512855 100644 --- a/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -183,7 +183,6 @@ s32 func_80B0C0CC(EnSw* this, GlobalContext* globalCtx, s32 arg2) { if (phi_s1 == 0) { sp78.x = sp84.x - (this->unk_37C.x * 24.0f); sp78.y = sp84.y - (this->unk_37C.y * 24.0f); - if (0) {} sp78.z = sp84.z - (this->unk_37C.z * 24.0f); } else if (phi_s1 == 1) { sp78.x = sp84.x + (this->unk_370.x * 24.0f); @@ -730,7 +729,6 @@ s32 func_80B0DFFC(EnSw* this, GlobalContext* globalCtx) { } else if (((globalCtx->state.frames % 4) == 2) && !BgCheck_EntityLineTest1(&globalCtx->colCtx, &this->actor.world.pos, &this->unk_46C, &sp50, &sp60, true, false, false, true, &sp5C)) { - if (0) {} sp4C = false; } else if (((globalCtx->state.frames % 4) == 3) && BgCheck_EntityLineTest1(&globalCtx->colCtx, &this->actor.world.pos, &this->unk_478, &sp50, &sp60, true, 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 c238c74ae..160394e62 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,7 +143,7 @@ void EnSyatekiItm_StartRound(EnSyatekiItm* this, GlobalContext* globalCtx) { i = Rand_ZeroFloat(5.99f); while (this->roundFlags[i]) { i = Rand_ZeroFloat(5.99f); - } + } this->roundNum = i + 1; this->roundFlags[i] = true; } else { diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 24dee1b16..a876b1c7b 100644 --- a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -288,7 +288,6 @@ void EnSyatekiMan_WaitForGame(EnSyatekiMan* this, GlobalContext* globalCtx) { EnSyatekiItm* gallery; SkelAnime_Update(&this->skelAnime); - if (1) {} gallery = ((EnSyatekiItm*)this->actor.parent); if ((gallery->actor.update != NULL) && (gallery->signal == ENSYATEKI_END)) { this->csCam = OnePointCutscene_Init(globalCtx, 8002, -99, &this->actor, MAIN_CAM); diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 43a01212d..7fc4dda07 100644 --- a/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -582,10 +582,6 @@ void EnSyatekiNiw_Update(Actor* thisx, GlobalContext* globalCtx) { Vec3f sp6C; Vec3f sp60; - if (1) {} - if (1) {} - if (1) {} - func_80B132A8(this, globalCtx); this->unk_28C++; if (this->unk_254 != 0) { diff --git a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c index eb8e06f26..059432b85 100644 --- a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -98,8 +98,6 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - if (1) {} - for (i = 0; i < ARRAY_COUNT(this->eff); i++) { if (eff->active != 0) { if (gfxSetup == 0) { diff --git a/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c index e347e6e60..33e337341 100644 --- a/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -430,8 +430,6 @@ void EnTr_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnTr* this = (EnTr*)thisx; - if (1) {} - if ((globalCtx->csCtx.state == CS_STATE_IDLE) || (globalCtx->csCtx.npcActions[this->actionIndex] == 0)) { this->actor.shape.shadowDraw = NULL; } else { diff --git a/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index 22b1a1983..e77eb97be 100644 --- a/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -303,7 +303,6 @@ void EnVbBall_Draw(Actor* thisx, GlobalContext* globalCtx) { EnVbBall* this = (EnVbBall*)thisx; OPEN_DISPS(globalCtx->state.gfxCtx); - if (1) {} // needed for match func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 074d51155..e03b18230 100644 --- a/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -866,7 +866,6 @@ void EnViewer_UpdateGanondorfCape(GlobalContext* globalCtx, EnViewer* this) { Vec3f forearmWorldOffset; if ((this->actor.params >> 8) == ENVIEWER_TYPE_5_GANONDORF) { - if (1) {} sGanondorfCape->backPush = BREG(54) / 10.0f; sGanondorfCape->backSwayMagnitude = (BREG(60) + 25) / 100.0f; sGanondorfCape->sideSwayMagnitude = (BREG(55) - 45) / 10.0f; 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 ec4fc6715..2753376ce 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 @@ -2233,7 +2233,6 @@ static Gfx D_80B4A2F8[] = { void EnZf_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnZf* this = (EnZf*)thisx; - ; // Extra ";" required for matching. Cannot be if (1) {} or the like. Typo? OPEN_DISPS(globalCtx->state.gfxCtx); diff --git a/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index ee2af34de..9a770029a 100644 --- a/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -188,7 +188,6 @@ void func_80B4B010(EnZl1* this, GlobalContext* globalCtx) { this->actionFunc = func_80B4B240; Audio_PlayFanfare(NA_BGM_APPEAR); } else { - if (1) {} // necessary to match rotDiff = ABS(this->actor.yawTowardsPlayer - this->actor.shape.rot.y); if ((rotDiff < 0x238E) && !(player->actor.world.pos.y < this->actor.world.pos.y)) { func_8002F2F4(&this->actor, globalCtx); diff --git a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 5943d09e8..d7e6303ee 100644 --- a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -255,7 +255,6 @@ void func_80B53980(EnZl3* thisx, s16 y, s32 idx) { curFrame = skelAnime->curFrame; unk_3DC = this->unk_3DC; yTemp = (s32)((curFrame / unk_3DC) * -11000) + y; - if (0) {}; if (temp28C >= yTemp) { temp28C = yTemp; if (temp25C > 0) { @@ -835,8 +834,6 @@ void func_80B550F0(EnZl3* this) { void func_80B55144(EnZl3* this) { f32* fl = &D_80B5A484; - if (1) {} // necessary to match - if (*fl < 2.0f) { *fl += 1.0f; EnZl3_setEyeIndex(this, 2); 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 5be38f8bc..3e463ce20 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 @@ -59,7 +59,6 @@ void EnZo_Bubble(EnZo* this, Vec3f* pos) { effect = this->effects; for (i = 0; i < ARRAY_COUNT(this->effects); i++) { - if (1) {} if (effect->type == ENZO_EFFECT_NONE) { waterSurface = this->actor.world.pos.y + this->actor.yDistToWater; if (!(waterSurface <= pos->y)) { @@ -83,7 +82,6 @@ void EnZo_Splash(EnZo* this, Vec3f* pos, Vec3f* vel, f32 scale) { effect = this->effects; for (i = 0; i < ARRAY_COUNT(this->effects); i++) { - if (1) {} if (effect->type != ENZO_EFFECT_SPLASH) { effect->type = ENZO_EFFECT_SPLASH; effect->pos = *pos; @@ -187,7 +185,7 @@ void EnZo_DrawRipples(EnZo* this, GlobalContext* globalCtx) { if (effect->type == ENZO_EFFECT_RIPPLE) { FrameInterpolation_RecordOpenChild(effect, effect->epoch); if (!setup) { - gDPPipeSync(POLY_XLU_DISP++); + gDPPipeSync(POLY_XLU_DISP++); gSPDisplayList(POLY_XLU_DISP++, gZoraRipplesMaterialDL); gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0); setup = true; @@ -218,7 +216,7 @@ void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) { if (effect->type == ENZO_EFFECT_BUBBLE) { FrameInterpolation_RecordOpenChild(effect, effect->epoch); if (!setup) { - 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); @@ -253,7 +251,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) { if (effect->type == ENZO_EFFECT_SPLASH) { FrameInterpolation_RecordOpenChild(effect, effect->epoch); if (!setup) { - 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 9dfbb8883..c065bb156 100644 --- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -2682,9 +2682,6 @@ s32 func_80B70A2C(Fishing* this, GlobalContext* globalCtx, u8 ignorePosCheck) { return false; } - // Necessary to match - if (this->unk_1AC) {} - if (this->unk_1AC >= 40.0f) { count = 40; scale = 1.2f; @@ -2729,9 +2726,6 @@ void func_80B70CF0(Fishing* this, GlobalContext* globalCtx) { f32 speedXZ; f32 angle; - // Necessary to match - if (this->unk_1AC) {} - if (this->unk_1AC >= 45.0f) { count = 30; scale = 0.5f; @@ -4088,8 +4082,6 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) { this->actor.world.pos.y += (this->unk_184 * 1.5f); - if (1) {} - if (this->unk_152 != 0) { this->unk_168 = this->unk_154; this->unk_152--; @@ -4719,8 +4711,6 @@ void Fishing_DrawGroupFishes(GlobalContext* globalCtx) { scale = 0.00475f; } - if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx); for (i = 0; i < GROUP_FISH_COUNT; i++) { @@ -5653,8 +5643,6 @@ void Fishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) { if (target < 0.0f) { target = 0.0f; } - if (1) {} - if (1) {} Math_ApproachF(&D_80B7A65C.z, target, 1.0f, 5.0f); if (D_80B7A65C.z < 1500.0f) { diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index 1e428bdaa..e9d02cb77 100644 --- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -137,7 +137,6 @@ void func_80B858B4(ItemEtcetera* this, GlobalContext* globalCtx) { } Actor_Kill(&this->actor); } else { - if (0) {} // Necessary to match func_8002F434(&this->actor, globalCtx, this->getItemId, 30.0f, 50.0f); if ((globalCtx->gameplayFrames & 0xD) == 0) { EffectSsBubble_Spawn(globalCtx, &this->actor.world.pos, 0.0f, 0.0f, 10.0f, 0.13f); diff --git a/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index 4b070b7b7..e82dbfce0 100644 --- a/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -77,8 +77,6 @@ void MagicDark_DiamondUpdate(Actor* thisx, GlobalContext* globalCtx) { s16 nayrusLoveTimer = gSaveContext.nayrusLoveTimer; s32 msgMode = globalCtx->msgCtx.msgMode; - if (1) {} - if ((msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK) || (msgMode == MSGMODE_SONG_PLAYED)) { Actor_Kill(thisx); return; diff --git a/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index 687fa9399..81df2ade4 100644 --- a/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -119,7 +119,6 @@ void MagicFire_Update(Actor* thisx, GlobalContext* globalCtx) { Player* player = GET_PLAYER(globalCtx); s32 pad; - if (1) {} this->actor.world.pos = player->actor.world.pos; if ((globalCtx->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK) || (globalCtx->msgCtx.msgMode == MSGMODE_SONG_PLAYED)) { 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 682381b7e..938661fe5 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 @@ -545,7 +545,6 @@ s32 MirRay_CheckInFrustum(Vec3f* vecA, Vec3f* vecB, f32 pointx, f32 pointy, f32 vecdiff.x = vecB->x - vecA->x; vecdiff.y = vecB->y - vecA->y; vecdiff.z = vecB->z - vecA->z; - if (1) {} dist = SQ(vecdiff.x) + SQ(vecdiff.y) + SQ(vecdiff.z); if (dist == 0.0f) { @@ -566,7 +565,6 @@ s32 MirRay_CheckInFrustum(Vec3f* vecA, Vec3f* vecB, f32 pointx, f32 pointy, f32 // If the Point is within the bounding double cone, check if it is in the frustum by checking whether it is between // the bounding planes if ((SQ(closestPtx - pointx) + SQ(closestPty - pointy) + SQ(closestPtz - pointz)) <= SQ(coneRadius)) { - if (1) {} // Stores the vector difference again Math_Vec3f_Diff(vecB, vecA, &sp5C); diff --git a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index fc6506dfd..4efaab072 100644 --- a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -754,8 +754,6 @@ void ObjSwitch_DrawCrystal(ObjSwitch* this, GlobalContext* globalCtx) { subType = (this->dyna.actor.params >> 4 & 7); func_8002ED80(&this->dyna.actor, globalCtx, 0); - if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); diff --git a/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index 2bbe4e0cb..2612bc2ee 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -131,8 +131,6 @@ void OceffStorm_Draw2(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); - if (1) {} - POLY_XLU_DISP = func_80093F34(POLY_XLU_DISP); gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE); gDPSetColorDither(POLY_XLU_DISP++, G_CD_NOISE); diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index dce9fe5a5..58950a1cc 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -6878,8 +6878,6 @@ void func_8084029C(Player* this, f32 arg1) { arg1 = 7.25f; } - if (1) {} - if ((this->currentBoots == PLAYER_BOOTS_HOVER) && !(this->actor.bgCheckFlags & 1) && (this->hoverBootsTimer != 0)) { func_8002F8F0(&this->actor, NA_SE_PL_HOBBERBOOTS_LV - SFX_FLAG); } diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/soh/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index 8da0061ef..a3c764d83 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -52,8 +52,6 @@ void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { f32 scale; s16 color; - if (1) {} - OPEN_DISPS(gfxCtx); scale = this->rScale / 100.0f; diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/soh/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index b97201735..24d6d4fc6 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -93,9 +93,6 @@ void EffectSsBomb2_DrawFade(GlobalContext* globalCtx, u32 index, EffectSs* this) gSPDisplayList(POLY_XLU_DISP++, this->gfx); } - if (1) {} - if (1) {} - CLOSE_DISPS(gfxCtx); } @@ -158,9 +155,6 @@ void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* th } } - if (1) {} - if (1) {} - CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/soh/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index 0a2bc0bfa..6fb930a2f 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -100,9 +100,6 @@ void EffectSsGSpk_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPDisplayList(POLY_XLU_DISP++, this->gfx); } - if (1) {} - if (1) {} - CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index 9551d4c88..e94928f8d 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -66,8 +66,6 @@ void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 255, 0); } - if (1) {} - gDPPipeSync(POLY_XLU_DISP++); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 9d47fc324..5b4d14d40 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -753,8 +753,6 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) { s16 j; s16 deathCountSplit[3]; - if (1) {} - OPEN_DISPS(this->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); @@ -1514,8 +1512,6 @@ void FileChoose_LoadGame(GameState* thisx) { gSaveContext.magic = 0; gSaveContext.magicLevel = gSaveContext.magic; - if (1) {} - osSyncPrintf(VT_FGCOL(GREEN)); osSyncPrintf("Z_MAGIC_NOW_NOW=%d MAGIC_NOW=%d\n", ((void)0, gSaveContext.unk_13F6), gSaveContext.magic); osSyncPrintf(VT_RST); diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c index 7581d465f..d57086b94 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c @@ -115,9 +115,6 @@ void FileChoose_SetNameEntryVtx(GameState* thisx) { s16 phi_v0; char* filename = Save_GetSaveMetaInfo(this->buttonIndex)->playerName; - if (1) {} - if (1) {} - OPEN_DISPS(this->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++);