mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 07:07:09 +00:00
Code Issues Projects Releases Wiki Activity

Naming cutscenes from Lon-Lon Ranch (#2359)

Browse source 
* name cs from ranch

* fixed llr credits cs dest part 5 and 6 being inverted

* format
This commit is contained in:
Yanis 2024-12-14 00:28:48 +01:00 committed by GitHub
parent d12750b956
commit 4b20d8269b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assets/xml/scenes/overworld/spot20.xml
View file

@ -1,6 +1,16 @@
<Root>
<File Name="spot20_scene" Segment="2">
<Cutscene Name="gLonLonRanchIntroCs" Offset="0x5B70"/>
<Cutscene Name="gLonLonRanchRaceIntroCs" Offset="0x2980"/>
<Cutscene Name="gLonLonRanchEponasSongCs" Offset="0x2B40"/>
<Cutscene Name="gLonLonRanchCreditsPart1Cs" Offset="0x2F80"/>
<Cutscene Name="gLonLonRanchCreditsPart2Cs" Offset="0x31E0"/>
<Cutscene Name="gLonLonRanchCreditsPart3Cs" Offset="0x3450"/>
<Cutscene Name="gLonLonRanchCreditsPart4Cs" Offset="0x3730"/>
<Cutscene Name="gLonLonRanchCreditsPart5Cs" Offset="0x4460"/>
<Cutscene Name="gLonLonRanchCreditsPart6Cs" Offset="0x3980"/>
<Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x8180"/>
<Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFB80"/>
<Path Name="spot20_scenePathList_005844" Offset="0x57E4" NumPaths="2"/>

10
assets/xml/scenes/overworld/spot20_pal.xml
View file

@ -1,6 +1,16 @@
<Root>
<File Name="spot20_scene" Segment="2">
<Cutscene Name="gLonLonRanchIntroCs" Offset="0x5BD0"/>
<Cutscene Name="gLonLonRanchRaceIntroCs" Offset="0x2980"/>
<Cutscene Name="gLonLonRanchEponasSongCs" Offset="0x2B40"/>
<Cutscene Name="gLonLonRanchCreditsPart1Cs" Offset="0x2F84"/>
<Cutscene Name="gLonLonRanchCreditsPart2Cs" Offset="0x31E4"/>
<Cutscene Name="gLonLonRanchCreditsPart3Cs" Offset="0x3474"/>
<Cutscene Name="gLonLonRanchCreditsPart4Cs" Offset="0x3764"/>
<Cutscene Name="gLonLonRanchCreditsPart5Cs" Offset="0x44B4"/>
<Cutscene Name="gLonLonRanchCreditsPart6Cs" Offset="0x39C4"/>
<Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x81E0"/>
<Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFBE0"/>
<Path Name="spot20_scenePathList_005844" Offset="0x5844" NumPaths="2"/>

4
include/z64cutscene.h
View file

@ -299,8 +299,8 @@ typedef enum CutsceneDestination {
/* 0x4A */ CS_DEST_LON_LON_RANCH_CREDITS_PART_2,
/* 0x4B */ CS_DEST_LON_LON_RANCH_CREDITS_PART_3,
/* 0x4C */ CS_DEST_LON_LON_RANCH_CREDITS_PART_4,
/* 0x4D */ CS_DEST_LON_LON_RANCH_CREDITS_PART_5,
/* 0x4E */ CS_DEST_LON_LON_RANCH_CREDITS_PART_6,
/* 0x4D */ CS_DEST_LON_LON_RANCH_CREDITS_PART_6,
/* 0x4E */ CS_DEST_LON_LON_RANCH_CREDITS_PART_5,
/* 0x4F */ CS_DEST_LON_LON_RANCH_1, // unused
/* 0x50 */ CS_DEST_LON_LON_RANCH_2, // unused
/* 0x51 */ CS_DEST_LON_LON_RANCH_3, // unused

4
src/code/z_demo.c
View file

@ -1134,7 +1134,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
play->transitionType = TRANS_TYPE_FADE_BLACK;
break;
case CS_DEST_LON_LON_RANCH_CREDITS_PART_5:
case CS_DEST_LON_LON_RANCH_CREDITS_PART_6:
play->linkAgeOnLoad = LINK_AGE_CHILD;
play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
play->transitionTrigger = TRANS_TRIGGER_START;
@ -1142,7 +1142,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
play->transitionType = TRANS_TYPE_FADE_BLACK;
break;
case CS_DEST_LON_LON_RANCH_CREDITS_PART_6:
case CS_DEST_LON_LON_RANCH_CREDITS_PART_5:
play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
play->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.save.cutsceneIndex = 0xFFF7;

4
tools/ZAPDConfigs/EnumData.xml
View file

@ -297,8 +297,8 @@
<Item Key="lon_lon_ranch_credits_part_2" ID="CS_DEST_LON_LON_RANCH_CREDITS_PART_2" Index="74"/>
<Item Key="lon_lon_ranch_credits_part_3" ID="CS_DEST_LON_LON_RANCH_CREDITS_PART_3" Index="75"/>
<Item Key="lon_lon_ranch_credits_part_4" ID="CS_DEST_LON_LON_RANCH_CREDITS_PART_4" Index="76"/>
<Item Key="lon_lon_ranch_credits_part_5" ID="CS_DEST_LON_LON_RANCH_CREDITS_PART_5" Index="77"/>
<Item Key="lon_lon_ranch_credits_part_6" ID="CS_DEST_LON_LON_RANCH_CREDITS_PART_6" Index="78"/>
<Item Key="lon_lon_ranch_credits_part_5" ID="CS_DEST_LON_LON_RANCH_CREDITS_PART_5" Index="78"/>
<Item Key="lon_lon_ranch_credits_part_6" ID="CS_DEST_LON_LON_RANCH_CREDITS_PART_6" Index="77"/>
<Item Key="lon_lon_ranch_1" ID="CS_DEST_LON_LON_RANCH_1" Index="79"/>
<Item Key="lon_lon_ranch_2" ID="CS_DEST_LON_LON_RANCH_2" Index="80"/>
<Item Key="lon_lon_ranch_3" ID="CS_DEST_LON_LON_RANCH_3" Index="81"/>

4
tools/csdis.py
View file

@ -94,8 +94,8 @@ cutscene_destinations = {
0x4A: "CS_DEST_LON_LON_RANCH_CREDITS_PART_2",
0x4B: "CS_DEST_LON_LON_RANCH_CREDITS_PART_3",
0x4C: "CS_DEST_LON_LON_RANCH_CREDITS_PART_4",
0x4D: "CS_DEST_LON_LON_RANCH_CREDITS_PART_5",
0x4E: "CS_DEST_LON_LON_RANCH_CREDITS_PART_6",
0x4D: "CS_DEST_LON_LON_RANCH_CREDITS_PART_6",
0x4E: "CS_DEST_LON_LON_RANCH_CREDITS_PART_5",
0x4F: "CS_DEST_LON_LON_RANCH_1",
0x50: "CS_DEST_LON_LON_RANCH_2",
0x51: "CS_DEST_LON_LON_RANCH_3",