From db8d351c5b7af29b938f6d51fd960ea1e2bd9db7 Mon Sep 17 00:00:00 2001
From: Yanis <35189056+Yanis002@users.noreply.github.com>
Date: Sun, 15 Dec 2024 01:53:28 +0100
Subject: [PATCH] Name some scene cutscenes 2 (Graveyard, Meadow and Lake
 Hylia) (#2339)

* name cs from graveyard, meadow and lake hylia

* `gLakeHyliaWaterRaisingCs` --> `gLakeHyliaRestoredCs`
---
 assets/xml/scenes/overworld/spot02.xml                    | 6 +++---
 assets/xml/scenes/overworld/spot05.xml                    | 5 ++---
 assets/xml/scenes/overworld/spot05_pal_n64.xml            | 5 ++---
 assets/xml/scenes/overworld/spot06.xml                    | 5 ++++-
 assets/xml/scenes/overworld/spot06_pal_n64.xml            | 5 ++++-
 src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c | 4 ++--
 src/overlays/actors/ovl_En_Sa/z_en_sa.c                   | 2 +-
 src/overlays/actors/ovl_En_Xc/z_en_xc.c                   | 2 +-
 8 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/assets/xml/scenes/overworld/spot02.xml b/assets/xml/scenes/overworld/spot02.xml
index 45708dd3ac..23037c742b 100644
--- a/assets/xml/scenes/overworld/spot02.xml
+++ b/assets/xml/scenes/overworld/spot02.xml
@@ -2,9 +2,9 @@
     <File Name="spot02_scene" Segment="2">
         <Scene Name="spot02_scene" Offset="0x0"/>
 
-        <Cutscene Name="spot02_scene_Cs_003C80" Offset="0x3C80"/>
-
-        <Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/>
+        <Cutscene Name="gGraveyardTombOpeningAdultCs" Offset="0x3C80"/>
+        <Cutscene Name="gGraveyardTombOpeningChildCs" Offset="0x5020"/>
+        <Cutscene Name="gGraveyardSunsSongPart2Cs" Offset="0x4E90"/>
         <Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>
     </File>
     <File Name="spot02_room_0" Segment="3">
diff --git a/assets/xml/scenes/overworld/spot05.xml b/assets/xml/scenes/overworld/spot05.xml
index b799f21d1e..53ee4a5125 100644
--- a/assets/xml/scenes/overworld/spot05.xml
+++ b/assets/xml/scenes/overworld/spot05.xml
@@ -1,8 +1,7 @@
 <Root>
     <File Name="spot05_scene" Segment="2">
-        <Cutscene Name="gMinuetCs" Offset="0x3F80"/>
-
-        <Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
+        <Cutscene Name="gMeadowMinuetCs" Offset="0x3F80"/>
+        <Cutscene Name="gMeadowSariasSongCs" Offset="0x5730"/>
 
         <Path Name="spot05_scenePathList_0069D8" Offset="0x69D8" NumPaths="5"/>
 
diff --git a/assets/xml/scenes/overworld/spot05_pal_n64.xml b/assets/xml/scenes/overworld/spot05_pal_n64.xml
index 6458ad63f5..eba27fbc44 100644
--- a/assets/xml/scenes/overworld/spot05_pal_n64.xml
+++ b/assets/xml/scenes/overworld/spot05_pal_n64.xml
@@ -1,8 +1,7 @@
 <Root>
     <File Name="spot05_scene" Segment="2">
-        <Cutscene Name="gMinuetCs" Offset="0x3F84"/>
-
-        <Cutscene Name="spot05_scene_Cs_005730" Offset="0x5740"/>
+        <Cutscene Name="gMeadowMinuetCs" Offset="0x3F84"/>
+        <Cutscene Name="gMeadowSariasSongCs" Offset="0x5740"/>
 
         <Path Name="spot05_scenePathList_0069D8" Offset="0x69E8" NumPaths="5"/>
 
diff --git a/assets/xml/scenes/overworld/spot06.xml b/assets/xml/scenes/overworld/spot06.xml
index 0c5ccea251..77226b2ce5 100644
--- a/assets/xml/scenes/overworld/spot06.xml
+++ b/assets/xml/scenes/overworld/spot06.xml
@@ -2,8 +2,11 @@
     <File Name="spot06_scene" Segment="2">
         <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
         <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
-        <Path Name="spot06_scenePathList_007764" Offset="0x7764" NumPaths="2"/>
         <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/>
+        <Cutscene Name="gLakeHyliaCreditsCs" Offset="0x6E90"/>
+        <Cutscene Name="gLakeHyliaRestoredCs" Offset="0x55E0"/>
+
+        <Path Name="spot06_scenePathList_007764" Offset="0x7764" NumPaths="2"/>
         <Scene Name="spot06_scene" Offset="0x0"/>
     </File>
     <File Name="spot06_room_0" Segment="3">
diff --git a/assets/xml/scenes/overworld/spot06_pal_n64.xml b/assets/xml/scenes/overworld/spot06_pal_n64.xml
index 308858ff74..df16711d4e 100644
--- a/assets/xml/scenes/overworld/spot06_pal_n64.xml
+++ b/assets/xml/scenes/overworld/spot06_pal_n64.xml
@@ -2,8 +2,11 @@
     <File Name="spot06_scene" Segment="2">
         <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7030"/>
         <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0D0"/>
-        <Path Name="spot06_scenePathList_007764" Offset="0x7774" NumPaths="2"/>
         <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A40"/>
+        <Cutscene Name="gLakeHyliaCreditsCs" Offset="0x6E94"/>
+        <Cutscene Name="gLakeHyliaRestoredCs" Offset="0x55E0"/>
+
+        <Path Name="spot06_scenePathList_007764" Offset="0x7774" NumPaths="2"/>
         <Scene Name="spot06_scene" Offset="0x0"/>
     </File>
     <File Name="spot06_room_0" Segment="3">
diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
index 308098c185..324166d437 100644
--- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
+++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
@@ -258,8 +258,8 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) {
                 gSaveContext.cutsceneTrigger = 1;
                 break;
             case 6:
-                play->csCtx.script = LINK_IS_ADULT ? SEGMENTED_TO_VIRTUAL(spot02_scene_Cs_003C80)
-                                                   : SEGMENTED_TO_VIRTUAL(spot02_scene_Cs_005020);
+                play->csCtx.script = LINK_IS_ADULT ? SEGMENTED_TO_VIRTUAL(gGraveyardTombOpeningAdultCs)
+                                                   : SEGMENTED_TO_VIRTUAL(gGraveyardTombOpeningChildCs);
                 gSaveContext.cutsceneTrigger = 1;
                 SET_EVENTCHKINF(EVENTCHKINF_1D);
                 Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
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 79cba6bbb8..b2543c317e 100644
--- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c
@@ -627,7 +627,7 @@ void func_80AF683C(EnSa* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if (!(player->actor.world.pos.z >= -2220.0f) && !Play_InCsMode(play)) {
-        play->csCtx.script = SEGMENTED_TO_VIRTUAL(spot05_scene_Cs_005730);
+        play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMeadowSariasSongCs);
         gSaveContext.cutsceneTrigger = 1;
         this->actionFunc = func_80AF68E4;
     }
diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index 8a4b4be3f4..b693f30709 100644
--- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -305,7 +305,7 @@ s32 EnXc_MinuetCS(EnXc* this, PlayState* play) {
             if (!Play_InCsMode(play)) {
                 s32 pad;
 
-                play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMinuetCs);
+                play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMeadowMinuetCs);
                 gSaveContext.cutsceneTrigger = 1;
                 SET_EVENTCHKINF(EVENTCHKINF_50);
                 Item_Give(play, ITEM_SONG_MINUET);