From a59a60e414a5880d9f5f3804e912e9af173356c8 Mon Sep 17 00:00:00 2001
From: Yanis <35189056+Yanis002@users.noreply.github.com>
Date: Sat, 14 Dec 2024 03:17:04 +0100
Subject: [PATCH] Name cutscenes from dungeons (Spirit Boss Room, Jabu-Jabu's
 Belly and Ganon) (#2361)

* name cs from dungeons

* review
---
 assets/xml/scenes/dungeons/bdan.xml       | 3 ++-
 assets/xml/scenes/dungeons/bdan_mq.xml    | 3 ++-
 assets/xml/scenes/dungeons/ganon_demo.xml | 1 +
 assets/xml/scenes/dungeons/jyasinboss.xml | 1 +
 src/code/z_demo.c                         | 4 ++--
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/assets/xml/scenes/dungeons/bdan.xml b/assets/xml/scenes/dungeons/bdan.xml
index c4edc9bea4..4ef99be369 100644
--- a/assets/xml/scenes/dungeons/bdan.xml
+++ b/assets/xml/scenes/dungeons/bdan.xml
@@ -1,6 +1,7 @@
 <Root>
     <File Name="bdan_scene" Segment="2">
-        <Cutscene Name="gJabuJabuIntroCs" Offset="0x155E0"/>
+        <Cutscene Name="gJabuIntroCs" Offset="0x155E0"/>
+        <Cutscene Name="gJabuSapphireRetrieveUnusedCs" Offset="0x13080"/>
         <Scene Name="bdan_scene" Offset="0x0"/>
     </File>
     <File Name="bdan_room_0" Segment="3">
diff --git a/assets/xml/scenes/dungeons/bdan_mq.xml b/assets/xml/scenes/dungeons/bdan_mq.xml
index 0aee687a80..a40d025c0e 100644
--- a/assets/xml/scenes/dungeons/bdan_mq.xml
+++ b/assets/xml/scenes/dungeons/bdan_mq.xml
@@ -1,6 +1,7 @@
 <Root>
     <File Name="bdan_scene" Segment="2">
-        <Cutscene Name="gJabuJabuIntroCs" Offset="0x15600"/>
+        <Cutscene Name="gJabuIntroCs" Offset="0x15600"/>
+        <Cutscene Name="gJabuSapphireRetrieveUnusedCs" Offset="0x130A0"/>
         <Scene Name="bdan_scene" Offset="0x0"/>
     </File>
     <File Name="bdan_room_0" Segment="3">
diff --git a/assets/xml/scenes/dungeons/ganon_demo.xml b/assets/xml/scenes/dungeons/ganon_demo.xml
index 779cb9335a..d1a41b6c43 100644
--- a/assets/xml/scenes/dungeons/ganon_demo.xml
+++ b/assets/xml/scenes/dungeons/ganon_demo.xml
@@ -1,6 +1,7 @@
 <Root>
     <File Name="ganon_demo_scene" Segment="2">
         <Scene Name="ganon_demo_scene" Offset="0x0"/>
+        <Cutscene Name="gGanonCastleCollapseCs" Offset="0x01B0"/>
     </File>
     <File Name="ganon_demo_room_0" Segment="3">
         <Room Name="ganon_demo_room_0" Offset="0x0"/>
diff --git a/assets/xml/scenes/dungeons/jyasinboss.xml b/assets/xml/scenes/dungeons/jyasinboss.xml
index 0f81c26fbc..28abd03612 100644
--- a/assets/xml/scenes/dungeons/jyasinboss.xml
+++ b/assets/xml/scenes/dungeons/jyasinboss.xml
@@ -2,6 +2,7 @@
     <File Name="jyasinboss_scene" Segment="2">
         <Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/>
         <Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/>
+        <Cutscene Name="gSpiritBossTitleCs" Offset="0x5850"/>
         <Scene Name="jyasinboss_scene" Offset="0x0"/>
     </File>
     <File Name="jyasinboss_room_0" Segment="3">
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 1e27258306..60c81ed83c 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -97,7 +97,7 @@ EntranceCutscene sEntranceCutsceneTable[] = {
     { ENTR_GERUDO_VALLEY_0, 2, EVENTCHKINF_B2, gGerudoValleyIntroCs },
     { ENTR_GERUDOS_FORTRESS_0, 2, EVENTCHKINF_B3, gGerudoFortressIntroCs },
     { ENTR_LON_LON_RANCH_0, 2, EVENTCHKINF_B4, gLonLonRanchIntroCs },
-    { ENTR_JABU_JABU_0, 2, EVENTCHKINF_B5, gJabuJabuIntroCs },
+    { ENTR_JABU_JABU_0, 2, EVENTCHKINF_B5, gJabuIntroCs },
     { ENTR_GRAVEYARD_0, 2, EVENTCHKINF_B6, gGraveyardIntroCs },
     { ENTR_ZORAS_FOUNTAIN_2, 2, EVENTCHKINF_B7, gZorasFountainIntroCs },
     { ENTR_DESERT_COLOSSUS_0, 2, EVENTCHKINF_B8, gDesertColossusIntroCs },
@@ -117,7 +117,7 @@ EntranceCutscene sEntranceCutsceneTable[] = {
 };
 
 void* sCutscenesUnknownList[] = {
-    gDekuTreeIntroCs,     gJabuJabuIntroCs, gDcOpeningCs, gSpiritBossNabooruKnuckleDefeatCs,
+    gDekuTreeIntroCs,     gJabuIntroCs,    gDcOpeningCs, gSpiritBossNabooruKnuckleDefeatCs,
     gIceCavernSerenadeCs, gTowerBarrierCs,
 };