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

Name some scene cutscenes 2 (Graveyard, Meadow and Lake Hylia) (#2339)

Browse source 
* name cs from graveyard, meadow and lake hylia

* `gLakeHyliaWaterRaisingCs` --> `gLakeHyliaRestoredCs`
This commit is contained in:
Yanis 2024-12-15 01:53:28 +01:00 committed by GitHub
parent 0f27d2fea3
commit db8d351c5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assets/xml/scenes/overworld/spot02.xml
View file

@ -2,9 +2,9 @@
<File Name="spot02_scene" Segment="2"> <File Name="spot02_scene" Segment="2">
<Scene Name="spot02_scene" Offset="0x0"/> <Scene Name="spot02_scene" Offset="0x0"/>
<Cutscene Name="spot02_scene_Cs_003C80" Offset="0x3C80"/> <Cutscene Name="gGraveyardTombOpeningAdultCs" Offset="0x3C80"/>
<Cutscene Name="gGraveyardTombOpeningChildCs" Offset="0x5020"/>
<Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/> <Cutscene Name="gGraveyardSunsSongPart2Cs" Offset="0x4E90"/>
<Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/> <Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>
</File> </File>
<File Name="spot02_room_0" Segment="3"> <File Name="spot02_room_0" Segment="3">

5
assets/xml/scenes/overworld/spot05.xml
View file

@ -1,8 +1,7 @@
<Root> <Root>
<File Name="spot05_scene" Segment="2"> <File Name="spot05_scene" Segment="2">
<Cutscene Name="gMinuetCs" Offset="0x3F80"/> <Cutscene Name="gMeadowMinuetCs" Offset="0x3F80"/>
<Cutscene Name="gMeadowSariasSongCs" Offset="0x5730"/>
<Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
<Path Name="spot05_scenePathList_0069D8" Offset="0x69D8" NumPaths="5"/> <Path Name="spot05_scenePathList_0069D8" Offset="0x69D8" NumPaths="5"/>

5
assets/xml/scenes/overworld/spot05_pal_n64.xml
View file

@ -1,8 +1,7 @@
<Root> <Root>
<File Name="spot05_scene" Segment="2"> <File Name="spot05_scene" Segment="2">
<Cutscene Name="gMinuetCs" Offset="0x3F84"/> <Cutscene Name="gMeadowMinuetCs" Offset="0x3F84"/>
<Cutscene Name="gMeadowSariasSongCs" Offset="0x5740"/>
<Cutscene Name="spot05_scene_Cs_005730" Offset="0x5740"/>
<Path Name="spot05_scenePathList_0069D8" Offset="0x69E8" NumPaths="5"/> <Path Name="spot05_scenePathList_0069D8" Offset="0x69E8" NumPaths="5"/>

5
assets/xml/scenes/overworld/spot06.xml
View file

@ -2,8 +2,11 @@
<File Name="spot06_scene" Segment="2"> <File Name="spot06_scene" Segment="2">
<Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/> <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
<Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/> <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
<Path Name="spot06_scenePathList_007764" Offset="0x7764" NumPaths="2"/>
<Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/> <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"/> <Scene Name="spot06_scene" Offset="0x0"/>
</File> </File>
<File Name="spot06_room_0" Segment="3"> <File Name="spot06_room_0" Segment="3">

5
assets/xml/scenes/overworld/spot06_pal_n64.xml
View file

@ -2,8 +2,11 @@
<File Name="spot06_scene" Segment="2"> <File Name="spot06_scene" Segment="2">
<Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7030"/> <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7030"/>
<Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0D0"/> <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0D0"/>
<Path Name="spot06_scenePathList_007764" Offset="0x7774" NumPaths="2"/>
<Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A40"/> <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"/> <Scene Name="spot06_scene" Offset="0x0"/>
</File> </File>
<File Name="spot06_room_0" Segment="3"> <File Name="spot06_room_0" Segment="3">

4
src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
View file

@ -258,8 +258,8 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) {
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
break; break;
case 6: case 6:
play->csCtx.script = LINK_IS_ADULT ? SEGMENTED_TO_VIRTUAL(spot02_scene_Cs_003C80) play->csCtx.script = LINK_IS_ADULT ? SEGMENTED_TO_VIRTUAL(gGraveyardTombOpeningAdultCs)
: SEGMENTED_TO_VIRTUAL(spot02_scene_Cs_005020); : SEGMENTED_TO_VIRTUAL(gGraveyardTombOpeningChildCs);
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
SET_EVENTCHKINF(EVENTCHKINF_1D); SET_EVENTCHKINF(EVENTCHKINF_1D);
Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);

2
src/overlays/actors/ovl_En_Sa/z_en_sa.c
View file

@ -627,7 +627,7 @@ void func_80AF683C(EnSa* this, PlayState* play) {
Player* player = GET_PLAYER(play); Player* player = GET_PLAYER(play);
if (!(player->actor.world.pos.z >= -2220.0f) && !Play_InCsMode(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; gSaveContext.cutsceneTrigger = 1;
this->actionFunc = func_80AF68E4; this->actionFunc = func_80AF68E4;
} }

2
src/overlays/actors/ovl_En_Xc/z_en_xc.c
View file

@ -305,7 +305,7 @@ s32 EnXc_MinuetCS(EnXc* this, PlayState* play) {
if (!Play_InCsMode(play)) { if (!Play_InCsMode(play)) {
s32 pad; s32 pad;
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMinuetCs); play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMeadowMinuetCs);
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
SET_EVENTCHKINF(EVENTCHKINF_50); SET_EVENTCHKINF(EVENTCHKINF_50);
Item_Give(play, ITEM_SONG_MINUET); Item_Give(play, ITEM_SONG_MINUET);