Add A6Gorgon Cutscene Record from N64 Hardware & Refactor code.

2 files changed, 186 insertions, 51 deletions

diff --git a/src/engine/cutscene_record.c b/src/engine/cutscene_record.c
new file mode 100644
index 00000000..611c2bbe
--- /dev/null
+++ b/src/engine/cutscene_record.c
@@ -0,0 +1,182 @@
+#include "global.h"
+#include "fox_record.h"
+
+void UpdateVisPerFrameFromRecording(Record* record, s32 maxFrames, int* frameCounter) {
+    int i;
+
+    if (*frameCounter > record[maxFrames - 1].frame) {
+        return;
+    }
+
+    for (i = 0; i < maxFrames; i++) {
+        if (*frameCounter == record[i].frame) {
+            gVIsPerFrame = record[i].vis;
+        }
+    }
+}
+
+int gWarpzoneCsFrameCount = 0;
+int gA6GorgonCsFrameCount = 0;
+
+Record gWarpzoneCsRecord[19] = {
+    { 2, 1 },  { 3, 3 },  { 4, 4 },   { 3, 8 },   { 2, 9 },   { 3, 52 },  { 2, 54 },  { 3, 69 },  { 2, 70 },  { 3, 75 },
+    { 2, 76 }, { 3, 79 }, { 2, 117 }, { 3, 118 }, { 2, 120 }, { 3, 145 }, { 2, 215 }, { 3, 216 }, { 2, 230 },
+};
+
+Record gA6GorgonCsRecord[12] = {
+    { 3, 0 },  { 4, 3 },  { 5, 6 },  { 4, 37 }, { 5, 38 }, { 4, 44 },
+    { 3, 53 }, { 4, 54 }, { 3, 57 }, { 4, 58 }, { 3, 59 }, { 2, 170 },
+};
+
+Record gEndingCsRecord[37] = {
+    { 2, 0 },    { 5, 1 },    { 2, 2 },    { 3, 277 },  { 2, 278 },  { 3, 340 },  { 2, 397 },  { 3, 537 },
+    { 2, 538 },  { 3, 548 },  { 2, 549 },  { 3, 568 },  { 2, 569 },  { 3, 620 },  { 2, 623 },  { 3, 803 },
+    { 2, 806 },  { 3, 814 },  { 2, 823 },  { 3, 1282 }, { 2, 1284 }, { 5, 3703 }, { 2, 3704 }, { 4, 3904 },
+    { 2, 3905 }, { 3, 4782 }, { 2, 4783 }, { 3, 4785 }, { 2, 4820 }, { 3, 4986 }, { 2, 6779 }, { 5, 6780 },
+    { 2, 6781 }, { 3, 6785 }, { 4, 6786 }, { 3, 6793 }, { 2, 6799 },
+};
+
+// MeCrusher destroy cutscene timings recorded from a real N64
+Record gMeCrusherCutsceneRecord[3] = {
+    { 2, 0 },
+    { 3, 200 },
+    { 2, 224 },
+};
+
+// Carrier destroy cutscene timings recorded from a real N64
+Record gCarrierCutsceneRecord[13] = {
+    { 2, 0 },
+    { 3, 2 },
+    { 4, 16 },
+    { 3, 50 },
+    { 4, 58 },
+    { 5, 67 },
+    { 4, 68 },
+    { 5, 71 },
+    { 4, 73 },
+    { 5, 74 },
+    { 4, 106 },
+    { 3, 146 },
+    { 2, 194 },
+};
+
+// Granga destroy cutscene timings recorded from a real N64
+Record gGrangaCutsceneRecord[13] = {
+    { 2, 0 },
+    { 3, 1 },
+    { 2, 5 },
+    { 3, 7 },
+    { 2, 52 },
+    { 3, 78 },
+    { 4, 103 },
+    { 3, 125 },
+    { 2, 153 },
+    { 3, 155 },
+    { 2, 157 },
+    { 3, 158 },
+    { 2, 160 },
+};
+
+// Train cutscene timings recorded from a real N64
+Record gMacbethCutsceneRecord[14] = {
+    // Train breaking barriers
+    { 2, 0 },
+    { 3, 2 },
+    { 2, 31 },
+    { 3, 400 },
+    { 2, 418 },
+    { 3, 433 },
+    { 4, 435 },
+    { 3, 444 },
+    { 2, 509 },
+    // { 3, 559 },
+    // { 2, 581 },
+    // { 3, 587 },
+    // Explosions
+    { 2, 589 },
+    { 3, 714 },
+    { 4, 821 },
+    { 5, 849 },
+    { 2, 942 },
+};
+
+// clang-format off
+
+// After defeating Andross
+/*
+03 00 00 00 02 00 00 08 03 00 00 13 02 00 00 23 03 00 00 9C 02 00 00 A6 03 00 00 C1 04 00 00 C6 03 00 00 C7 04 00 00 C9
+03 00 00 CD 04 00 00 CF 03 00 00 D7 04 00 00 EA 03 00 00 EC 04 00 00 ED 03 00 00 EF 04 00 00 F4 03 00 00 F5 04 00 00 F6
+03 00 01 10 04 00 01 12 03 00 01 22 04 00 01 24 03 00 01 27 04 00 01 2D 03 00 01 2E 04 00 01 30 03 00 01 31 04 00 01 33
+03 00 01 4C 04 00 01 4E 03 00 01 4F
+*/
+Record gAndrossRobotKillCutscene1[25] = {
+    { 3, 0 },
+    { 2, 8 },
+    { 3, 19 },
+    { 2, 35 },
+    { 3, 156 },
+    { 2, 166 },
+    { 3, 193 },
+    { 4, 198 },
+    { 3, 199 },
+    { 4, 201 },
+    { 3, 205 },
+    { 4, 207 },
+    { 3, 215 },
+    { 4, 234 },
+    // { 3, 236 },
+    { 4, 237 },
+    { 3, 239 },
+    { 4, 244 },
+    // { 3, 245 },
+    { 4, 246 },
+    // { 3, 272 },
+    { 4, 274 },
+    // { 3, 290 },
+    { 4, 292 },
+    // { 3, 295 }, // too much?
+    { 4, 301 },
+    // { 3, 302 },
+    { 4, 304 },
+    // { 3, 305 },
+    { 4, 307 },
+    // { 3, 332 },
+    { 4, 334 },
+    // { 3, 335 },
+    { 2, 339 },
+};
+
+/*
+04 00 00 00 02 00 00 01 05 00 00 02 02 00 00 03 03 00 00 2A 02 00 00 2B 03 00 00 39 02 00 00 3A 03 00 00 3F 02 00 00 45
+03 00 00 9E 04 00 00 A1 05 00 00 A3 04 00 00 B6 03 00 00 B9 04 00 00 BD 05 00 00 C1 04 00 00 CD 03 00 00 CF 02 00 00 D3
+*/
+Record gAndrossRobotKillCutscene2[20] = {
+    { 4, 0 },
+    { 2, 1 },
+    { 5, 2 },
+    { 2, 3 },
+    { 3, 42 },
+    { 2, 43 },
+    { 3, 57 },
+    { 2, 58 },
+    { 3, 63 },
+    { 2, 69 },
+    { 3, 158 },
+    { 4, 161 },
+    { 5, 163 },
+    { 4, 182 },
+    { 3, 185 },
+    { 4, 189 },
+    { 5, 193 },
+    { 4, 205 },
+    { 3, 207 },
+    { 2, 211 },
+};
+// clang-format on
+
+// SyRobot destroy cutscene timings recorded from a real N64
+Record gSyRobotCutsceneRecord[3] = {
+    { 2, 0 },
+    { 3, 129 },
+    { 2, 230 },
+};
diff --git a/src/engine/fox_demo.c b/src/engine/fox_demo.c
index 8b243ca6..ce091ef0 100644
--- a/src/engine/fox_demo.c
+++ b/src/engine/fox_demo.c
@@ -22,55 +22,6 @@
 #include "fox_co.h"
 #include "fox_record.h"
 
