From 0fc36972fb3f18b49ba21771c78d2ca7fea66b20 Mon Sep 17 00:00:00 2001
From: Yanis <35189056+Yanis002@users.noreply.github.com>
Date: Fri, 13 Dec 2024 02:21:49 +0100
Subject: [PATCH] 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)
---
assets/xml/scenes/dungeons/jyasinzou.xml | 4 ++++
assets/xml/scenes/dungeons/jyasinzou_mq.xml | 4 ++++
assets/xml/scenes/misc/hiral_demo.xml | 10 ++++++++++
assets/xml/scenes/misc/hiral_demo_pal_n64.xml | 10 ++++++++++
assets/xml/scenes/overworld/spot04.xml | 16 ++++++++++++++--
assets/xml/scenes/overworld/spot04_pal_n64.xml | 16 ++++++++++++++--
assets/xml/scenes/overworld/spot09.xml | 4 ++++
assets/xml/scenes/overworld/spot09_pal_n64.xml | 4 ++++
src/code/z_demo.c | 2 +-
src/overlays/actors/ovl_En_Sa/z_en_sa.c | 2 +-
10 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/assets/xml/scenes/dungeons/jyasinzou.xml b/assets/xml/scenes/dungeons/jyasinzou.xml
index 07f7944f9b..1a44e14d72 100644
--- a/assets/xml/scenes/dungeons/jyasinzou.xml
+++ b/assets/xml/scenes/dungeons/jyasinzou.xml
@@ -6,6 +6,10 @@
+
+
+
+
diff --git a/assets/xml/scenes/dungeons/jyasinzou_mq.xml b/assets/xml/scenes/dungeons/jyasinzou_mq.xml
index 5614bc8936..6a99888abb 100644
--- a/assets/xml/scenes/dungeons/jyasinzou_mq.xml
+++ b/assets/xml/scenes/dungeons/jyasinzou_mq.xml
@@ -6,6 +6,10 @@
+
+
+
+
diff --git a/assets/xml/scenes/misc/hiral_demo.xml b/assets/xml/scenes/misc/hiral_demo.xml
index 32c55fac4b..47cf353d4c 100644
--- a/assets/xml/scenes/misc/hiral_demo.xml
+++ b/assets/xml/scenes/misc/hiral_demo.xml
@@ -4,6 +4,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/scenes/misc/hiral_demo_pal_n64.xml b/assets/xml/scenes/misc/hiral_demo_pal_n64.xml
index 88d347899a..26c0287300 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 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/scenes/overworld/spot04.xml b/assets/xml/scenes/overworld/spot04.xml
index c861d45278..5a3e3079fc 100644
--- a/assets/xml/scenes/overworld/spot04.xml
+++ b/assets/xml/scenes/overworld/spot04.xml
@@ -2,8 +2,20 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/scenes/overworld/spot04_pal_n64.xml b/assets/xml/scenes/overworld/spot04_pal_n64.xml
index c8e8776a7a..c9054cca4e 100644
--- a/assets/xml/scenes/overworld/spot04_pal_n64.xml
+++ b/assets/xml/scenes/overworld/spot04_pal_n64.xml
@@ -2,8 +2,20 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/scenes/overworld/spot09.xml b/assets/xml/scenes/overworld/spot09.xml
index 7b7ec2ce5e..641ab8b7aa 100644
--- a/assets/xml/scenes/overworld/spot09.xml
+++ b/assets/xml/scenes/overworld/spot09.xml
@@ -3,6 +3,10 @@
+
+
+
+
diff --git a/assets/xml/scenes/overworld/spot09_pal_n64.xml b/assets/xml/scenes/overworld/spot09_pal_n64.xml
index a75774bf68..7bb06c8a8f 100644
--- a/assets/xml/scenes/overworld/spot09_pal_n64.xml
+++ b/assets/xml/scenes/overworld/spot09_pal_n64.xml
@@ -3,6 +3,10 @@
+
+
+
+
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 7908c7cca5..58a2b690a4 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 67076188b4..44ff943503 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;