name remaining files, fix some fake matches (#245)

* splits

* split and migrate

* readwrite const

* format

6 files changed, 79 insertions, 84 deletions

diff --git a/src/engine/fox_852F0.c b/src/engine/fox_blur.c
index 3444511a..c78679b9 100644
--- a/src/engine/fox_852F0.c
+++ b/src/engine/fox_blur.c
@@ -1,6 +1,12 @@
 #include "global.h"
 
-void func_800846F0(FrameBuffer* arg0) {
+/*
+ * File: fox_blur.c
+ * System: Blur
+ * Description: Some unused blurring code.
+ */
+
+void func_blur_800846F0(FrameBuffer* arg0) {
     s32 i;
     s32 j;
     u16* var_v0;
diff --git a/src/engine/fox_97F80.c b/src/engine/fox_col1.c
index f570c6fc..f570c6fc 100644
--- a/src/engine/fox_97F80.c
+++ b/src/engine/fox_col1.c
diff --git a/src/engine/fox_A4290.c b/src/engine/fox_col2.c
index 82088912..6d75b7fc 100644
--- a/src/engine/fox_A4290.c
+++ b/src/engine/fox_col2.c
@@ -1,6 +1,6 @@
 #include "global.h"
 
-#include "fox_A4290_colheaders.c"
+#include "fox_colheaders.c"
 
 bool func_col2_800A36FC(Vec3f* objPos, Vec3f* colliderPos, CollisionHeader2* colHeader, Vec3f* hitDataOut);
 bool func_col2_800A3A74(Vec3f* point, Vec3f** tri, Vec3f* normOut);
diff --git a/src/engine/fox_A4290_colheaders.c b/src/engine/fox_colheaders.c
index 9ff133ac..9ff133ac 100644
--- a/src/engine/fox_A4290_colheaders.c
+++ b/src/engine/fox_colheaders.c
diff --git a/src/engine/fox_game.c b/src/engine/fox_game.c
index c46a9b24..cffc4ae4 100644
--- a/src/engine/fox_game.c
+++ b/src/engine/fox_game.c
@@ -199,63 +199,66 @@ void Game_InitFullViewport(void) {
 }
 
 void Game_InitViewport(Gfx** dList, u8 camCount, u8 camIndex) {
-    if ((camCount != 1) && (camCount == 4)) {
-        switch (camIndex) {
-            case 0:
-                gViewport->vp.vscale[0] = SCREEN_WIDTH * (gVsViewScale - 1.0f) * 2;
-                gViewport->vp.vscale[1] = SCREEN_HEIGHT * (gVsViewScale - 1.0f) * 2;
-                gViewport->vp.vscale[2] = G_MAXZ / 2;
-                gViewport->vp.vscale[3] = 0;
-                gViewport->vp.vtrans[0] = SCREEN_WIDTH * (2.0f - gVsViewScale) * 2;
-                gViewport->vp.vtrans[1] = SCREEN_HEIGHT * (2.0f - gVsViewScale) * 2;
-                gViewport->vp.vtrans[2] = G_MAXZ / 2;
-                gViewport->vp.vtrans[3] = 0;
-                gDPSetScissor((*dList)++, G_SC_NON_INTERLACE, SCREEN_MARGIN, SCREEN_MARGIN, SCREEN_WIDTH / 2,
-                              SCREEN_HEIGHT / 2);
-                break;
-            case 1:
-                gViewport->vp.vscale[0] = SCREEN_WIDTH * (gVsViewScale - 1.0f) * 2;
-                gViewport->vp.vscale[1] = SCREEN_HEIGHT * (gVsViewScale - 1.0f) * 2;
-                gViewport->vp.vscale[2] = G_MAXZ / 2;
-                gViewport->vp.vscale[3] = 0;
-                gViewport->vp.vtrans[0] = SCREEN_WIDTH * gVsViewScale * 2;
-                gViewport->vp.vtrans[1] = SCREEN_HEIGHT * (2.0f - gVsViewScale) * 2;
-                gViewport->vp.vtrans[2] = G_MAXZ / 2;
-                gViewport->vp.vtrans[3] = 0;
-                gDPSetScissor((*dList)++, G_SC_NON_INTERLACE, SCREEN_WIDTH / 2, SCREEN_MARGIN,
-                              SCREEN_WIDTH - SCREEN_MARGIN, SCREEN_HEIGHT / 2);
-                break;
-            case 2:
-                gViewport->vp.vscale[0] = SCREEN_WIDTH * (gVsViewScale - 1.0f) * 2;
-                gViewport->vp.vscale[1] = SCREEN_HEIGHT * (gVsViewScale - 1.0f) * 2;
-                gViewport->vp.vscale[2] = G_MAXZ / 2;
-                gViewport->vp.vscale[3] = 0;
-                gViewport->vp.vtrans[0] = SCREEN_WIDTH * (2.0f - gVsViewScale) * 2;
-                gViewport->vp.vtrans[1] = SCREEN_HEIGHT * gVsViewScale * 2;
-                gViewport->vp.vtrans[2] = G_MAXZ / 2;
-                gViewport->vp.vtrans[3] = 0;
-                gDPSetScissor((*dList)++, G_SC_NON_INTERLACE, SCREEN_MARGIN, SCREEN_HEIGHT / 2, SCREEN_WIDTH / 2,
-                              SCREEN_HEIGHT - SCREEN_MARGIN);
-                break;
-            case 3:
-                gViewport->vp.vscale[0] = SCREEN_WIDTH * (gVsViewScale - 1.0f) * 2;
-                gViewport->vp.vscale[1] = SCREEN_HEIGHT * (gVsViewScale - 1.0f) * 2;
-                gViewport->vp.vscale[2] = G_MAXZ / 2;
-                gViewport->vp.vscale[3] = 0;
-                gViewport->vp.vtrans[0] = SCREEN_WIDTH * gVsViewScale * 2;
-                gViewport->vp.vtrans[1] = SCREEN_HEIGHT * gVsViewScale * 2;
-                gViewport->vp.vtrans[2] = G_MAXZ / 2;
-                gViewport->vp.vtrans[3] = 0;
-                gDPSetScissor((*dList)++, G_SC_NON_INTERLACE, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2,
-                              SCREEN_WIDTH - SCREEN_MARGIN, SCREEN_HEIGHT - SCREEN_MARGIN);
-                break;
-            default:
-                Game_InitFullViewport();
-                break;
-        }
-    } else {
-        Game_InitFullViewport();
-        if (1) {}
+    switch (camCount) {
+        case 4:
+            switch (camIndex) {
+                case 0:
+                    gViewport->vp.vscale[0] = SCREEN_WIDTH * (gVsViewScale - 1.0f) * 2;
+                    gViewport->vp.vscale[1] = SCREEN_HEIGHT * (gVsViewScale - 1.0f) * 2;
+                    gViewport->vp.vscale[2] = G_MAXZ / 2;
+                    gViewport->vp.vscale[3] = 0;
+                    gViewport->vp.vtrans[0] = SCREEN_WIDTH * (2.0f - gVsViewScale) * 2;
+                    gViewport->vp.vtrans[1] = SCREEN_HEIGHT * (2.0f - gVsViewScale) * 2;
+                    gViewport->vp.vtrans[2] = G_MAXZ / 2;
+                    gViewport->vp.vtrans[3] = 0;
+                    gDPSetScissor((*dList)++, G_SC_NON_INTERLACE, SCREEN_MARGIN, SCREEN_MARGIN, SCREEN_WIDTH / 2,
+                                  SCREEN_HEIGHT / 2);
+                    break;
+                case 1:
+                    gViewport->vp.vscale[0] = SCREEN_WIDTH * (gVsViewScale - 1.0f) * 2;
+                    gViewport->vp.vscale[1] = SCREEN_HEIGHT * (gVsViewScale - 1.0f) * 2;
+                    gViewport->vp.vscale[2] = G_MAXZ / 2;
+                    gViewport->vp.vscale[3] = 0;
+                    gViewport->vp.vtrans[0] = SCREEN_WIDTH * gVsViewScale * 2;
+                    gViewport->vp.vtrans[1] = SCREEN_HEIGHT * (2.0f - gVsViewScale) * 2;
+                    gViewport->vp.vtrans[2] = G_MAXZ / 2;
+                    gViewport->vp.vtrans[3] = 0;
+                    gDPSetScissor((*dList)++, G_SC_NON_INTERLACE, SCREEN_WIDTH / 2, SCREEN_MARGIN,
+                                  SCREEN_WIDTH - SCREEN_MARGIN, SCREEN_HEIGHT / 2);
+                    break;
+                case 2:
+                    gViewport->vp.vscale[0] = SCREEN_WIDTH * (gVsViewScale - 1.0f) * 2;
+                    gViewport->vp.vscale[1] = SCREEN_HEIGHT * (gVsViewScale - 1.0f) * 2;
+                    gViewport->vp.vscale[2] = G_MAXZ / 2;
+                    gViewport->vp.vscale[3] = 0;
+                    gViewport->vp.vtrans[0] = SCREEN_WIDTH * (2.0f - gVsViewScale) * 2;
+                    gViewport->vp.vtrans[1] = SCREEN_HEIGHT * gVsViewScale * 2;
+                    gViewport->vp.vtrans[2] = G_MAXZ / 2;
+                    gViewport->vp.vtrans[3] = 0;
+                    gDPSetScissor((*dList)++, G_SC_NON_INTERLACE, SCREEN_MARGIN, SCREEN_HEIGHT / 2, SCREEN_WIDTH / 2,
+                                  SCREEN_HEIGHT - SCREEN_MARGIN);
+                    break;
+                case 3:
+                    gViewport->vp.vscale[0] = SCREEN_WIDTH * (gVsViewScale - 1.0f) * 2;
+                    gViewport->vp.vscale[1] = SCREEN_HEIGHT * (gVsViewScale - 1.0f) * 2;
+                    gViewport->vp.vscale[2] = G_MAXZ / 2;
+                    gViewport->vp.vscale[3] = 0;
+                    gViewport->vp.vtrans[0] = SCREEN_WIDTH * gVsViewScale * 2;
+                    gViewport->vp.vtrans[1] = SCREEN_HEIGHT * gVsViewScale * 2;
+                    gViewport->vp.vtrans[2] = G_MAXZ / 2;
+                    gViewport->vp.vtrans[3] = 0;
+                    gDPSetScissor((*dList)++, G_SC_NON_INTERLACE, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2,
+                                  SCREEN_WIDTH - SCREEN_MARGIN, SCREEN_HEIGHT - SCREEN_MARGIN);
+                    break;
+                default:
+                    Game_InitFullViewport();
+                    break;
+            }
+            break;
+        case 1:
+        default:
+            Game_InitFullViewport();
+            break;
     }
     gSPViewport((*dList)++, gViewport++);
 }
@@ -289,7 +292,7 @@ void Game_Draw(s32 playerNum) {
             break;
         case DRAW_UNK_7:
             gPlayerNum = playerNum;
-            func_800A3CA0();
+            func_pause_800A3CA0();
             break;
         case DRAW_ENDING:
             Background_DrawStarfield();
@@ -570,28 +573,7 @@ void Game_Update(void) {
         }
 
         Wipe_Draw(WIPE_CIRCULAR, gCircleWipeFrame);
-        //         {
-        //     static mode = 0;
-        //     if(gControllerPress[gMainController].button & L_TRIG) {
-        //         mode = 1 - mode;
-        //     }
-        // if(gControllerHold[gMainController].button & L_TRIG) {
-        //     if(mode) {
-        //         gCircleWipeFrame++;
-        //     } else {
-        //         gCircleWipeFrame--;
-        //     }
-        //     if(gCircleWipeFrame > 41) {
-        //         gCircleWipeFrame = 41;
-        //     } else if (gCircleWipeFrame < 0) {
-        //         gCircleWipeFrame = 0;
-        //     }
-        // }
-        // RCP_SetupDL(&gMasterDisp, 0x53);
-        // gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
-        // Graphics_Printf("FADE PROGRESS: %d", gCircleWipeFrame);
-        // Graphics_DisplaySmallText(14, 9, 1.0f, 1.0f, D_801619A0);
-        // }
+
         if (!partialFill) {
             Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, gFillScreenRed,
                                    gFillScreenGreen, gFillScreenBlue, gFillScreenAlpha);
diff --git a/src/engine/fox_A48A0.c b/src/engine/fox_pause.c
index acda833b..ee7de964 100644
--- a/src/engine/fox_A48A0.c
+++ b/src/engine/fox_pause.c
@@ -1,6 +1,12 @@
 #include "global.h"
 
-void func_800A3CA0(void) {
+/*
+ * File: fox_pause.c
+ * System: Pause
+ * Description: Some unused pause code.
+ */
+
+void func_pause_800A3CA0(void) {
     Matrix_Push(&gGfxMatrix);
     Matrix_LookAt(gGfxMatrix, gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ, 0.0f, 1.0f, 0.0f,
                   MTXF_APPLY);
@@ -9,10 +15,11 @@ void func_800A3CA0(void) {
     Matrix_RotateX(gGfxMatrix, gControllerPress[gPlayerNum].stick_y * M_DTOR, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
     RCP_SetupDL_23();
+    // Missing DList
     Matrix_Pop(&gGfxMatrix);
 }
 
-void func_800A3E00(void) {
+void func_pause_800A3E00(void) {
     switch (D_ctx_80177868) {
         case 0:
             if (gNextGameStateTimer == 0) {