Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Dec 15, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70d3923
name cs from graveyard, meadow and lake hylia
Yanis002 Dec 11, 2024
483b77f
`gLakeHyliaWaterRaisingCs` --> `gLakeHyliaRestoredCs`
Yanis002 Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions assets/xml/scenes/overworld/spot02.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 2 additions & 3 deletions assets/xml/scenes/overworld/spot05.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"/>

Expand Down
5 changes: 2 additions & 3 deletions assets/xml/scenes/overworld/spot05_pal_n64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"/>

Expand Down
5 changes: 4 additions & 1 deletion assets/xml/scenes/overworld/spot06.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 4 additions & 1 deletion assets/xml/scenes/overworld/spot06_pal_n64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/overlays/actors/ovl_En_Sa/z_en_sa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/overlays/actors/ovl_En_Xc/z_en_xc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down