diff --git a/include/z64cutscene.h b/include/z64cutscene.h
index 7713abc7c5..a9d52c6c55 100644
--- a/include/z64cutscene.h
+++ b/include/z64cutscene.h
@@ -346,36 +346,35 @@ typedef enum CutsceneDestination {
 
 /*
 correlation with `enum SceneLayer`:
-  CS_INDEX_NEXT_USED:  [SCENE_LAYER_CHILD_DAY .. SCENE_LAYER_ADULT_NIGHT]
-  CS_INDEX_ENTRANCE_*: SCENE_LAYER_CUTSCENE_FIRST + (cutscene index & 0xF)
+  CS_INDEX_NEXT_USED: [SCENE_LAYER_CHILD_DAY .. SCENE_LAYER_ADULT_NIGHT]
+  CS_INDEX_*:         SCENE_LAYER_CUTSCENE_FIRST + (cutscene index & 0xF)
 
 correlation with `enum EntranceIndex`
-  CS_INDEX_NEXT_USED:  base entrance index + scene layer
-  CS_INDEX_ENTRANCE_*: base entrance index + scene layer
+  CS_INDEX_NEXT_USED: base entrance index + scene layer
+  CS_INDEX_*:         base entrance index + scene layer
 
 `z_select.c` naming:
-  CS_INDEX_NONE:       "Stage: night"
-  CS_INDEX_LAST:       "Stage: day"
-  CS_INDEX_ENTRANCE_*: "Stage demo 0*", between [CS_INDEX_ENTRANCE_4 .. CS_INDEX_ENTRANCE_E]
+  CS_INDEX_NONE: "Stage: night"
+  CS_INDEX_LAST: "Stage: day"
+  CS_INDEX_*:    "Stage demo 0*"
 */
 typedef enum CutsceneIndex {
     CS_INDEX_NONE = 0x0000,
-    CS_INDEX_NEXT_USED = 0xFFEF,  // a guess as per `z_play.c:328`
-    CS_INDEX_ENTRANCE_4 = 0xFFF0, // e.g. ENTR_TEMPLE_OF_TIME_0_4
-    CS_INDEX_ENTRANCE_5 = 0xFFF1,
-    CS_INDEX_ENTRANCE_6 = 0xFFF2,
-    CS_INDEX_ENTRANCE_7 = 0xFFF3,
-    CS_INDEX_ENTRANCE_8 = 0xFFF4,
-    CS_INDEX_ENTRANCE_9 = 0xFFF5,
-    CS_INDEX_ENTRANCE_A = 0xFFF6,
-    CS_INDEX_ENTRANCE_B = 0xFFF7,
-    CS_INDEX_ENTRANCE_C = 0xFFF8,
-    CS_INDEX_ENTRANCE_D = 0xFFF9,
-    CS_INDEX_ENTRANCE_E = 0xFFFA,
-    CS_INDEX_ENTRANCE_F = 0xFFFB, // e.g. ENTR_TEMPLE_OF_TIME_0_15
-    CS_INDEX_RESET = 0xFFFD,      // a guess as per `z_play.c:333`
-    CS_INDEX_STOP = 0xFFFF,       // a guess as per `z_demo.c:1369` and `z_demo.c:1372`
-    CS_INDEX_LAST = 0x8000        // unknown, `z_demo.c:747` for CS_DEST_DEATH_MOUNTAIN_TRAIL
+    CS_INDEX_NEXT_USED = 0xFFEF, // a guess as per `z_play.c:328`
+    CS_INDEX_0 = 0xFFF0,         // e.g. ENTR_TEMPLE_OF_TIME_0_4
+    CS_INDEX_1 = 0xFFF1,
+    CS_INDEX_2 = 0xFFF2,
+    CS_INDEX_3 = 0xFFF3,
+    CS_INDEX_4 = 0xFFF4,
+    CS_INDEX_5 = 0xFFF5,
+    CS_INDEX_6 = 0xFFF6,
+    CS_INDEX_7 = 0xFFF7,
+    CS_INDEX_8 = 0xFFF8,
+    CS_INDEX_9 = 0xFFF9,
+    CS_INDEX_A = 0xFFFA,     // e.g. ENTR_TEMPLE_OF_TIME_0_14
+    CS_INDEX_RESET = 0xFFFD, // a guess as per `z_play.c:333`
+    CS_INDEX_STOP = 0xFFFF,  // a guess as per `z_demo.c:1369` and `z_demo.c:1372`
+    CS_INDEX_LAST = 0x8000   // unknown, `z_demo.c:747` for CS_DEST_DEATH_MOUNTAIN_TRAIL
 } CutsceneIndex;
 
 typedef union CsCmdCam {
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index d9c6de9361..dde7964102 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -177,7 +177,7 @@ void Cutscene_StopManual(PlayState* play, CutsceneContext* csCtx) {
 }
 
 void Cutscene_UpdateManual(PlayState* play, CutsceneContext* csCtx) {
-    if (gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4) {
+    if (gSaveContext.save.cutsceneIndex < CS_INDEX_0) {
         sManualCutsceneHandlers[csCtx->state](play, csCtx);
     }
 }
@@ -212,7 +212,7 @@ void Cutscene_UpdateScripted(PlayState* play, CutsceneContext* csCtx) {
         gSaveContext.cutsceneTrigger = 1;
     }
 
-    if (gSaveContext.save.cutsceneIndex >= CS_INDEX_ENTRANCE_4) {
+    if (gSaveContext.save.cutsceneIndex >= CS_INDEX_0) {
         Cutscene_SetupScripted(play, csCtx);
         sScriptedCutsceneHandlers[csCtx->state](play, csCtx);
     }
@@ -596,49 +596,49 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
         switch (cmd->destination) {
             case CS_DEST_CUTSCENE_MAP_GANON_HORSE:
                 play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_1;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_CUTSCENE_MAP_THREE_GODDESSES:
                 play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FILL_WHITE;
                 break;
 
             case CS_DEST_GERUDO_VALLEY_DIN_PART_1:
                 play->nextEntranceIndex = ENTR_GERUDO_VALLEY_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_1;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FILL_WHITE;
                 break;
 
             case CS_DEST_DEATH_MOUNTAIN_TRAIL_NAYRU:
                 play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FILL_WHITE;
                 break;
 
             case CS_DEST_KOKIRI_FOREST_FARORE:
                 play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FILL_WHITE;
                 break;
 
             case CS_DEST_CUTSCENE_MAP_TRIFORCE_CREATION:
                 play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_6;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_2;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FILL_WHITE;
                 break;
 
             case CS_DEST_KOKIRI_FOREST_RECEIVE_KOKIRI_EMERALD:
                 play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_6;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_2;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_INSTANT;
                 break;
@@ -651,7 +651,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                     SET_EVENTCHKINF(EVENTCHKINF_45);
                     play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
                     play->transitionTrigger = TRANS_TRIGGER_START;
-                    gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_7;
+                    gSaveContext.save.cutsceneIndex = CS_INDEX_3;
                     play->transitionType = TRANS_TYPE_INSTANT;
                 } else {
                     if (!IS_CUTSCENE_LAYER) {
@@ -671,21 +671,21 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
 
             case CS_DEST_GERUDO_VALLEY_DIN_PART_2:
                 play->nextEntranceIndex = ENTR_GERUDO_VALLEY_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FILL_BROWN;
                 break;
 
             case CS_DEST_LINKS_HOUSE_INTRO:
                 play->nextEntranceIndex = ENTR_LINKS_HOUSE_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_KOKIRI_FOREST_INTRO:
                 play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_7;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_3;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
@@ -712,21 +712,21 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
             case CS_DEST_TEMPLE_OF_TIME_KOKIRI_EMERALD_RESTORED:
                 play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_8;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_4;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
 
             case CS_DEST_TEMPLE_OF_TIME_GORON_RUBY_RESTORED:
                 play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_9;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_5;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
 
             case CS_DEST_TEMPLE_OF_TIME_ZORAS_SAPPHIRE_RESTORED:
                 play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_A;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_6;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
 
@@ -750,7 +750,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
             case CS_DEST_LAKE_HYLIA_WATER_RESTORED:
                 play->nextEntranceIndex = ENTR_LAKE_HYLIA_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
 
@@ -758,14 +758,14 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 Item_Give(play, ITEM_SONG_REQUIEM);
                 play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
 
             case CS_DEST_CUTSCENE_MAP_GANONDORF_DEFEATED_CREDITS:
                 play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_C;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_8;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
 
@@ -779,28 +779,28 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 play->linkAgeOnLoad = LINK_AGE_ADULT;
                 play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
 
             case CS_DEST_TEMPLE_OF_TIME_KOKIRI_EMERALD_RESTORED_2:
                 play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_8;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_4;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
 
             case CS_DEST_TEMPLE_OF_TIME_GORON_RUBY_RESTORED_2:
                 play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_9;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_5;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
 
             case CS_DEST_TEMPLE_OF_TIME_ZORAS_SAPPHIRE_RESTORED_2:
                 play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_A;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_6;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
 
@@ -830,7 +830,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 play->linkAgeOnLoad = LINK_AGE_CHILD;
                 play->nextEntranceIndex = ENTR_HYRULE_FIELD_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_6;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_2;
                 play->transitionType = TRANS_TYPE_INSTANT;
                 break;
 
@@ -843,28 +843,28 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
             case CS_DEST_CUTSCENE_MAP_GANONDORF_FROM_MASTER_SWORD:
                 play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_7;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_3;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
 
             case CS_DEST_HYRULE_FIELD_INTRO_DREAM:
                 play->nextEntranceIndex = ENTR_HYRULE_FIELD_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                 play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
                 break;
 
             case CS_DEST_CUTSCENE_MAP_SHEIKAH_LEGEND:
                 play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_8;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_4;
                 play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
                 break;
 
             case CS_DEST_TEMPLE_OF_TIME_ZELDA_REVEAL:
                 play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_D;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_9;
                 play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
                 break;
 
@@ -872,7 +872,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 play->linkAgeOnLoad = LINK_AGE_ADULT;
                 play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_E;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_A;
                 play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
                 break;
 
@@ -885,7 +885,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
             case CS_DEST_KAKARIKO_VILLAGE_DRAIN_WELL:
                 play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_6;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_2;
                 play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
                 break;
 
@@ -915,7 +915,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 SET_EVENTCHKINF(EVENTCHKINF_54);
                 play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_1;
                 play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
                 break;
 
@@ -940,14 +940,14 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
 
             case CS_DEST_HYRULE_FIELD_FROM_ZELDAS_COURTYARD:
                 play->nextEntranceIndex = ENTR_HYRULE_FIELD_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_C;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_8;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_WHITE, TCS_SLOW);
                 break;
 
             case CS_DEST_TEMPLE_OF_TIME_SONG_OF_TIME:
                 play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_B;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_7;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_INSTANT;
                 break;
@@ -965,56 +965,56 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
 #endif
                 play->linkAgeOnLoad = LINK_AGE_CHILD;
                 play->nextEntranceIndex = ENTR_GERUDO_VALLEY_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_6;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_2;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_GERUDO_FORTRESS_CREDITS:
                 play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_1;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_KAKARIKO_VILLAGE_CREDITS:
                 play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_8;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_4;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_DEATH_MOUNTAIN_TRAIL_CREDITS_PART_1:
                 play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_7;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_3;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_GORON_CITY_CREDITS:
                 play->nextEntranceIndex = ENTR_GORON_CITY_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_1;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_LAKE_HYLIA_CREDITS:
                 play->nextEntranceIndex = ENTR_LAKE_HYLIA_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_1;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_ZORAS_FOUNTAIN_CREDITS:
                 play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_6;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_2;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_ZORAS_DOMAIN_CREDITS:
                 play->nextEntranceIndex = ENTR_ZORAS_DOMAIN_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
@@ -1022,21 +1022,21 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
             case CS_DEST_KOKIRI_FOREST_CREDITS_PART_1:
                 play->linkAgeOnLoad = LINK_AGE_ADULT;
                 play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_A;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_6;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_KOKIRI_FOREST_CREDITS_PART_2:
                 play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_B;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_7;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_HYRULE_FIELD_CREDITS:
                 play->nextEntranceIndex = ENTR_HYRULE_FIELD_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_9;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_5;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
@@ -1044,7 +1044,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
             case CS_DEST_LON_LON_RANCH_CREDITS_PART_1_ALT:
                 play->linkAgeOnLoad = LINK_AGE_CHILD;
                 play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_6;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_2;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
@@ -1064,7 +1064,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
             case CS_DEST_CUTSCENE_MAP_DEKU_SPROUT_PART_2:
                 play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_9;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_5;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
@@ -1077,7 +1077,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
             case CS_DEST_DEATH_MOUNTAIN_TRAIL_CREDITS_PART_2:
                 play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_8;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_4;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
                 break;
@@ -1090,14 +1090,14 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 play->linkAgeOnLoad = LINK_AGE_CHILD;
                 play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_1;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_ZELDAS_COURTYARD_CREDITS:
                 play->nextEntranceIndex = ENTR_CASTLE_COURTYARD_ZELDA_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
                 break;
@@ -1106,14 +1106,14 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 play->linkAgeOnLoad = LINK_AGE_CHILD;
                 play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_6;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_2;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_LON_LON_RANCH_CREDITS_PART_2:
                 play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_7;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_3;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
                 break;
@@ -1122,7 +1122,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 play->linkAgeOnLoad = LINK_AGE_CHILD;
                 play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_8;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_4;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
@@ -1130,7 +1130,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 play->linkAgeOnLoad = LINK_AGE_ADULT;
                 play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_9;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_5;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
@@ -1138,14 +1138,14 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 play->linkAgeOnLoad = LINK_AGE_CHILD;
                 play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_A;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_6;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
             case CS_DEST_LON_LON_RANCH_CREDITS_PART_6:
                 play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_B;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_7;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
@@ -1185,7 +1185,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                     GET_EVENTCHKINF(EVENTCHKINF_4A)) {
                     play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
                     play->transitionTrigger = TRANS_TRIGGER_START;
-                    gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_7;
+                    gSaveContext.save.cutsceneIndex = CS_INDEX_3;
                     play->transitionType = TRANS_TYPE_FADE_BLACK;
                 } else {
                     switch (gSaveContext.sceneLayer) {
@@ -1204,7 +1204,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                         case 10:
                             play->nextEntranceIndex = ENTR_LAKE_HYLIA_0;
                             play->transitionTrigger = TRANS_TRIGGER_START;
-                            gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+                            gSaveContext.save.cutsceneIndex = CS_INDEX_0;
                             play->transitionType = TRANS_TYPE_FADE_WHITE;
                             break;
                     }
@@ -1215,7 +1215,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) {
                     play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
                     play->transitionTrigger = TRANS_TRIGGER_START;
-                    gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+                    gSaveContext.save.cutsceneIndex = CS_INDEX_1;
                     play->transitionType = TRANS_TYPE_FADE_WHITE_FAST;
                 } else {
                     SET_EVENTCHKINF(EVENTCHKINF_C8);
@@ -1230,7 +1230,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT)) {
                     play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
                     play->transitionTrigger = TRANS_TRIGGER_START;
-                    gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+                    gSaveContext.save.cutsceneIndex = CS_INDEX_1;
                     play->transitionType = TRANS_TYPE_FADE_WHITE_FAST;
                 } else {
                     play->nextEntranceIndex = ENTR_GRAVEYARD_8;
@@ -1256,7 +1256,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
 
             case CS_DEST_KOKIRI_FOREST_FROM_CHAMBER_OF_SAGES:
                 play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_C;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_8;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
@@ -1277,7 +1277,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
             case CS_DEST_HYRULE_FIELD_TITLE_SCREEN:
                 play->nextEntranceIndex = ENTR_HYRULE_FIELD_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_7;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_3;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
@@ -1286,7 +1286,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                     case TITLE_DEMO_SPIRIT_TEMPLE:
                         play->nextEntranceIndex = ENTR_SPIRIT_TEMPLE_BOSS_0;
                         play->transitionTrigger = TRANS_TRIGGER_START;
-                        gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_6;
+                        gSaveContext.save.cutsceneIndex = CS_INDEX_2;
                         play->transitionType = TRANS_TYPE_FADE_BLACK;
                         sTitleDemoDestination++;
                         break;
@@ -1294,7 +1294,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                     case TITLE_DEMO_DEATH_MOUNTAIN_CRATER:
                         play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_0;
                         play->transitionTrigger = TRANS_TRIGGER_START;
-                        gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+                        gSaveContext.save.cutsceneIndex = CS_INDEX_1;
                         play->transitionType = TRANS_TYPE_FADE_BLACK;
                         sTitleDemoDestination++;
                         break;
@@ -1302,7 +1302,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                     case TITLE_DEMO_GANONDORF_HORSE:
                         play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
                         play->transitionTrigger = TRANS_TRIGGER_START;
-                        gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_A;
+                        gSaveContext.save.cutsceneIndex = CS_INDEX_6;
                         play->transitionType = TRANS_TYPE_FADE_BLACK;
                         sTitleDemoDestination = TITLE_DEMO_SPIRIT_TEMPLE;
                         break;
@@ -1312,7 +1312,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
             case CS_DEST_GRAVEYARD_SUNS_SONG_PART_2:
                 play->nextEntranceIndex = ENTR_GRAVEYARD_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_1;
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
 
@@ -1405,7 +1405,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 Audio_SetSfxBanksMute(0x6F);
                 play->linkAgeOnLoad = LINK_AGE_ADULT;
                 play->nextEntranceIndex = ENTR_HYRULE_FIELD_0;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_B;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_7;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
@@ -2214,7 +2214,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
 }
 
 void CutsceneHandler_RunScript(PlayState* play, CutsceneContext* csCtx) {
-    if (gSaveContext.save.cutsceneIndex >= CS_INDEX_ENTRANCE_4) {
+    if (gSaveContext.save.cutsceneIndex >= CS_INDEX_0) {
 #if OOT_DEBUG
         if (BREG(0) != 0) {
             Gfx* displayList;
@@ -2296,7 +2296,7 @@ void Cutscene_SetupScripted(PlayState* play, CutsceneContext* csCtx) {
         gSaveContext.save.cutsceneIndex = CS_INDEX_RESET;
     }
 
-    if ((gSaveContext.save.cutsceneIndex >= CS_INDEX_ENTRANCE_4) && (csCtx->state == CS_STATE_IDLE)) {
+    if ((gSaveContext.save.cutsceneIndex >= CS_INDEX_0) && (csCtx->state == CS_STATE_IDLE)) {
         CutsceneFlags_Unset(play, 0);
 
         sCurTextId = 0;
@@ -2378,7 +2378,7 @@ void Cutscene_HandleEntranceTriggers(PlayState* play) {
 
         if ((gSaveContext.save.entranceIndex == entranceCutscene->entrance) &&
             (!Flags_GetEventChkInf(entranceCutscene->flag) || (entranceCutscene->flag == EVENTCHKINF_EPONA_OBTAINED)) &&
-            (gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4) && ((u8)gSaveContext.save.linkAge == requiredAge) &&
+            (gSaveContext.save.cutsceneIndex < CS_INDEX_0) && ((u8)gSaveContext.save.linkAge == requiredAge) &&
             (gSaveContext.respawnFlag <= 0)) {
             Flags_SetEventChkInf(entranceCutscene->flag);
             Cutscene_SetScript(play, entranceCutscene->script);
@@ -2393,32 +2393,32 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) {
     PRINTF("\ngame_info.mode=[%d] restart_flag", ((void)0, gSaveContext.respawnFlag));
 
     if ((gSaveContext.gameMode == GAMEMODE_NORMAL) && (gSaveContext.respawnFlag <= 0) &&
-        (gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4)) {
+        (gSaveContext.save.cutsceneIndex < CS_INDEX_0)) {
         if ((gSaveContext.save.entranceIndex == ENTR_DESERT_COLOSSUS_1) && !Flags_GetEventChkInf(EVENTCHKINF_AC)) {
             Flags_SetEventChkInf(EVENTCHKINF_AC);
             gSaveContext.save.entranceIndex = ENTR_DESERT_COLOSSUS_0;
-            gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+            gSaveContext.save.cutsceneIndex = CS_INDEX_0;
         } else if ((gSaveContext.save.entranceIndex == ENTR_KAKARIKO_VILLAGE_0) && LINK_IS_ADULT &&
                    GET_EVENTCHKINF(EVENTCHKINF_48) && GET_EVENTCHKINF(EVENTCHKINF_49) &&
                    GET_EVENTCHKINF(EVENTCHKINF_4A) && !Flags_GetEventChkInf(EVENTCHKINF_AA)) {
             Flags_SetEventChkInf(EVENTCHKINF_AA);
-            gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+            gSaveContext.save.cutsceneIndex = CS_INDEX_0;
         } else if ((gSaveContext.save.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_C1)) {
             Flags_SetEventChkInf(EVENTCHKINF_C1);
             Item_Give(play, ITEM_OCARINA_FAIRY);
             gSaveContext.save.entranceIndex = ENTR_LOST_WOODS_0;
-            gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+            gSaveContext.save.cutsceneIndex = CS_INDEX_0;
         } else if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
                    LINK_IS_ADULT && !Flags_GetEventChkInf(EVENTCHKINF_C4) &&
                    (gEntranceTable[((void)0, gSaveContext.save.entranceIndex)].sceneId == SCENE_TEMPLE_OF_TIME)) {
             Flags_SetEventChkInf(EVENTCHKINF_C4);
             gSaveContext.save.entranceIndex = ENTR_TEMPLE_OF_TIME_0;
-            gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_C;
+            gSaveContext.save.cutsceneIndex = CS_INDEX_8;
         } else if (!Flags_GetEventChkInf(EVENTCHKINF_C7) &&
                    (gEntranceTable[((void)0, gSaveContext.save.entranceIndex)].sceneId == SCENE_GANON_BOSS)) {
             Flags_SetEventChkInf(EVENTCHKINF_C7);
             gSaveContext.save.entranceIndex = ENTR_GANON_BOSS_0;
-            gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
+            gSaveContext.save.cutsceneIndex = CS_INDEX_0;
         }
     }
 }
diff --git a/src/code/z_horse.c b/src/code/z_horse.c
index 69b96e22a4..6b57f0bc3a 100644
--- a/src/code/z_horse.c
+++ b/src/code/z_horse.c
@@ -192,7 +192,7 @@ void func_8006D684(PlayState* play, Player* player) {
                 (((void)0, gSaveContext.save.cutsceneIndex) == D_8011F9B8[i].cutsceneIndex)) {
                 if (D_8011F9B8[i].type == 7) {
                     if ((play->sceneId == SCENE_LON_LON_RANCH) &&
-                        (((void)0, gSaveContext.save.cutsceneIndex) == CS_INDEX_ENTRANCE_5)) {
+                        (((void)0, gSaveContext.save.cutsceneIndex) == CS_INDEX_1)) {
                         D_8011F9B8[i].pos.x = player->actor.world.pos.x;
                         D_8011F9B8[i].pos.y = player->actor.world.pos.y;
                         D_8011F9B8[i].pos.z = player->actor.world.pos.z;
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index 9d9a3f79c3..cdd6b98e56 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -66,7 +66,7 @@ void KaleidoSetup_Update(PlayState* play) {
 
     if (!IS_PAUSED(pauseCtx) && play->gameOverCtx.state == GAMEOVER_INACTIVE &&
         play->transitionTrigger == TRANS_TRIGGER_OFF && play->transitionMode == TRANS_MODE_OFF &&
-        gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4 && gSaveContext.nextCutsceneIndex < CS_INDEX_ENTRANCE_4 &&
+        gSaveContext.save.cutsceneIndex < CS_INDEX_0 && gSaveContext.nextCutsceneIndex < CS_INDEX_0 &&
         !Play_InCsMode(play) && play->shootingGalleryStatus <= 1 &&
         gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY && gSaveContext.magicState != MAGIC_STATE_FILL &&
         (play->sceneId != SCENE_BOMBCHU_BOWLING_ALLEY || !Flags_GetSwitch(play, 0x38))) {
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 58c2d194a2..a8560255be 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -4294,7 +4294,7 @@ void Message_Update(PlayState* play) {
 
                     if (msgCtx->textId != 0x2061 && msgCtx->textId != 0x2025 && msgCtx->textId != 0x208C &&
                         ((msgCtx->textId < 0x88D || msgCtx->textId >= 0x893) || msgCtx->choiceIndex != 0) &&
-                        (msgCtx->textId != 0x3055 && gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4)) {
+                        (msgCtx->textId != 0x3055 && gSaveContext.save.cutsceneIndex < CS_INDEX_0)) {
                         PRINTF("=== day_time=%x ", ((void)0, gSaveContext.save.cutsceneIndex));
                         if (play->activeCamId == CAM_ID_MAIN) {
                             if (gSaveContext.prevHudVisibilityMode == HUD_VISIBILITY_NO_CHANGE ||
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 739b6debd3..76a7f0fb53 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -644,8 +644,8 @@ void func_80083108(PlayState* play) {
     s16 i;
     s16 sp28 = false;
 
-    if ((gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4) ||
-        ((play->sceneId == SCENE_LON_LON_RANCH) && (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_4))) {
+    if ((gSaveContext.save.cutsceneIndex < CS_INDEX_0) ||
+        ((play->sceneId == SCENE_LON_LON_RANCH) && (gSaveContext.save.cutsceneIndex == CS_INDEX_0))) {
         gSaveContext.forceRisingButtonAlphas = false;
 
         if ((player->stateFlags1 & PLAYER_STATE1_23) || (play->shootingGalleryStatus > 1) ||
diff --git a/src/code/z_play.c b/src/code/z_play.c
index d8216c4890..353252477d 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -55,8 +55,7 @@ void Play_SetViewpoint(PlayState* this, s16 viewpoint) {
 
     this->viewpoint = viewpoint;
 
-    if ((R_SCENE_CAM_TYPE != SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT) &&
-        (gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4)) {
+    if ((R_SCENE_CAM_TYPE != SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT) && (gSaveContext.save.cutsceneIndex < CS_INDEX_0)) {
         // Play a sfx when the player toggles the camera
         Audio_PlaySfxGeneral((viewpoint == VIEWPOINT_LOCKED) ? NA_SE_SY_CAMERA_ZOOM_DOWN : NA_SE_SY_CAMERA_ZOOM_UP,
                              &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
@@ -347,7 +346,7 @@ void Play_Init(GameState* thisx) {
 
     Cutscene_HandleConditionalTriggers(this);
 
-    if (gSaveContext.gameMode != GAMEMODE_NORMAL || gSaveContext.save.cutsceneIndex >= CS_INDEX_ENTRANCE_4) {
+    if (gSaveContext.gameMode != GAMEMODE_NORMAL || gSaveContext.save.cutsceneIndex >= CS_INDEX_0) {
         gSaveContext.nayrusLoveTimer = 0;
         Magic_Reset(this);
         gSaveContext.sceneLayer = SCENE_LAYER_CUTSCENE_FIRST + (gSaveContext.save.cutsceneIndex & 0xF);
@@ -597,7 +596,7 @@ void Play_Update(PlayState* this) {
 
                         Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_NOTHING);
 
-                        if (gSaveContext.save.cutsceneIndex >= CS_INDEX_ENTRANCE_4) {
+                        if (gSaveContext.save.cutsceneIndex >= CS_INDEX_0) {
                             sceneLayer = SCENE_LAYER_CUTSCENE_FIRST + (gSaveContext.save.cutsceneIndex & 0xF);
                         }
 
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index 80260dfc92..78fa0dd684 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -382,7 +382,7 @@ BAD_RETURN(s32) Scene_CommandTimeSettings(PlayState* play, SceneCmd* cmd) {
     play->envCtx.sunPos.y = (Math_CosS(((void)0, gSaveContext.save.dayTime) - CLOCK_TIME(12, 0)) * 120.0f) * 25.0f;
     play->envCtx.sunPos.z = (Math_CosS(((void)0, gSaveContext.save.dayTime) - CLOCK_TIME(12, 0)) * 20.0f) * 25.0f;
 
-    if (((play->envCtx.sceneTimeSpeed == 0) && (gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4)) ||
+    if (((play->envCtx.sceneTimeSpeed == 0) && (gSaveContext.save.cutsceneIndex < CS_INDEX_0)) ||
         (gSaveContext.save.entranceIndex == ENTR_LAKE_HYLIA_8)) {
 #if OOT_VERSION >= PAL_1_0
         gSaveContext.skyboxTime = ((void)0, gSaveContext.save.dayTime);
@@ -488,7 +488,7 @@ BAD_RETURN(s32) Scene_CommandMiscSettings(PlayState* play, SceneCmd* cmd) {
 
     if (((play->sceneId >= SCENE_HYRULE_FIELD) && (play->sceneId <= SCENE_OUTSIDE_GANONS_CASTLE)) ||
         ((play->sceneId >= SCENE_MARKET_ENTRANCE_DAY) && (play->sceneId <= SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS))) {
-        if (gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4) {
+        if (gSaveContext.save.cutsceneIndex < CS_INDEX_0) {
             gSaveContext.save.info.worldMapAreaData |= gBitFlags[((void)0, gSaveContext.worldMapArea)];
             PRINTF("０００  ａｒｅａ＿ａｒｒｉｖａｌ＝%x (%d)\n", gSaveContext.save.info.worldMapAreaData,
                    ((void)0, gSaveContext.worldMapArea));
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index 854f1f4439..2773e8b371 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -793,7 +793,7 @@ void Sram_InitSave(FileSelectState* fileSelect, SramContext* sramCtx) {
     gSaveContext.save.entranceIndex = ENTR_LINKS_HOUSE_0;
     gSaveContext.save.linkAge = LINK_AGE_CHILD;
     gSaveContext.save.dayTime = CLOCK_TIME(10, 0);
-    gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
+    gSaveContext.save.cutsceneIndex = CS_INDEX_1;
 
 #if OOT_DEBUG
     if (fileSelect->buttonIndex == 0) {
diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
index 086667b62a..f1fcb4801e 100644
--- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
@@ -45,7 +45,7 @@ void BgInGate_Init(Actor* thisx, PlayState* play) {
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
 
     if ((play->sceneId != SCENE_LON_LON_RANCH || !LINK_IS_ADULT) ||
-        (GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED) && (gSaveContext.save.cutsceneIndex != CS_INDEX_ENTRANCE_4))) {
+        (GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED) && (gSaveContext.save.cutsceneIndex != CS_INDEX_0))) {
         Actor_Kill(&this->dyna.actor);
         return;
     }
diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
index bd4777b46b..b7e1b12ef6 100644
--- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
+++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
@@ -108,8 +108,7 @@ void BgRelayObjects_Destroy(Actor* thisx, PlayState* play) {
     BgRelayObjects* this = (BgRelayObjects*)thisx;
 
     DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);
-    if ((this->dyna.actor.params == WINDMILL_ROTATING_GEAR) &&
-        (gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4)) {
+    if ((this->dyna.actor.params == WINDMILL_ROTATING_GEAR) && (gSaveContext.save.cutsceneIndex < CS_INDEX_0)) {
         CLEAR_EVENTCHKINF(EVENTCHKINF_65);
     }
 }
diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
index 49dce98312..775ad9700f 100644
--- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
+++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
@@ -217,7 +217,7 @@ void BgSpot00Hanebasi_Update(Actor* thisx, PlayState* play) {
                     this->actionFunc = BgSpot00Hanebasi_DoNothing;
                     Player_SetCsActionWithHaltedActors(play, &player->actor, PLAYER_CSACTION_8);
                     play->nextEntranceIndex = ENTR_HYRULE_FIELD_0;
-                    gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_5;
+                    gSaveContext.nextCutsceneIndex = CS_INDEX_1;
                     play->transitionTrigger = TRANS_TRIGGER_START;
                     play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
                 } else if (Actor_IsFacingAndNearPlayer(&this->dyna.actor, 3000.0f, 0x7530)) {
diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
index 26e149b2e2..155b1b96e9 100644
--- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
+++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
@@ -2104,7 +2104,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
             FALLTHROUGH;
         case 20:
             play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
-            gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_6;
+            gSaveContext.nextCutsceneIndex = CS_INDEX_2;
             play->transitionTrigger = TRANS_TRIGGER_START;
             play->transitionType = TRANS_TYPE_FADE_WHITE;
             play->linkAgeOnLoad = LINK_AGE_CHILD;
diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
index 29bdbd9b9f..47336a342c 100644
--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@@ -497,7 +497,7 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
                 Flags_SetEventChkInf(EVENTCHKINF_25);
                 Item_Give(play, ITEM_GORON_RUBY);
                 play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0;
-                gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_5;
+                gSaveContext.nextCutsceneIndex = CS_INDEX_1;
             } else {
                 play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_5;
                 gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
@@ -508,7 +508,7 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
                 Flags_SetEventChkInf(EVENTCHKINF_09);
                 Item_Give(play, ITEM_KOKIRI_EMERALD);
                 play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0;
-                gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_5;
+                gSaveContext.nextCutsceneIndex = CS_INDEX_1;
             } else {
                 play->nextEntranceIndex = ENTR_KOKIRI_FOREST_11;
                 gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
@@ -604,7 +604,7 @@ void DoorWarp1_RutoWarpOut(DoorWarp1* this, PlayState* play) {
         SET_EVENTCHKINF(EVENTCHKINF_37);
         Item_Give(play, ITEM_ZORA_SAPPHIRE);
         play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0;
-        gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_4;
+        gSaveContext.nextCutsceneIndex = CS_INDEX_0;
         play->transitionTrigger = TRANS_TRIGGER_START;
         play->transitionType = TRANS_TYPE_FADE_WHITE_SLOW;
     }
@@ -721,7 +721,7 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 SET_EVENTCHKINF(EVENTCHKINF_49);
                 Item_Give(play, ITEM_MEDALLION_FIRE);
                 play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0;
-                gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_7;
+                gSaveContext.nextCutsceneIndex = CS_INDEX_3;
             } else {
                 if (!LINK_IS_ADULT) {
                     play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_4;
diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c
index 25d01bb9f3..9a7b512e31 100644
--- a/src/overlays/actors/ovl_En_Du/z_en_du.c
+++ b/src/overlays/actors/ovl_En_Du/z_en_du.c
@@ -292,7 +292,7 @@ void EnDu_Init(Actor* thisx, PlayState* play) {
     this->actor.attentionRangeType = ATTENTION_RANGE_1;
     this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
 
-    if (gSaveContext.save.cutsceneIndex >= CS_INDEX_ENTRANCE_4) {
+    if (gSaveContext.save.cutsceneIndex >= CS_INDEX_0) {
         play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDarunia01Cs);
         gSaveContext.cutsceneTrigger = 1;
         EnDu_SetupAction(this, func_809FE890);
diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index 3a81420be2..7e61fab6cb 100644
--- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -577,7 +577,7 @@ void EnGe1_BeginGame_Archery(EnGe1* this, PlayState* play) {
                 } else {
                     Rupees_ChangeBy(-20);
                     play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_0;
-                    gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_4;
+                    gSaveContext.nextCutsceneIndex = CS_INDEX_0;
                     play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST);
                     play->transitionTrigger = TRANS_TRIGGER_START;
                     SET_EVENTINF(EVENTINF_HORSES_08);
diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
index c2ab09eda0..d6f9b824f9 100644
--- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
+++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
@@ -357,7 +357,7 @@ void func_80A6A068(EnHorseLinkChild* this, PlayState* play) {
     }
 
     if ((GET_EVENTCHKINF(EVENTCHKINF_CAN_LEARN_EPONAS_SONG) && R_EPONAS_SONG_PLAYED) ||
-        ((play->sceneId == SCENE_LON_LON_RANCH) && (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_5))) {
+        ((play->sceneId == SCENE_LON_LON_RANCH) && (gSaveContext.save.cutsceneIndex == CS_INDEX_1))) {
         func_80A6A4DC(this);
     } else {
         this->unk_2A0 = GET_EVENTCHKINF(EVENTCHKINF_CAN_LEARN_EPONAS_SONG);
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c
index 87e0c3c061..dbb324badd 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.c
+++ b/src/overlays/actors/ovl_En_In/z_en_in.c
@@ -427,7 +427,7 @@ void func_80A79BAC(EnIn* this, PlayState* play, s32 index, u32 transitionType) {
 
     play->nextEntranceIndex = entrances[index];
     if (index == 2) {
-        gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_4;
+        gSaveContext.nextCutsceneIndex = CS_INDEX_0;
     }
     play->transitionType = transitionType;
     play->transitionTrigger = TRANS_TRIGGER_START;
diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
index 9c33f3b05c..ab116e7913 100644
--- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
@@ -380,7 +380,7 @@ void EnMa1_WaitForPlayback(EnMa1* this, PlayState* play) {
     GET_PLAYER(play)->stateFlags2 |= PLAYER_STATE2_23;
     if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
         play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
-        gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_5;
+        gSaveContext.nextCutsceneIndex = CS_INDEX_1;
         play->transitionType = TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_WHITE, TCS_FAST);
         play->transitionTrigger = TRANS_TRIGGER_START;
         this->actionFunc = EnMa1_DoNothing;
diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
index d8a3a2b323..d1e1149aad 100644
--- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
+++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
@@ -118,7 +118,7 @@ s16 EnMa3_UpdateTalkState(PlayState* play, Actor* thisx) {
         case TEXT_STATE_EVENT:
             if (Message_ShouldAdvance(play)) {
                 play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
-                gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_4;
+                gSaveContext.nextCutsceneIndex = CS_INDEX_0;
                 play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST);
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 SET_EVENTINF(EVENTINF_HORSES_0A);
diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c
index fefcf7426b..11df5e00d9 100644
--- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c
@@ -379,7 +379,7 @@ void EnSa_ChangeAnim(EnSa* this, s32 index) {
 }
 
 s32 func_80AF5DFC(EnSa* this, PlayState* play) {
-    if (gSaveContext.save.cutsceneIndex >= CS_INDEX_ENTRANCE_4 && gSaveContext.save.cutsceneIndex != CS_INDEX_RESET) {
+    if (gSaveContext.save.cutsceneIndex >= CS_INDEX_0 && gSaveContext.save.cutsceneIndex != CS_INDEX_RESET) {
         if (play->sceneId == SCENE_KOKIRI_FOREST) {
             return 4;
         }
diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
index 5690b51cc2..9609bda833 100644
--- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@@ -779,7 +779,7 @@ s32 EnZl4_CsAskName(EnZl4* this, PlayState* play) {
             if (this->talkTimer2 == 130) {
                 play->msgCtx.msgMode = MSGMODE_PAUSED;
                 play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
-                gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_B;
+                gSaveContext.nextCutsceneIndex = CS_INDEX_7;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
             }
diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
index f7304b9b2e..c3f1b1d4c3 100644
--- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
+++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
@@ -44,7 +44,7 @@ void ObjDekujr_Init(Actor* thisx, PlayState* play) {
     ObjDekujr* this = (ObjDekujr*)thisx;
     s32 pad;
 
-    if (gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4) {
+    if (gSaveContext.save.cutsceneIndex < CS_INDEX_0) {
         if (!LINK_IS_ADULT) {
             Actor_Kill(thisx);
             return;
@@ -140,7 +140,7 @@ void ObjDekujr_Update(Actor* thisx, PlayState* play) {
 
     Collider_UpdateCylinder(&this->actor, &this->collider);
     CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
-    if ((gSaveContext.save.cutsceneIndex >= CS_INDEX_ENTRANCE_4) && (this->unk_19B == 0)) {
+    if ((gSaveContext.save.cutsceneIndex >= CS_INDEX_0) && (this->unk_19B == 0)) {
         this->unk_19C = 0;
         this->unk_19B = 1;
     }
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index c3dc8f58c7..7b7a91c60b 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -10751,7 +10751,7 @@ void Player_Init(Actor* thisx, PlayState* play2) {
 
     initMode = PARAMS_GET_S(thisx->params, 8, 4);
     if ((initMode == 5) || (initMode == 6)) {
-        if (gSaveContext.save.cutsceneIndex >= CS_INDEX_ENTRANCE_4) {
+        if (gSaveContext.save.cutsceneIndex >= CS_INDEX_0) {
             initMode = 13;
         }
     }
@@ -13670,7 +13670,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
             if (this->getItemId == GI_SILVER_GAUNTLETS) {
                 play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
-                gSaveContext.nextCutsceneIndex = CS_INDEX_ENTRANCE_5;
+                gSaveContext.nextCutsceneIndex = CS_INDEX_1;
                 play->transitionType = TRANS_TYPE_SANDSTORM_END;
                 this->stateFlags1 &= ~PLAYER_STATE1_29;
                 Player_TryCsAction(play, NULL, PLAYER_CSACTION_8);
diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c
index c8edc6ebfb..c3262c4b24 100644
--- a/src/overlays/gamestates/ovl_opening/z_opening.c
+++ b/src/overlays/gamestates/ovl_opening/z_opening.c
@@ -11,12 +11,12 @@ void TitleSetup_SetupTitleScreen(TitleSetupState* this) {
     this->state.running = false;
     gSaveContext.save.linkAge = LINK_AGE_ADULT;
     Sram_InitDebugSave();
-    gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_7;
+    gSaveContext.save.cutsceneIndex = CS_INDEX_3;
     gSaveContext.sceneLayer = 7;
     // assigning scene layer here is redundant, as Play_Init sets it to
     // SCENE_LAYER_CUTSCENE_FIRST + (gSaveContext.save.cutsceneIndex & 0xF)
     // or one of the other `enum SceneLayer` values; even so, `7` is exactly
-    // the value this formula equals to for CS_INDEX_ENTRANCE_7
+    // the value this formula equals to for CS_INDEX_3
     SET_NEXT_GAMESTATE(&this->state, Play_Init, PlayState);
 }
 
diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c
index 652d2afcda..a9d55b8c35 100644
--- a/src/overlays/gamestates/ovl_select/z_select.c
+++ b/src/overlays/gamestates/ovl_select/z_select.c
@@ -338,57 +338,57 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
             if (gSaveContext.save.cutsceneIndex == CS_INDEX_LAST) {
                 gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
             } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_NONE) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_4) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_5) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_6;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_6) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_7;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_7) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_8;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_8) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_9;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_9) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_A;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_A) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_B;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_B) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_C;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_C) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_D;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_D) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_E;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_E) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_0) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_1;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_1) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_2;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_2) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_3;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_3) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_4;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_4) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_5;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_5) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_6;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_6) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_7;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_7) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_8;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_8) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_9;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_9) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_A;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_A) {
                 gSaveContext.save.cutsceneIndex = CS_INDEX_LAST;
             }
         } else if (CHECK_BTN_ALL(input->press.button, BTN_R)) {
             if (gSaveContext.save.cutsceneIndex == CS_INDEX_LAST) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_E;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_A;
             } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_NONE) {
                 gSaveContext.save.cutsceneIndex = CS_INDEX_LAST;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_4) {
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_0) {
                 gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_5) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_4;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_6) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_5;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_7) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_6;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_8) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_7;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_9) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_8;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_A) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_9;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_B) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_A;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_C) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_B;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_D) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_C;
-            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_E) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_ENTRANCE_D;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_1) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_0;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_2) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_1;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_3) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_2;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_4) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_3;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_5) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_4;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_6) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_5;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_7) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_6;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_8) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_7;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_9) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_8;
+            } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_A) {
+                gSaveContext.save.cutsceneIndex = CS_INDEX_9;
             }
         }
 
@@ -616,39 +616,39 @@ void MapSelect_PrintCutsceneSetting(MapSelectState* this, GfxPrint* printer, u16
             gSaveContext.save.dayTime = CLOCK_TIME(12, 0); label = GFXP_HIRAGANA "ｵﾋﾙ " GFXP_KATAKANA "ｼﾞｬﾗ";
             // clang-format on
             break;
-        case CS_INDEX_ENTRANCE_4:
+        case CS_INDEX_0:
             // clang-format off
             gSaveContext.save.dayTime = CLOCK_TIME(12, 0); label = "ﾃﾞﾓ00";
             // clang-format on
             break;
-        case CS_INDEX_ENTRANCE_5:
+        case CS_INDEX_1:
             label = "ﾃﾞﾓ01";
             break;
-        case CS_INDEX_ENTRANCE_6:
+        case CS_INDEX_2:
             label = "ﾃﾞﾓ02";
             break;
-        case CS_INDEX_ENTRANCE_7:
+        case CS_INDEX_3:
             label = "ﾃﾞﾓ03";
             break;
-        case CS_INDEX_ENTRANCE_8:
+        case CS_INDEX_4:
             label = "ﾃﾞﾓ04";
             break;
-        case CS_INDEX_ENTRANCE_9:
+        case CS_INDEX_5:
             label = "ﾃﾞﾓ05";
             break;
-        case CS_INDEX_ENTRANCE_A:
+        case CS_INDEX_6:
             label = "ﾃﾞﾓ06";
             break;
-        case CS_INDEX_ENTRANCE_B:
+        case CS_INDEX_7:
             label = "ﾃﾞﾓ07";
             break;
-        case CS_INDEX_ENTRANCE_C:
+        case CS_INDEX_8:
             label = "ﾃﾞﾓ08";
             break;
-        case CS_INDEX_ENTRANCE_D:
+        case CS_INDEX_9:
             label = "ﾃﾞﾓ09";
             break;
-        case CS_INDEX_ENTRANCE_E:
+        case CS_INDEX_A:
             label = "ﾃﾞﾓ0A";
             break;
     };