Misc FAKE fixes

include/z64player.h

@@ -1371,7 +1371,7 @@ s32 Player_IsFacingActor(Actor* actor, s16 maxAngleDiff, struct PlayState* play)
 
 PlayerItemAction Player_GetExchangeItemAction(struct PlayState* play);
 
-void func_800B8D10(struct PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6);
+void func_800B8D10(struct PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, s32 arg5, u32 arg6);
 void func_800B8D50(struct PlayState* play, Actor* actor, f32 arg2, s16 yaw, f32 arg4, u32 arg5);
 void func_800B8D98(struct PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4);
 void func_800B8DD4(struct PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5);

src/code/cutscene_camera.c

@@ -42,7 +42,7 @@ s32 CutsceneCamera_Init(Camera* camera, CutsceneCamera* csCamera) {
 
     csCamera->nextSplineTimer = csCamera->updateSplineTimer = 0;
     csCamera->cmdIndex = 0;
-    csCamera->splineIndex = 0xFFFF;
+    csCamera->splineIndex = -1;
     csCamera->splineNeedsInit = true;
     csCamera->state = CS_CAM_STATE_UPDATE_ALL;
 
@@ -298,7 +298,7 @@ s32 CutsceneCamera_UpdateSplines(u8* script, CutsceneCamera* csCamera) {
                 csCamera->atCmd = (CsCmdCamPoint*)&script[csCamera->cmdIndex];
                 csCamera->cmdIndex += (s16)(csCamera->eyeInterp.numEntries * sizeof(CsCmdCamPoint));
 
-                // Misc Point
+                // Eye Point
                 csCamera->eyeCmd = (CsCmdCamPoint*)&script[csCamera->cmdIndex];
                 csCamera->cmdIndex += (s16)(csCamera->eyeInterp.numEntries * sizeof(CsCmdCamPoint));
 
@@ -307,12 +307,10 @@ s32 CutsceneCamera_UpdateSplines(u8* script, CutsceneCamera* csCamera) {
                 csCamera->cmdIndex += (s16)(csCamera->eyeInterp.numEntries * sizeof(CsCmdCamMisc));
 
                 // Other Params
-                csCamera->eyeInterp.curPoint = 0;
-                csCamera->atInterp.curPoint = 0;
+                csCamera->eyeInterp.curPoint = csCamera->atInterp.curPoint = 0;
 
                 csCamera->splineNeedsInit = false;
-                //! FAKE: csCamera->splineIndex++;
-                csCamera->splineIndex = (csCamera->splineIndex & 0xFFFF) + 1;
+                csCamera->splineIndex++;
                 csCamera->state = CS_CAM_STATE_UPDATE_ALL;
                 csCamera->nextSplineTimer = csCamera->updateSplineTimer = 0;
                 csCamera->eyeInterp.type = csCamera->atInterp.type = CS_CAM_INTERP_OFF;

src/code/sys_math3d.c

@@ -1900,12 +1900,12 @@ s32 Math3D_CylVsLineSeg(Cylinder16* cyl, Vec3f* linePointA, Vec3f* linePointB, V
     fracA = 0.0f;
     fracB = 0.0f;
 
-//! FAKE:
-dummy:;
-
     zero = 0.0f;
     intFlags = 0;
 
+    //! FAKE:
+    if (1) {}
+
     if (Math3D_PointInCyl(cyl, linePointA) && Math3D_PointInCyl(cyl, linePointB)) {
         // both points are in the cylinder
         *intersectA = *linePointA;

src/code/z_actor.c

@@ -2323,7 +2323,7 @@ s32 Actor_HasNoRider(PlayState* play, Actor* horse) {
     return false;
 }
 
-void func_800B8D10(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6) {
+void func_800B8D10(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, s32 arg5, u32 arg6) {
     Player* player = GET_PLAYER(play);
 
     player->unk_B74 = arg6;

src/code/z_bgcheck.c

@@ -2873,7 +2873,7 @@ void DynaPoly_AddBgActorToLookup(PlayState* play, DynaCollisionContext* dyna, s3
     pos.y += actor->shape.yOffset * actor->scale.y;
 
     //! FAKE:
-    if (pbgdata && pbgdata) {}
+    if (1) {}
 
     ScaleRotPos_SetValue(&dyna->bgActors[bgId].curTransform, &actor->scale, &actor->shape.rot, &pos);
 

src/code/z_eff_tire_mark.c

@@ -74,6 +74,10 @@ void func_800AE930(CollisionContext* colCtx, EffectTireMark* this, Vec3f* pos, f
             spA8->p2.y = sp78.y;
             spA8->p2.z = sp78.z;
             spA8->life = this->elemDuration;
+
+            //! FAKE:
+            if (1) {}
+
             spA8->colPoly = NULL;
             this->numElements++;
 
@@ -82,9 +86,6 @@ void func_800AE930(CollisionContext* colCtx, EffectTireMark* this, Vec3f* pos, f
                 spAC->flags |= EFFECT_TIRE_MARK_ELEMENT_FLAG_1;
             }
 
-            //! FAKE:
-            if (spA8) {}
-
             spA8 = &this->elements[this->numElements];
             spA8->flags = 0;
             spA8->p1 = spB0;

src/code/z_eventmgr.c

@@ -518,12 +518,14 @@ s16 CutsceneManager_FindEntranceCsId(void) {
     s32 csId;
 
     for (csId = 0; csId < sSceneCutsceneCount; csId++) {
-        //! FAKE:
-        if ((sSceneCutsceneList[csId].scriptIndex != CS_SCRIPT_ID_NONE) &&
-            (sSceneCutsceneList[csId].scriptIndex < (play = sCutsceneMgr.play)->csCtx.scriptListCount) &&
-            (sCutsceneMgr.play->curSpawn ==
-             sCutsceneMgr.play->csCtx.scriptList[sSceneCutsceneList[csId].scriptIndex].spawn)) {
-            return csId;
+        if (sSceneCutsceneList[csId].scriptIndex != CS_SCRIPT_ID_NONE) {
+            PlayState* play = sCutsceneMgr.play;
+
+            if ((sSceneCutsceneList[csId].scriptIndex < play->csCtx.scriptListCount) &&
+                (sCutsceneMgr.play->curSpawn ==
+                 sCutsceneMgr.play->csCtx.scriptList[sSceneCutsceneList[csId].scriptIndex].spawn)) {
+                return csId;
+            }
         }
     }
 

src/code/z_map_disp.c

@@ -659,17 +659,14 @@ void MapDisp_InitBossRoomStorey(PlayState* play) {
     s32 i;
 
     for (i = 0; i < transitionActors->count; i++) {
-        if (MapDisp_IsBossDoor(sTransitionActors[i].params)) {
-            if (ABS_ALT(sTransitionActors[i].id) != ACTOR_EN_HOLL) {
+        TransitionActorEntry* entry = &sTransitionActors[i];
+
+        if (MapDisp_IsBossDoor(entry->params)) {
+            if (ABS_ALT(entry->id) != ACTOR_EN_HOLL) {
                 for (storey = 0; storey < sMapDisp.numStoreys; storey++) {
-                    //! FAKE: needed for matching
-                    s32 temp = (sMapDisp.storeyYList[storey] - 5);
-
-                    if (((storey == sMapDisp.numStoreys - 1) &&
-                         (sTransitionActors[i].pos.y >= (sMapDisp.storeyYList[storey] - 5))) ||
-                        ((storey != sMapDisp.numStoreys - 1) &&
-                         (sTransitionActors[i].pos.y >= (sMapDisp.storeyYList[storey] - 5)) &&
-                         (sTransitionActors[i].pos.y < (sMapDisp.storeyYList[storey + 1] - 5)))) {
+                    if (((storey == sMapDisp.numStoreys - 1) && (entry->pos.y >= (sMapDisp.storeyYList[storey] - 5))) ||
+                        ((storey != sMapDisp.numStoreys - 1) && (entry->pos.y >= (sMapDisp.storeyYList[storey] - 5)) &&
+                         (entry->pos.y < (sMapDisp.storeyYList[storey + 1] - 5)))) {
                         sMapDisp.bossRoomStorey = storey;
                         return;
                     }

src/code/z_play.c

@@ -2105,7 +2105,6 @@ void Play_Init(GameState* thisx) {
 
     if ((gSaveContext.nextCutsceneIndex == 0xFFEF) || (gSaveContext.nextCutsceneIndex == 0xFFF0)) {
         scene = ((void)0, gSaveContext.save.entrance) >> 9;
-        spawn = (((void)0, gSaveContext.save.entrance) >> 4) & 0x1F;
 
         if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CLEARED_SNOWHEAD_TEMPLE)) {
             if (scene == ENTR_SCENE_MOUNTAIN_VILLAGE_WINTER) {
@@ -2145,9 +2144,8 @@ void Play_Init(GameState* thisx) {
                 gSaveContext.nextCutsceneIndex = 0xFFF4;
             }
         }
-        //! FAKE:
-        gSaveContext.save.entrance =
-            Entrance_Create(((void)0, scene), spawn, ((void)0, gSaveContext.save.entrance) & 0xF);
+        gSaveContext.save.entrance = Entrance_Create(scene, (((void)0, gSaveContext.save.entrance) >> 4) & 0x1F,
+                                                     ((void)0, gSaveContext.save.entrance) & 0xF);
     }
 
     GameState_Realloc(&this->state, 0);

src/code/z_player_lib.c

@@ -1687,9 +1687,8 @@ PlayerExplosive Player_GetExplosiveHeld(Player* player) {
 PlayerSword Player_SwordFromIA(Player* player, PlayerItemAction itemAction) {
     PlayerSword sword = PLAYER_SWORD_KOKIRI;
 
-    //! FAKE:
     if ((itemAction == PLAYER_IA_LAST_USED) ||
-        ((sword = GET_SWORD_FROM_IA(itemAction), (sword > PLAYER_SWORD_NONE)) && (sword < PLAYER_SWORD_MAX))) {
+        (sword = GET_SWORD_FROM_IA(itemAction), ((sword > PLAYER_SWORD_NONE) && (sword < PLAYER_SWORD_MAX)))) {
         return sword;
     }
 
@@ -3803,29 +3802,28 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, G
             }
         }
     } else if (limbIndex == PLAYER_LIMB_HEAD) {
-        //! FAKE:
-        if (((*dList1 != NULL) && ((((void)0, player->currentMask)) != (((void)0, PLAYER_MASK_NONE)))) &&
+        if (((*dList1 != NULL) && ((u32)player->currentMask != PLAYER_MASK_NONE)) &&
             (((player->transformation == PLAYER_FORM_HUMAN) &&
               ((player->skelAnime.animation != &gPlayerAnim_cl_setmask) || (player->skelAnime.curFrame >= 12.0f))) ||
              ((((player->transformation != PLAYER_FORM_HUMAN) && (player->currentMask >= PLAYER_MASK_FIERCE_DEITY)) &&
                ((player->transformation + PLAYER_MASK_FIERCE_DEITY) != player->currentMask)) &&
               (player->skelAnime.curFrame >= 10.0f)))) {
             if (func_80127438(play, player, player->currentMask)) {
-                s32 maskMinusOne = ((void)0, player->currentMask) - 1;
+                s32 maskMinusOne = player->currentMask - 1;
 
                 OPEN_DISPS(play->state.gfxCtx);
 
-                if (((void)0, player->currentMask) == PLAYER_MASK_COUPLE) {
+                if (player->currentMask == PLAYER_MASK_COUPLE) {
                     Player_DrawCouplesMask(play, player);
-                } else if (((void)0, player->currentMask) == PLAYER_MASK_CIRCUS_LEADER) {
+                } else if (player->currentMask == PLAYER_MASK_CIRCUS_LEADER) {
                     Player_DrawCircusLeadersMask(play, player);
-                } else if (((void)0, player->currentMask) == PLAYER_MASK_BLAST) {
+                } else if (player->currentMask == PLAYER_MASK_BLAST) {
                     Player_DrawBlastMask(play, player);
-                } else if (((void)0, player->currentMask) == PLAYER_MASK_BUNNY) {
+                } else if (player->currentMask == PLAYER_MASK_BUNNY) {
                     Player_DrawBunnyHood(play);
-                } else if (((void)0, player->currentMask) == PLAYER_MASK_GREAT_FAIRY) {
+                } else if (player->currentMask == PLAYER_MASK_GREAT_FAIRY) {
                     Player_DrawGreatFairysMask(play, player);
-                } else if (((void)0, player->currentMask) >= PLAYER_MASK_FIERCE_DEITY) {
+                } else if (player->currentMask >= PLAYER_MASK_FIERCE_DEITY) {
                     static Vec2f D_801C0E04[PLAYER_FORM_MAX] = {
                         { 140.0f, -130.0f }, // PLAYER_FORM_FIERCE_DEITY
                         { 0.0f, -200.0f },   // PLAYER_FORM_GORON
@@ -3970,6 +3968,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, G
             static Vec3f sPlayerFocusHeadLimbModelPos = { 1100.0f, -700.0f, 0.0f };
             static Vec3f D_801C0E88 = { 1600.0f, -1700.0f, -70.0f }; // unused
             Actor* spA8 = NULL;
+            s32 pad;
 
             if (player->transformation != PLAYER_FORM_DEKU) {
                 Matrix_MultVec3f(&sPlayerFocusHeadLimbModelPos, &player->actor.focus.pos);

src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c

@@ -86,9 +86,7 @@ void BgAstrBombwall_InitCollider(ColliderTrisInit* init, Vec3f* pos, Vec3s* rot,
 
     for (i = 0; i < init->count; i++) {
         for (j = 0; j < 3; j++) {
-            //! FAKE:
-            // https://decomp.me/scratch/JrEnl
-            Matrix_MultVec3f(&(init->elements + i)->dim.vtx[j], &sp54[j]);
+            Matrix_MultVec3f(init->elements[i].dim.vtx + j, &sp54[j]);
             Math_Vec3f_Sum(&sp54[j], pos, &sp54[j]);
         }
         Collider_SetTrisVertices(collider, i, &sp54[0], &sp54[1], &sp54[2]);

src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c

@@ -1684,8 +1684,8 @@ s8 EnInvadepoh_ModelInfo_GetNextFaceAnim(EnInvadepohFaceAnimNext* nextAnims, s32
         }
     }
 
-    //! FAKE:
-    return (nextAnims + nextIndex)->index;
+    nextAnim = &nextAnims[nextIndex];
+    return nextAnim->index;
 }
 
 void EnInvadepoh_ModelInfo_SetNextFaceAnim(EnInvadepohFaceAnimInfo* faceInfo, EnInvadepohFaceAnimBase* faceAnim) {

src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c

@@ -188,8 +188,10 @@ void EnKakasi_Init(Actor* thisx, PlayState* play) {
     i = 0;
     csId = this->picto.actor.csId;
     while (csId != CS_ID_NONE) {
-        //! FAKE:
-        csId = CutsceneManager_GetAdditionalCsId(this->csIdList[i] = csId);
+        // clang-format off
+        this->csIdList[i] = csId; \
+        csId = CutsceneManager_GetAdditionalCsId(csId);
+        // clang-format on
         i++;
     }
 

src/overlays/actors/ovl_En_Knight/z_en_knight.c

@@ -3465,27 +3465,11 @@ void EnKnight_FlyingHeadAttack(EnKnight* this, PlayState* play) {
             if (CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_A) ||
                 CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_B)) {
 
-                if (1) {} //! FAKE:
-                if (this->timers[0] != 0) {
-                    this->timers[0]--;
-                    if (1) {}
-                }
-
-                if (this->timers[0] != 0) {
-                    this->timers[0]--;
-                }
-
-                if (this->timers[0] != 0) {
-                    this->timers[0]--;
-                }
-
-                if (this->timers[0] != 0) {
-                    this->timers[0]--;
-                }
-
-                if (this->timers[0] != 0) {
-                    this->timers[0]--;
-                }
+                DECR(this->timers[0]);
+                DECR(this->timers[0]);
+                DECR(this->timers[0]);
+                DECR(this->timers[0]);
+                DECR(this->timers[0]);
             }
 
             Math_ApproachF(&this->actor.world.pos.x, player->actor.world.pos.x + targetHeight.x, 1.0f,
@@ -4342,7 +4326,7 @@ void EnKnight_UpdateEffects(EnKnight* this, PlayState* play) {
 
             eff->accel.y = BREG(56) * 0.01f + 1.0f;
 
-            if (eff->active == (u32) true) { //! FAKE:
+            if (eff->active == true) {
                 Math_ApproachF(&eff->scale, (KREG(59) * 0.01f + 1.0f) * eff->scaleTarget, 0.1f,
                                eff->scaleTarget * 0.1f);
 

src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c

@@ -404,12 +404,12 @@ EnKusa2UnkBssSubStruct* func_80A5C074(EnKusa2UnkBssStruct* arg0) {
 EnKusa2UnkBssSubStruct2* func_80A5C0B8(EnKusa2UnkBssStruct* arg0) {
     s32 i;
     EnKusa2UnkBssSubStruct2* phi_v1 = &arg0->unk_0480[0];
+    EnKusa2UnkBssSubStruct2* iter;
 
     for (i = 1; i < ARRAY_COUNT(D_80A5F1C0.unk_0480); i++) {
-        if (phi_v1->unk_2C > arg0->unk_0480[i].unk_2C) {
-            phi_v1 = &arg0->unk_0480[i];
-            //! FAKE:
-            if (1) {}
+        iter = &arg0->unk_0480[i];
+        if (iter->unk_2C < phi_v1->unk_2C) {
+            phi_v1 = iter;
 
             if (phi_v1->unk_2C <= 0) {
                 break;

src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c

@@ -80,12 +80,12 @@ void EnMinifrog_Init(Actor* thisx, PlayState* play) {
     EnMinifrog* this = (EnMinifrog*)thisx;
     s32 i;
 
-    Actor_ProcessInitChain(&this->actor, sInitChain);
-    ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 15.0f);
+    Actor_ProcessInitChain(thisx, sInitChain);
+    ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 15.0f);
     SkelAnime_InitFlex(play, &this->skelAnime, &gFrogSkel, &gFrogIdleAnim, this->jointTable, this->morphTable,
                        FROG_LIMB_MAX);
-    CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
-    Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
+    CollisionCheck_SetInfo(&thisx->colChkInfo, NULL, &sColChkInfoInit);
+    Collider_InitAndSetCylinder(play, &this->collider, thisx, &sCylinderInit);
 
     if (!sTexturesDesegmented) {
         for (i = 0; i < ARRAY_COUNT(sEyeTextures); i++) {
@@ -94,20 +94,17 @@ void EnMinifrog_Init(Actor* thisx, PlayState* play) {
         sTexturesDesegmented = true;
     }
 
-    this->frogIndex = (this->actor.params & 0xF);
+    this->frogIndex = (thisx->params & 0xF);
     if (this->frogIndex >= 5) {
         this->frogIndex = FROG_YELLOW;
     }
 
-    this->actor.speed = 0.0f;
+    thisx->speed = 0.0f;
     this->actionFunc = EnMinifrog_Idle;
     this->jumpState = FROG_STATE_GROUND;
     this->flags = 0;
     this->timer = 0;
 
-    //! FAKE:
-    if (1) {}
-
     if (!EN_FROG_IS_RETURNED(&this->actor)) {
         if ((this->frogIndex == FROG_YELLOW) || CHECK_WEEKEVENTREG(sIsFrogReturnedFlags[this->frogIndex])) {
             Actor_Kill(&this->actor);
@@ -116,29 +113,29 @@ void EnMinifrog_Init(Actor* thisx, PlayState* play) {
 
         this->timer = 30;
         this->actionFunc = EnMinifrog_SpawnGrowAndShrink;
-        this->actor.textId = 0xD81;
-        this->actor.colChkInfo.mass = 30;
+        thisx->textId = 0xD81;
+        thisx->colChkInfo.mass = 30;
     } else { // Frogs in mountain village
         if (this->frogIndex == FROG_YELLOW) {
-            this->actor.textId = 0;
+            thisx->textId = 0;
             this->actionFunc = EnMinifrog_SetupYellowFrogDialog;
 
             if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_34_01)) {
-                this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
+                thisx->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
             }
 
-            this->actor.home.rot.x = this->actor.home.rot.z = 0;
+            thisx->home.rot.x = thisx->home.rot.z = 0;
             this->frog = NULL;
         } else {
             this->frog = EnMinifrog_GetFrog(play);
-            this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
+            thisx->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
 
             // Frog has been returned
             if (CHECK_WEEKEVENTREG(sIsFrogReturnedFlags[this->frogIndex])) {
                 this->actionFunc = EnMinifrog_SetupNextFrogInit;
             } else {
-                this->actor.draw = NULL;
-                this->actor.update = EnMinifrog_UpdateMissingFrog;
+                thisx->draw = NULL;
+                thisx->update = EnMinifrog_UpdateMissingFrog;
             }
         }
     }