Match func_800344BC and make func_8002FBAC equivalent (#778)

* format

* now equivalent

* another match

* cleanup

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>

1 files changed, 112 insertions, 125 deletions

diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 7bf866206..98ecdc4d2 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -1771,87 +1771,65 @@ void func_8002FA60(GlobalContext* globalCtx) {
     D_8015BC18 = 0.0f;
 }
 
-Vec3f D_80116048 = { 0.0f, -0.05f, 0.0f };
-Vec3f D_80116054 = { 0.0f, -0.025f, 0.0f };
-Color_RGBA8 D_80116060 = { 255, 255, 255, 0 };
-Color_RGBA8 D_80116064 = { 100, 200, 0, 0 };
-
 #ifdef NON_MATCHING
-// saved register, stack usage and minor ordering differences
-// this also doesn't generate a few useless struct copies
+// some regalloc and odd loading of gSaveContext
 void func_8002FBAC(GlobalContext* globalCtx) {
-    Vec3f lightPos;
-    f32 spD8;
-    f32 spD4;
-    s32 spD0;
-    s32 spCC;
-    f32 spC0;
-    Vec3f spB4;
-    Vec3f spA4;
-    f32 sp9C;
-    Vec3f sp7C;
-    Vec3f sp70;
-    f32 temp_f12;
-    f32 temp_f14;
-    f32 temp_f2;
-    f32 temp_ret;
-    s32 temp_a3;
-    f32 phi_f14;
-    f32 phi_f10;
-    f32 phi_f6;
+    static Vec3f D_80116048 = { 0.0f, -0.05f, 0.0f };
+    static Vec3f D_80116054 = { 0.0f, -0.025f, 0.0f };
+    static Color_RGBA8 D_80116060 = { 255, 255, 255, 0 };
+    static Color_RGBA8 D_80116064 = { 100, 200, 0, 0 };
+    Vec3f* temp = &gSaveContext.respawn[RESPAWN_MODE_TOP].pos;
+    s32 spF0;
 
     OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 5308);
 
-    if (gSaveContext.respawn[RESPAWN_MODE_TOP].data != 0) {
-        if (LINK_IS_ADULT) {
-            spD8 = 80.0f;
-        } else {
-            spD8 = 60.0f;
-        }
-
-        spD0 = 0xFF;
-        spD4 = 1.0f;
+    spF0 = gSaveContext.respawn[RESPAWN_MODE_TOP].data;
 
-        temp_a3 = gSaveContext.respawn[RESPAWN_MODE_TOP].data - 0x28;
-        spCC = temp_a3;
+    if (spF0 != 0) {
+        f32 spD8 = (LINK_IS_ADULT) ? 80.0f : 60.0f;
+        f32 spD4 = 1.0f;
+        s32 spD0 = 0xFF;
+        s32 spCC = spF0 - 40;
+        s32 temp2;
+        s32 pad;
 
-        if (temp_a3 < 0) {
-            gSaveContext.respawn[RESPAWN_MODE_TOP].data++;
-            spD4 = ABS(gSaveContext.respawn[RESPAWN_MODE_TOP].data) * 0.025f;
+        if (spCC < 0) {
+            gSaveContext.respawn[RESPAWN_MODE_TOP].data = ++spF0;
+            spD4 = ABS(spF0) * 0.025f;
             D_8015BC14 = 60;
             D_8015BC18 = 1.0f;
         } else if (D_8015BC14 != 0) {
             D_8015BC14--;
         } else if (D_8015BC18 > 0.0f) {
-            spC0 = D_8015BC18;
-            temp_ret = Math_Vec3f_DistXYZAndStoreDiff(&gSaveContext.respawn[RESPAWN_MODE_DOWN].pos,
-                                                      &gSaveContext.respawn[RESPAWN_MODE_TOP].pos, &spB4);
+            f32 spC0 = D_8015BC18;
+            Vec3f spB4;
+            f32 spB0 = Math_Vec3f_DistXYZAndStoreDiff(&gSaveContext.respawn[RESPAWN_MODE_DOWN].pos, temp, &spB4);
+            Vec3f spA4;
 
-            if (temp_ret < 20.0f) {
+            if (spB0 < 20.0f) {
                 D_8015BC18 = 0.0f;
-                Math_Vec3f_Copy(&gSaveContext.respawn[RESPAWN_MODE_TOP].pos,
-                                &gSaveContext.respawn[RESPAWN_MODE_DOWN].pos);
+                Math_Vec3f_Copy(temp, &gSaveContext.respawn[RESPAWN_MODE_DOWN].pos);
             } else {
-                sp9C = (1.0f / D_8015BC18) * temp_ret;
-                phi_f14 = 20.0f / sp9C;
-                phi_f14 = (phi_f14 < 0.05f) ? 0.05f : phi_f14;
+                f32 temp_f2;
+                f32 sp9C = spB0 * (1.0f / D_8015BC18);
+                f32 phi_f14 = 20.0f / sp9C;
+
+                phi_f14 = CLAMP_MIN(phi_f14, 0.05f);
                 Math_StepToF(&D_8015BC18, 0.0f, phi_f14);
-                temp_f2 = ((D_8015BC18 / spC0) * temp_ret) / temp_ret;
-                gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x =
-                    gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.x + (spB4.x * temp_f2);
-                gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y =
-                    gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.y + (spB4.y * temp_f2);
-                gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z =
-                    gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.z + (spB4.z * temp_f2);
-                temp_f12 = sp9C * 0.5f;
-                temp_f14 = temp_ret - temp_f12;
-                spD8 += sqrtf((temp_f12 * temp_f12) - (temp_f14 * temp_f14)) * 0.2f;
+
+                temp_f2 = ((D_8015BC18 / spC0) * spB0) / spB0;
+
+                temp->x = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.x + (spB4.x * temp_f2);
+                temp->y = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.y + (spB4.y * temp_f2);
+                temp->z = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.z + (spB4.z * temp_f2);
+                spD8 += sqrtf(SQ(sp9C / 2.0f) - SQ(spB0 - sp9C / 2.0f)) * 0.2f;
+
                 osSyncPrintf("-------- DISPLAY Y=%f\n", spD8);
             }
 
-            spA4.x = Rand_CenteredFloat(6.0f) + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x;
-            spA4.y = Rand_ZeroOne() * 6.0f + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + 80.0f;
-            spA4.z = Rand_CenteredFloat(6.0f) + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z;
+            spA4.x = temp->x + Rand_CenteredFloat(6.0f);
+            spA4.y = temp->y + 80.0f + Rand_ZeroOne() * 6.0f;
+            spA4.z = temp->z + Rand_CenteredFloat(6.0f);
 
             EffectSsKiraKira_SpawnDispersed(globalCtx, &spA4, &D_80116048, &D_80116054, &D_80116060, &D_80116064, 1000,
                                             16);
@@ -1859,83 +1837,98 @@ void func_8002FBAC(GlobalContext* globalCtx) {
             if (D_8015BC18 == 0.0f) {
                 gSaveContext.respawn[RESPAWN_MODE_TOP] = gSaveContext.respawn[RESPAWN_MODE_DOWN];
                 gSaveContext.respawn[RESPAWN_MODE_TOP].playerParams = 0x06FF;
-                gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0x28;
+                gSaveContext.respawn[RESPAWN_MODE_TOP].data = 40;
             }
 
-            // somehow this shouldn't be optimized out
-            gSaveContext.respawn[RESPAWN_MODE_TOP].pos = gSaveContext.respawn[RESPAWN_MODE_TOP].pos;
-        } else if (temp_a3 > 0) {
-            temp_f12 = temp_a3 * 0.1f;
+            gSaveContext.respawn[RESPAWN_MODE_TOP].pos = *temp;
+        } else if (spCC > 0) {
+            if (spCC * 0.1f < 1.0f) {
+                s32 pad2;
+                s32 pad3;
+                f32 temp3;
+                f32 temp4;
+                Vec3f sp7C;
+                Vec3f sp70;
 
-            if (temp_f12 < 1.0f) {
                 sp7C.x = globalCtx->view.eye.x;
                 sp7C.y = globalCtx->view.eye.y - spD8;
                 sp7C.z = globalCtx->view.eye.z;
-                temp_ret = Math_Vec3f_DistXYZAndStoreDiff(&sp7C, &gSaveContext.respawn[RESPAWN_MODE_TOP].pos, &sp70);
-                temp_f2 = (((1.0f - temp_f12) / (1.0f - ((f32)(temp_a3 - 1) * 0.1f))) * temp_ret) / temp_ret;
-                gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x = sp70.x * temp_f2 + sp7C.x;
-                gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y = sp70.y * temp_f2 + sp7C.y;
-                gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z = sp70.z * temp_f2 + sp7C.z;
-            }
+                temp4 = Math_Vec3f_DistXYZAndStoreDiff(&sp7C, temp, &sp70);
+                temp3 = (((1.0f - spCC * 0.1f) / (1.0f - ((f32)(spCC - 1) * 0.1f))) * temp4) / temp4;
+                temp->x = sp70.x * temp3 + sp7C.x;
+                temp->y = sp70.y * temp3 + sp7C.y;
+                temp->z = sp70.z * temp3 + sp7C.z;
 
-            // somehow this shouldn't be optimized out
-            gSaveContext.respawn[RESPAWN_MODE_TOP].pos = gSaveContext.respawn[RESPAWN_MODE_TOP].pos;
+                gSaveContext.respawn[RESPAWN_MODE_TOP].pos = *temp;
+            }
 
-            spD0 = 0xFF - (((temp_a3 * 0x10) - temp_a3) * 2);
+            spD0 = 0xFF - 30 * spCC;
 
             if (spD0 < 0) {
                 gSaveContext.fw.set = 0;
                 gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0;
                 spD0 = 0;
             } else {
-                gSaveContext.respawn[RESPAWN_MODE_TOP].data++;
+                gSaveContext.respawn[RESPAWN_MODE_TOP].data = ++spF0;
             }
 
-            spD4 = spCC * 0.200000000000000011102230246252 + 1.0f;
+            spD4 = (f32)spCC * 0.2 + 1.0f;
         }
 
-        if ((globalCtx->csCtx.state == CS_STATE_IDLE) &&
-            (gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex == gSaveContext.entranceIndex) &&
-            (globalCtx->roomCtx.curRoom.num == gSaveContext.respawn[RESPAWN_MODE_TOP].roomIndex)) {
-            POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x19);
+        if (globalCtx->csCtx.state == CS_STATE_IDLE) {
+            temp2 = gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex;
+            if ((temp2 == gSaveContext.entranceIndex) &&
+                (globalCtx->roomCtx.curRoom.num == gSaveContext.respawn[RESPAWN_MODE_TOP].roomIndex)) {
+                f32 phi_f10;
+                f32 phi_f6;
 
-            Matrix_Translate(gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x,
-                             gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + spD8,
-                             gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z, MTXMODE_NEW);
-            Matrix_Scale(0.025f * spD4, 0.025f * spD4, 0.025f * spD4, MTXMODE_APPLY);
-            Matrix_Mult(&globalCtx->mf_11D60, MTXMODE_APPLY);
-            Matrix_Push();
+                POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x19);
+                // bad gSaveContext load here
+                Matrix_Translate(temp->x, temp->y + spD8, temp->z, MTXMODE_NEW);
+                Matrix_Scale(0.025f * spD4, 0.025f * spD4, 0.025f * spD4, MTXMODE_APPLY);
+                Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY);
+                Matrix_Push();
 
-            gDPPipeSync(POLY_XLU_DISP++);
-            gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 200, spD0);
-            gDPSetEnvColor(POLY_XLU_DISP++, 100, 200, 0, 255);
+                gDPPipeSync(POLY_XLU_DISP++);
+                gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 200, spD0);
+                gDPSetEnvColor(POLY_XLU_DISP++, 100, 200, 0, 255);
 
-            phi_f10 = (globalCtx->gameplayFrames * 1500) & 0xFFFF;
-            Matrix_RotateZ((phi_f10 * M_PI) / 32768.0f, MTXMODE_APPLY);
+                phi_f10 = (globalCtx->gameplayFrames * 1500) & 0xFFFF;
+                Matrix_RotateZ((phi_f10 * M_PI) / 32768.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5458),
-                      G_MTX_MODELVIEW | G_MTX_LOAD);
-            gSPDisplayList(POLY_XLU_DISP++, &gEffFlash1DL);
+                gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5458),
+                          G_MTX_MODELVIEW | G_MTX_LOAD);
+                gSPDisplayList(POLY_XLU_DISP++, &gEffFlash1DL);
 
-            Matrix_Pop();
-            phi_f6 = ~((globalCtx->gameplayFrames * 1200) & 0xFFFF);
-            Matrix_RotateZ((phi_f6 * M_PI) / 32768.0f, MTXMODE_APPLY);
+                Matrix_Pop();
+                phi_f6 = ~((globalCtx->gameplayFrames * 1200) & 0xFFFF);
+                Matrix_RotateZ((phi_f6 * M_PI) / 32768.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5463),
-                      G_MTX_MODELVIEW | G_MTX_LOAD);
-            gSPDisplayList(POLY_XLU_DISP++, &gEffFlash1DL);
-        }
-
-        lightPos.x = gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x;
-        lightPos.y = gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + spD8;
-        lightPos.z = gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z;
+                gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5463),
+                          G_MTX_MODELVIEW | G_MTX_LOAD);
+                gSPDisplayList(POLY_XLU_DISP++, &gEffFlash1DL);
+            }
+            {
+                Vec3f lightPos;
 
-        Lights_PointNoGlowSetInfo(&D_8015BC00, lightPos.x, lightPos.y, lightPos.z, 0xFF, 0xFF, 0xFF, 500.0f * spD4);
+                lightPos.x = gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x;
+                lightPos.y = gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + spD8;
+                lightPos.z = gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z;
 
-        CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 5474);
+                Lights_PointNoGlowSetInfo(&D_8015BC00, lightPos.x, lightPos.y, lightPos.z, 0xFF, 0xFF, 0xFF,
+                                          500.0f * spD4);
+            }
+            CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 5474);
+        }
     }
 }
 #else
