Name Kokiri Forest cutscenes (and related ones) (#2338)

* named kokiri forest cutscenes (and related parts)

* added missing pal n64 names (and changes in code)

* removed unneeded comments

* add kokiri forest duplicates from spirit temple

* review 1

* review 2 (+ build fix)

10 files changed, 66 insertions, 6 deletions

diff --git a/assets/xml/scenes/dungeons/jyasinzou.xml b/assets/xml/scenes/dungeons/jyasinzou.xml
index 07f7944f9..1a44e14d7 100644
--- a/assets/xml/scenes/dungeons/jyasinzou.xml
+++ b/assets/xml/scenes/dungeons/jyasinzou.xml
@@ -6,6 +6,10 @@
         <Scene Name="jyasinzou_scene" Offset="0x0"/>
         <Scene Name="jyasinzou_scene_unused1" Offset="0x17220"/>
         <Scene Name="jyasinzou_scene_unused2" Offset="0x17710"/>
+
+        <!-- These are unused versions of `gKokiriForestKokiriEmeraldPart7Cs` -->
+        <Cutscene Name="gSpiritTempleUnused1Cs" Offset="0x16860"/>
+        <Cutscene Name="gSpiritTempleUnused2Cs" Offset="0x16D40"/>
     </File>
     <File Name="jyasinzou_room_0" Segment="3">
         <Room Name="jyasinzou_room_0" Offset="0x0"/>
diff --git a/assets/xml/scenes/dungeons/jyasinzou_mq.xml b/assets/xml/scenes/dungeons/jyasinzou_mq.xml
index 5614bc893..6a99888ab 100644
--- a/assets/xml/scenes/dungeons/jyasinzou_mq.xml
+++ b/assets/xml/scenes/dungeons/jyasinzou_mq.xml
@@ -6,6 +6,10 @@
         <Scene Name="jyasinzou_scene" Offset="0x0"/>
         <Scene Name="jyasinzou_scene_unused1" Offset="0x17200"/>
         <Scene Name="jyasinzou_scene_unused2" Offset="0x176F0"/>
+
+        <!-- These are unused versions of `gKokiriForestKokiriEmeraldPart7Cs` -->
+        <Cutscene Name="gSpiritTempleUnused1Cs" Offset="0x16840"/>
+        <Cutscene Name="gSpiritTempleUnused2Cs" Offset="0x16D20"/>
     </File>
     <File Name="jyasinzou_room_0" Segment="3">
         <Room Name="jyasinzou_room_0" Offset="0x0"/>
diff --git a/assets/xml/scenes/misc/hiral_demo.xml b/assets/xml/scenes/misc/hiral_demo.xml
index 32c55fac4..47cf353d4 100644
--- a/assets/xml/scenes/misc/hiral_demo.xml
+++ b/assets/xml/scenes/misc/hiral_demo.xml
@@ -4,6 +4,16 @@
         <Scene Name="hiral_demo_scene_unused1" Offset="0x3580"/>
         <Scene Name="hiral_demo_scene_unused2" Offset="0x3640"/>
         <Scene Name="hiral_demo_scene_unused3" Offset="0x3700"/>
+
+        <Cutscene Name="gCutsceneMapKokiriEmeraldPart2Cs" Offset="0x0E50"/> <!-- Ganondorf riding the horse -->
+        <Cutscene Name="gCutsceneMapKokiriEmeraldPart3Cs" Offset="0x0100"/> <!-- World creation part 1 -->
+        <Cutscene Name="gCutsceneMapKokiriEmeraldPart8Cs" Offset="0x1260"/> <!-- Triforce creation -->
+        <Cutscene Name="gCutsceneMapGanondorfFromMasterSwordCs" Offset="0x1A60"/> <!-- Ganondorf cutscene from the Master Sword -->
+        <Cutscene Name="gCutsceneMapTriforceSheikahLegendCs" Offset="0x1F00"/> <!-- The Sheikah legend about the Triforce -->
+        <Cutscene Name="gCutsceneMapDekuSproutPart2Cs" Offset="0x2310"/> <!-- The Deku Tree Sprout's story -->
+        <Cutscene Name="gCutsceneMapTitleGanonHorseCs" Offset="0x2490"/> <!-- Used for the title screen -->
+        <Cutscene Name="gCutsceneMapThreeGoddessesCs" Offset="0x2890"/> <!-- Zelda's story about the Triforce -->
+        <Cutscene Name="gCutsceneMapGanondorfDefeatedCs" Offset="0x2FE0"/> <!-- One of the cutscenes before the credits -->
     </File>
     <File Name="hiral_demo_room_0" Segment="3">
         <Room Name="hiral_demo_room_0" Offset="0x0"/>
diff --git a/assets/xml/scenes/misc/hiral_demo_pal_n64.xml b/assets/xml/scenes/misc/hiral_demo_pal_n64.xml
index 88d347899..26c028730 100644
--- a/assets/xml/scenes/misc/hiral_demo_pal_n64.xml
+++ b/assets/xml/scenes/misc/hiral_demo_pal_n64.xml
@@ -4,6 +4,16 @@
         <Scene Name="hiral_demo_scene_unused1" Offset="0x3590"/>
         <Scene Name="hiral_demo_scene_unused2" Offset="0x3650"/>
         <Scene Name="hiral_demo_scene_unused3" Offset="0x3710"/>
+
+        <Cutscene Name="gCutsceneMapKokiriEmeraldPart2Cs" Offset="0x0E50"/> <!-- Ganondorf riding the horse -->
+        <Cutscene Name="gCutsceneMapKokiriEmeraldPart3Cs" Offset="0x0104"/> <!-- World creation part 1 -->
+        <Cutscene Name="gCutsceneMapKokiriEmeraldPart8Cs" Offset="0x1264"/> <!-- Triforce creation -->
+        <Cutscene Name="gCutsceneMapGanondorfFromMasterSwordCs" Offset="0x1A70"/> <!-- Ganondorf cutscene from the Master Sword -->
+        <Cutscene Name="gCutsceneMapTriforceSheikahLegendCs" Offset="0x1F10"/> <!-- The Sheikah legend about the Triforce -->
+        <Cutscene Name="gCutsceneMapDekuSproutPart2Cs" Offset="0x2320"/> <!-- The Deku Tree Sprout's story -->
+        <Cutscene Name="gCutsceneMapTitleGanonHorseCs" Offset="0x24A0"/> <!-- Used for the title screen -->
+        <Cutscene Name="gCutsceneMapThreeGoddessesCs" Offset="0x28A0"/> <!-- Zelda's story about the Triforce -->
+        <Cutscene Name="gCutsceneMapGanondorfDefeatedCs" Offset="0x2FF0"/> <!-- One of the cutscenes before the credits -->
     </File>
     <File Name="hiral_demo_room_0" Segment="3">
         <Room Name="hiral_demo_room_0" Offset="0x0"/>
diff --git a/assets/xml/scenes/overworld/spot04.xml b/assets/xml/scenes/overworld/spot04.xml
index c861d4527..5a3e3079f 100644
--- a/assets/xml/scenes/overworld/spot04.xml
+++ b/assets/xml/scenes/overworld/spot04.xml
@@ -2,8 +2,20 @@
     <File Name="spot04_scene" Segment="2">
         <Path Name="spot04_scenePathList_00030C" Offset="0x030C" NumPaths="3"/>
         <Path Name="spot04_scenePathList_00D728" Offset="0xD728" NumPaths="2"/>
-        <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xC9D0"/>
-        <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
+        <Cutscene Name="gKokiriForestSariaGreetingCs" Offset="0x10E20"/>
+        <Cutscene Name="gKokiriForestIntroNaviFlyingCs" Offset="0xA6D0"/>
+        <Cutscene Name="gKokiriForestUnusedCs" Offset="0xB280"/>
+
+        <Cutscene Name="gKokiriForestCreditsDekuSproutCs" Offset="0xB9B0"/>
+        <Cutscene Name="gKokiriForestCreditsCameraPanCs" Offset="0xBB20"/>
+        <Cutscene Name="gKokiriForestCreditsCameraPanUnusedCs" Offset="0xB800"/>
+
+        <Cutscene Name="gKokiriForestDekuSproutPart1Cs" Offset="0xBCB0"/>
+        <Cutscene Name="gKokiriForestDekuSproutPart3Cs" Offset="0xC9D0"/>
+
+        <Cutscene Name="gKokiriForestKokiriEmeraldPart1Cs" Offset="0x8DA0"/>
+        <Cutscene Name="gKokiriForestKokiriEmeraldPart7Cs" Offset="0x8950"/>
+        <Cutscene Name="gKokiriForestKokiriEmeraldPart9Cs" Offset="0x93A0"/>
 
         <Scene Name="spot04_scene" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/overworld/spot04_pal_n64.xml b/assets/xml/scenes/overworld/spot04_pal_n64.xml
index c8e8776a7..c9054cca4 100644
--- a/assets/xml/scenes/overworld/spot04_pal_n64.xml
+++ b/assets/xml/scenes/overworld/spot04_pal_n64.xml
@@ -2,8 +2,20 @@
     <File Name="spot04_scene" Segment="2">
         <Path Name="spot04_scenePathList_00030C" Offset="0x030C" NumPaths="3"/>
         <Path Name="spot04_scenePathList_00D728" Offset="0xD758" NumPaths="2"/>
-        <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xCA00"/>
-        <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E50"/>
+        <Cutscene Name="gKokiriForestSariaGreetingCs" Offset="0x10E50"/>
+        <Cutscene Name="gKokiriForestIntroNaviFlyingCs" Offset="0xA6E0"/>
+        <Cutscene Name="gKokiriForestUnusedCs" Offset="0xB290"/>
+
+        <Cutscene Name="gKokiriForestCreditsDekuSproutCs" Offset="0xB9C4"/>
+        <Cutscene Name="gKokiriForestCreditsCameraPanCs" Offset="0xBB44"/>
+        <Cutscene Name="gKokiriForestCreditsCameraPanUnusedCs" Offset="0xB810"/>
+
+        <Cutscene Name="gKokiriForestDekuSproutPart1Cs" Offset="0xBCE0"/>
+        <Cutscene Name="gKokiriForestDekuSproutPart3Cs" Offset="0xCA00"/>
+
+        <Cutscene Name="gKokiriForestKokiriEmeraldPart1Cs" Offset="0x8DB0"/>
+        <Cutscene Name="gKokiriForestKokiriEmeraldPart7Cs" Offset="0x8954"/>
+        <Cutscene Name="gKokiriForestKokiriEmeraldPart9Cs" Offset="0x93B0"/>
 
         <Scene Name="spot04_scene" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/overworld/spot09.xml b/assets/xml/scenes/overworld/spot09.xml
index 7b7ec2ce5..641ab8b7a 100644
--- a/assets/xml/scenes/overworld/spot09.xml
+++ b/assets/xml/scenes/overworld/spot09.xml
@@ -3,6 +3,10 @@
         <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
         <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
         <Cutscene Name="gGerudoValleyIntroCs" Offset="0x31E0"/>
+        <Cutscene Name="gGerudoValleyCreditsCs" Offset="0x28E0"/>
+        <Cutscene Name="gGerudoValleyKokiriEmeraldPart4Cs" Offset="0x2410"/>
+        <Cutscene Name="gGerudoValleyKokiriEmeraldPart5Cs" Offset="0x2160"/>
+
         <Path Name="spot09_scenePathList_002F58" Offset="0x2F58" NumPaths="3"/>
 
         <Scene Name="spot09_scene" Offset="0x0"/>
diff --git a/assets/xml/scenes/overworld/spot09_pal_n64.xml b/assets/xml/scenes/overworld/spot09_pal_n64.xml
index a75774bf6..7bb06c8a8 100644
--- a/assets/xml/scenes/overworld/spot09_pal_n64.xml
+++ b/assets/xml/scenes/overworld/spot09_pal_n64.xml
@@ -3,6 +3,10 @@
         <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AF0"/>
         <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
         <Cutscene Name="gGerudoValleyIntroCs" Offset="0x3210"/>
+        <Cutscene Name="gGerudoValleyCreditsCs" Offset="0x2904"/>
+        <Cutscene Name="gGerudoValleyKokiriEmeraldPart4Cs" Offset="0x2424"/>
+        <Cutscene Name="gGerudoValleyKokiriEmeraldPart5Cs" Offset="0x2164"/>
+
         <Path Name="spot09_scenePathList_002F58" Offset="0x2F88" NumPaths="3"/>
 
         <Scene Name="spot09_scene" Offset="0x0"/>
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 7908c7cca..58a2b690a 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -111,7 +111,7 @@ EntranceCutscene sEntranceCutsceneTable[] = {
     { ENTR_SPIRIT_TEMPLE_BOSS_0, 0, EVENTCHKINF_C0, gSpiritBossNabooruKnuckleIntroCs },
     { ENTR_GERUDOS_FORTRESS_17, 0, EVENTCHKINF_C7, gGerudoFortressFirstCaptureCs },
     { ENTR_DEATH_MOUNTAIN_CRATER_1, 2, EVENTCHKINF_B9, gDeathMountainCraterIntroCs },
-    { ENTR_KOKIRI_FOREST_12, 2, EVENTCHKINF_C6, gKokiriForestDekuSproutCs },
+    { ENTR_KOKIRI_FOREST_12, 2, EVENTCHKINF_C6, gKokiriForestDekuSproutPart3Cs },
 };
 
 void* sCutscenesUnknownList[] = {
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 67076188b..44ff94350 100644
--- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c
@@ -503,7 +503,7 @@ void EnSa_Init(Actor* thisx, PlayState* play) {
         case 4:
             this->unk_210 = 0;
             this->actor.gravity = -1.0f;
-            play->csCtx.script = SEGMENTED_TO_VIRTUAL(gSpot04Cs_10E20);
+            play->csCtx.script = SEGMENTED_TO_VIRTUAL(gKokiriForestSariaGreetingCs);
             gSaveContext.cutsceneTrigger = 1;
             EnSa_ChangeAnim(this, ENSA_ANIM1_4);
             this->actionFunc = func_80AF68E4;