1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00

Name cutscenes from dungeons (Spirit Boss Room, Jabu-Jabu's Belly and Ganon) (#2361)

* name cs from dungeons

* review
This commit is contained in:
Yanis 2024-12-14 03:17:04 +01:00 committed by GitHub
parent 9170902f8d
commit a59a60e414
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 8 additions and 4 deletions

View file

@ -1,6 +1,7 @@
<Root> <Root>
<File Name="bdan_scene" Segment="2"> <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"/> <Scene Name="bdan_scene" Offset="0x0"/>
</File> </File>
<File Name="bdan_room_0" Segment="3"> <File Name="bdan_room_0" Segment="3">

View file

@ -1,6 +1,7 @@
<Root> <Root>
<File Name="bdan_scene" Segment="2"> <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"/> <Scene Name="bdan_scene" Offset="0x0"/>
</File> </File>
<File Name="bdan_room_0" Segment="3"> <File Name="bdan_room_0" Segment="3">

View file

@ -1,6 +1,7 @@
<Root> <Root>
<File Name="ganon_demo_scene" Segment="2"> <File Name="ganon_demo_scene" Segment="2">
<Scene Name="ganon_demo_scene" Offset="0x0"/> <Scene Name="ganon_demo_scene" Offset="0x0"/>
<Cutscene Name="gGanonCastleCollapseCs" Offset="0x01B0"/>
</File> </File>
<File Name="ganon_demo_room_0" Segment="3"> <File Name="ganon_demo_room_0" Segment="3">
<Room Name="ganon_demo_room_0" Offset="0x0"/> <Room Name="ganon_demo_room_0" Offset="0x0"/>

View file

@ -2,6 +2,7 @@
<File Name="jyasinboss_scene" Segment="2"> <File Name="jyasinboss_scene" Segment="2">
<Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/> <Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/>
<Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/> <Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/>
<Cutscene Name="gSpiritBossTitleCs" Offset="0x5850"/>
<Scene Name="jyasinboss_scene" Offset="0x0"/> <Scene Name="jyasinboss_scene" Offset="0x0"/>
</File> </File>
<File Name="jyasinboss_room_0" Segment="3"> <File Name="jyasinboss_room_0" Segment="3">

View file

@ -97,7 +97,7 @@ EntranceCutscene sEntranceCutsceneTable[] = {
{ ENTR_GERUDO_VALLEY_0, 2, EVENTCHKINF_B2, gGerudoValleyIntroCs }, { ENTR_GERUDO_VALLEY_0, 2, EVENTCHKINF_B2, gGerudoValleyIntroCs },
{ ENTR_GERUDOS_FORTRESS_0, 2, EVENTCHKINF_B3, gGerudoFortressIntroCs }, { ENTR_GERUDOS_FORTRESS_0, 2, EVENTCHKINF_B3, gGerudoFortressIntroCs },
{ ENTR_LON_LON_RANCH_0, 2, EVENTCHKINF_B4, gLonLonRanchIntroCs }, { 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_GRAVEYARD_0, 2, EVENTCHKINF_B6, gGraveyardIntroCs },
{ ENTR_ZORAS_FOUNTAIN_2, 2, EVENTCHKINF_B7, gZorasFountainIntroCs }, { ENTR_ZORAS_FOUNTAIN_2, 2, EVENTCHKINF_B7, gZorasFountainIntroCs },
{ ENTR_DESERT_COLOSSUS_0, 2, EVENTCHKINF_B8, gDesertColossusIntroCs }, { ENTR_DESERT_COLOSSUS_0, 2, EVENTCHKINF_B8, gDesertColossusIntroCs },
@ -117,7 +117,7 @@ EntranceCutscene sEntranceCutsceneTable[] = {
}; };
void* sCutscenesUnknownList[] = { void* sCutscenesUnknownList[] = {
gDekuTreeIntroCs, gJabuJabuIntroCs, gDcOpeningCs, gSpiritBossNabooruKnuckleDefeatCs, gDekuTreeIntroCs, gJabuIntroCs, gDcOpeningCs, gSpiritBossNabooruKnuckleDefeatCs,
gIceCavernSerenadeCs, gTowerBarrierCs, gIceCavernSerenadeCs, gTowerBarrierCs,
}; };