+
+static Vec3f D_80116048 = { 0.0f, -0.05f, 0.0f };
+static Vec3f D_80116054 = { 0.0f, -0.025f, 0.0f };
+static Color_RGBA8 D_80116060 = { 255, 255, 255, 0 };
+static Color_RGBA8 D_80116064 = { 100, 200, 0, 0 };
+
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_8002FBAC.s")
 #endif
 
@@ -3500,7 +3493,7 @@ typedef struct {
     /* 0x18 */ u32 unk_18;
 } struct_801160DC; // size = 0x1C
 
-struct_801160DC D_801160DC[] = {
+static struct_801160DC D_801160DC[] = {
     { 0.54f, 6000.0f, 5000.0f, 1.0f, 0.0f, 0x050011F0, 0x05001100 },
     { 0.644f, 12000.0f, 8000.0f, 1.0f, 0.0f, 0x06001530, 0x06001400 },
     { 0.64000005f, 8500.0f, 8000.0f, 1.75f, 0.1f, 0x050011F0, 0x05001100 },
@@ -3637,7 +3630,7 @@ typedef struct {
     /* 0x14 */ s16 unk_14;
 } struct_80116130; // size = 0x18
 
-struct_80116130 D_80116130[] = {
+static struct_80116130 D_80116130[] = {
     { { 0x2AA8, 0xF1C8, 0x18E2, 0x1554, 0x0000, 0x0000, 1 }, 170.0f, 0x3FFC },
     { { 0x2AA8, 0xEAAC, 0x1554, 0x1554, 0xF8E4, 0x0E38, 1 }, 170.0f, 0x3FFC },
     { { 0x31C4, 0xE390, 0x0E38, 0x0E38, 0xF1C8, 0x071C, 1 }, 170.0f, 0x3FFC },
@@ -3653,8 +3646,6 @@ struct_80116130 D_80116130[] = {
     { { 0x18E2, 0xF1C8, 0x0E38, 0x0E38, 0x0000, 0x0000, 1 }, 0.0f, 0x0000 },
 };
 
-#ifdef NON_MATCHING
-// regalloc differences
 void func_800344BC(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7,
                    u8 arg8) {
     s16 sp46;
@@ -3675,23 +3666,22 @@ void func_800344BC(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3,
     temp1 = CLAMP(sp40, -arg2, arg2);
     Math_SmoothStepToS(&arg1->unk_08.y, temp1, 6, 2000, 1);
 
-    sp40 = (ABS(sp40) >= 0x8000) ? 0 : ABS(sp40);
-    arg1->unk_08.y = CLAMP(arg1->unk_08.y, -sp40, sp40);
+    temp1 = (ABS(sp40) >= 0x8000) ? 0 : ABS(sp40);
+    arg1->unk_08.y = CLAMP(arg1->unk_08.y, -temp1, temp1);
 
-    sp40 = sp40 - arg1->unk_08.y;
+    sp40 -= arg1->unk_08.y;
 
     temp1 = CLAMP(sp40, -arg5, arg5);
     Math_SmoothStepToS(&arg1->unk_0E.y, temp1, 6, 2000, 1);
 
-    sp40 = (ABS(sp40) >= 0x8000) ? 0 : ABS(sp40);
-    arg1->unk_0E.y = CLAMP(arg1->unk_0E.y, -sp40, sp40);
+    temp1 = (ABS(sp40) >= 0x8000) ? 0 : ABS(sp40);
+    arg1->unk_0E.y = CLAMP(arg1->unk_0E.y, -temp1, temp1);
 
-    if (arg8 != 0) {
-        if (arg3) {} // Seems necessary to match
+    if (arg8) {
         Math_SmoothStepToS(&actor->shape.rot.y, sp44, 6, 2000, 1);
     }
 
-    temp1 = CLAMP(sp46, arg4, arg3);
+    temp1 = CLAMP(sp46, arg4, (s16)(u16)arg3);
     Math_SmoothStepToS(&arg1->unk_08.x, temp1, 6, 2000, 1);
 
     temp2 = sp46 - arg1->unk_08.x;
@@ -3699,9 +3689,6 @@ void func_800344BC(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3,
     temp1 = CLAMP(temp2, arg7, arg6);
     Math_SmoothStepToS(&arg1->unk_0E.x, temp1, 6, 2000, 1);
 }
-#else
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800344BC.s")
-#endif
 
 s16 func_800347E8(s16 arg0) {
     return D_80116130[arg0].unk_14;