mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

" if (1) {} " & "if (0) {}" and tab/white place

This commit is contained in:
Baoulettes 2022-06-28 00:00:16 +02:00
parent d627ec320d
commit cd0cea28fb
140 changed files with 29 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/src/boot/z_std_dma.c
View File

@ -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;

5
soh/src/code/audio_load.c
View File

@ -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);
}

4
soh/src/code/audio_synthesis.c
View File

@ -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);
}

1
soh/src/code/code_800A9F30.c
View File

@ -60,7 +60,6 @@ void func_800AA0B4(void) {
gPadMgr.retraceCallback = func_800A9F30;
gPadMgr.retraceCallbackValue = 0;
if (1) {}
}
void func_800AA0F0(void) {

1
soh/src/code/code_800E4FE0.c
View File

@ -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;

3
soh/src/code/code_800EC960.c
View File

@ -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;
}

2
soh/src/code/db_camera.c
View File

@ -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 '?':

3
soh/src/code/fault.c
View File

@ -577,9 +577,6 @@ void Fault_WaitForButtonCombo()
u32 kDown;
u32 kCur;
if (1) {}
if (1) {}
osSyncPrintf(
VT_FGCOL(WHITE) "KeyWaitB (ＬＲＺ " 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) "Ｂ" VT_FGCOL(BLUE) "Ａ" VT_FGCOL(RED) "START" VT_FGCOL(WHITE) ")" VT_RST

4
soh/src/code/game.c
View File

@ -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);
}

4
soh/src/code/graph.c
View File

@ -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);

2
soh/src/code/padmgr.c
View File

@ -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;

2
soh/src/code/sys_matrix.c
View File

@ -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;

4
soh/src/code/ucode_disas.c
View File

@ -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 {

4
soh/src/code/z_actor.c
View File

@ -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;
}

1
soh/src/code/z_bgcheck.c
View File

@ -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;

5
soh/src/code/z_camera.c
View File

@ -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)) {

2
soh/src/code/z_debug.c
View File

@ -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);

3
soh/src/code/z_demo.c
View File

@ -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);

6
soh/src/code/z_eff_blure.c
View File

@ -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;

8
soh/src/code/z_eff_ss_dead.c
View File

@ -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);
}

3
soh/src/code/z_effect.c
View File

@ -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);
}
}

1
soh/src/code/z_en_a_keep.c
View File

@ -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;
}

4
soh/src/code/z_lights.c
View File

@ -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;

3
soh/src/code/z_message_PAL.c
View File

@ -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);

2
soh/src/code/z_parameter.c
View File

@ -998,7 +998,7 @@ void func_80083108(GlobalContext* globalCtx) {
gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0];
}
}
}
}
if (sp28) {
Interface_LoadItemIcon1(globalCtx, 0);

1
soh/src/code/z_play.c
View File

@ -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;
}

4
soh/src/code/z_player_lib.c
View File

@ -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);

1
soh/src/code/z_room.c
View File

@ -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);

4
soh/src/code/z_scene.c
View File

@ -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;

17
soh/src/code/z_scene_table.c
View File

@ -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;

4
soh/src/code/z_skelanime.c
View File

@ -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);
}

6
soh/src/code/z_skin_matrix.c
View File

@ -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);

2
soh/src/libultra/io/contpfs.c
View File

@ -202,8 +202,6 @@ s32 __osGetId(OSPfs* pfs) {
bcopy(id, pfs->id, BLOCKSIZE);
if (0) {}
pfs->version = id->version;
pfs->banks = id->banks;

2
soh/src/libultra/io/pfsinitpak.c
View File

@ -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);

1
soh/src/libultra/os/settimer.c
View File

@ -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();

4
soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
View File

@ -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);

5
soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View File

@ -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);

5
soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View File

@ -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);

1
soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c
View File

@ -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);

1
soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
View File

@ -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);
}
}

1
soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c
View File

@ -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);
}
}

2
soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
View File

@ -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);

2
soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
View File

@ -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,

1
soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
View File

@ -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,

2
soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
View File

@ -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),

2
soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
View File

@ -309,7 +309,7 @@ void BgJyaCobra_UpdateShadowFromSide(BgJyaCobra* this) {
if (!(temp_x & ~0x3F)) {
temp_s2[temp_z + temp_x] |= D_8089731C[k][l];
}
}
}
}
}
}

1
soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
View File

@ -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);

2
soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
View File

@ -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;

4
soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
View File

@ -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;

1
soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
View File

@ -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),

1
soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
View File

@ -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));

2
soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
View File

@ -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;

2
soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c
View File

@ -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) {

2
soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c
View File

@ -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);
}

3
soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c
View File

@ -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);
}

2
soh/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c
View File

@ -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;

3
soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
View File

@ -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);

1
soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
View File

@ -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);

4
soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
View File

@ -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);

1
soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View File

@ -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);

2
soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
View File

@ -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;

6
soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View File

@ -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);

1
soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
View File

@ -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) {

10
soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View File

@ -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++;

4
soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
View File

@ -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;
}
}
}
}
}
}

4
soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
View File

@ -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);

8
soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View File

@ -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);

3
soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
View File

@ -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);
}

4
soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
View File

@ -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);

2
soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
View File

@ -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;

1
soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
View File

@ -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;

2
soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
View File

@ -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);

2
soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
View File

@ -300,8 +300,6 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) {
initialPositions++;
distanceTraveled++;
// Needed for matching.
if (0) {}
}
CLOSE_DISPS(gfxCtx);

1
soh/src/overlays/actors/ovl_En_Am/z_en_am.c
View File

@ -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) {

2
soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
View File

@ -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];
}

2
soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c
View File

@ -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;

2
soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c
View File

@ -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) {

4
soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
View File

@ -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) {

2
soh/src/overlays/actors/ovl_En_Changer/z_en_changer.c
View File

@ -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;

3
soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
View File

@ -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);

1
soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
View File

@ -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);

2
soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
View File

@ -498,8 +498,6 @@ void EnDivingGame_Update(Actor* thisx, GlobalContext* globalCtx2) {
this->spawnRuppyTimer--;
}
if (1) {}
if (gSaveContext.timer1Value == 10) {
func_800F5918();
}

1
soh/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
View File

@ -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;

2
soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
View File

@ -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++;

2
soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c
View File

@ -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) {

3
soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
View File

@ -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;

1
soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
View File

@ -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;
}

1
soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
View File

@ -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;

1
soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c
View File

@ -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) {

2
soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c
View File

@ -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;
}

1
soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
View File

@ -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);

2
soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c
View File

@ -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;

4
soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
View File

@ -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);

1
soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
View File

@ -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) {

1
soh/src/overlays/actors/ovl_En_Go/z_en_go.c
View File

@ -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) {

2
soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
View File

@ -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) {

1
soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
View File

@ -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) {

2
soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
View File

@ -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) {

2
soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
View File

@ -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);

1
soh/src/overlays/actors/ovl_En_In/z_en_in.c
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More