-int gWarpzoneCsFrameCount = 0;
-
-Record gWarpzoneCsRecord[] = {
-    { 2, 1 },  { 3, 3 },  { 4, 4 },   { 3, 8 },   { 2, 9 },   { 3, 52 },  { 2, 54 },  { 3, 69 },  { 2, 70 },  { 3, 75 },
-    { 2, 76 }, { 3, 79 }, { 2, 117 }, { 3, 118 }, { 2, 120 }, { 3, 145 }, { 2, 215 }, { 3, 216 }, { 2, 230 },
-};
-
-void UpdateVisPerFrameFromRecording(Record* record, s32 maxFrames) {
-    int i;
-
-    if (gCsFrameCount > record[maxFrames - 1].frame) {
-        return;
-    }
-
-    for (i = 0; i < maxFrames; i++) {
-        if (gCsFrameCount == record[i].frame) {
-            gVIsPerFrame = record[i].vis;
-        }
-    }
-}
-
-void UpdateVisPerFrameFromRecording_Warpzone(Record* record, s32 maxFrames) {
-    int i;
-
-    if (gWarpzoneCsFrameCount > record[maxFrames - 1].frame) {
-        return;
-    }
-
-    for (i = 0; i < maxFrames; i++) {
-        if (gWarpzoneCsFrameCount == record[i].frame) {
-            gVIsPerFrame = record[i].vis;
-        }
-    }
-}
-
-void UpdateVisPerFrameFromRecording_Ending(Record* record, s32 maxFrames) {
-    int i;
-
-    if (gGameFrameCount > record[maxFrames - 1].frame) {
-        return;
-    }
-
-    for (i = 0; i < maxFrames; i++) {
-        if (gGameFrameCount == record[i].frame) {
-            gVIsPerFrame = record[i].vis;
-        }
-    }
-}
-
 void func_demo_80048AC0(TeamId teamId) {
     s32 teamShield;
 
@@ -448,8 +399,9 @@ void Cutscene_EnterWarpZone(Player* player) {
     s32 var_v0;
     s32 pad[4];
 
+    // @Port: Vi recording
     gWarpzoneCsFrameCount++;
-    UpdateVisPerFrameFromRecording_Warpzone(gWarpzoneCsRecord, ARRAY_COUNT(gWarpzoneCsRecord));
+    UpdateVisPerFrameFromRecording(gWarpzoneCsRecord, ARRAY_COUNT(gWarpzoneCsRecord), &gWarpzoneCsFrameCount);
 
     player->pos.x += player->vel.x;
     player->flags_228 = 0;
@@ -982,7 +934,8 @@ void Cutscene_CoComplete2(Player* player) {
 
     Math_SmoothStepToF(&player->camRoll, 0.0f, 0.1f, 5.0f, 0.01f);
 
-    UpdateVisPerFrameFromRecording(gCarrierCutsceneRecord, ARRAY_COUNT(gCarrierCutsceneRecord));
+    // @Port: Vi recording
+    UpdateVisPerFrameFromRecording(gCarrierCutsceneRecord, ARRAY_COUNT(gCarrierCutsceneRecord), &gCsFrameCount);
 
     switch (player->csState) {
         case 10: