mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 11:03:46 +00:00
Code Issues Projects Releases Wiki Activity

Naming some cutscenes 4 (Gerudo Fortress, Death Mountain Crater and Goron City) (#2356)

Browse source 
* name cs from gerudo fortress, dmc and goron city

* format and updated comment about the darunia dancing cutscene

* review 2
This commit is contained in:
Yanis 2024-12-13 23:03:51 +01:00 • committed by GitHub
parent 016aef482b
commit 2f40fed5c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/xml/scenes/overworld/spot12.xml
View file

@ -2,6 +2,8 @@
<File Name="spot12_scene" Segment="2">
<Cutscene Name="gGerudoFortressFirstCaptureCs" Offset="0x55C0"/>
<Cutscene Name="gGerudoFortressIntroCs" Offset="0x6490"/>
<Cutscene Name="gGerudoFortressArcheryIntroCs" Offset="0x5060"/>
<Cutscene Name="gGerudoFortressCreditsCs" Offset="0x5450"/>
<Texture Name="gGerudoFortressNightWallTex" Format="rgba16" Width="64" Height="32" Offset="0x9678"/>
<Texture Name="gGerudoFortressDayWallTex" Format="rgba16" Width="64" Height="32" Offset="0xDE78"/>
<Scene Name="spot12_scene" Offset="0x0"/>

2
assets/xml/scenes/overworld/spot12_pal_n64.xml
View file

@ -2,6 +2,8 @@
<File Name="spot12_scene" Segment="2">
<Cutscene Name="gGerudoFortressFirstCaptureCs" Offset="0x55D0"/>
<Cutscene Name="gGerudoFortressIntroCs" Offset="0x64A0"/>
<Cutscene Name="gGerudoFortressArcheryIntroCs" Offset="0x5060"/>
<Cutscene Name="gGerudoFortressCreditsCs" Offset="0x5454"/>
<Texture Name="gGerudoFortressNightWallTex" Format="rgba16" Width="64" Height="32" Offset="0x9688"/>
<Texture Name="gGerudoFortressDayWallTex" Format="rgba16" Width="64" Height="32" Offset="0xDE88"/>
<Scene Name="spot12_scene" Offset="0x0"/>

1
assets/xml/scenes/overworld/spot17.xml
View file

@ -2,6 +2,7 @@
<File Name="spot17_scene" Segment="2">
<Cutscene Name="gDeathMountainCraterBoleroCs" Offset="0x45D0"/>
<Cutscene Name="gDeathMountainCraterIntroCs" Offset="0x76D0"/>
<Cutscene Name="gDeathMountainCraterTitleCs" Offset="0x68B0"/>
<Scene Name="spot17_scene" Offset="0x0"/>
</File>
<File Name="spot17_room_0" Segment="3">

1
assets/xml/scenes/overworld/spot17_pal_n64.xml
View file

@ -2,6 +2,7 @@
<File Name="spot17_scene" Segment="2">
<Cutscene Name="gDeathMountainCraterBoleroCs" Offset="0x45D4"/>
<Cutscene Name="gDeathMountainCraterIntroCs" Offset="0x76E0"/>
<Cutscene Name="gDeathMountainCraterTitleCs" Offset="0x68C0"/>
<Scene Name="spot17_scene" Offset="0x0"/>
</File>
<File Name="spot17_room_0" Segment="3">

11
assets/xml/scenes/overworld/spot18.xml
View file

@ -1,9 +1,14 @@
<Root>
<File Name="spot18_scene" Segment="2">
<Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
<Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
<Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
<Cutscene Name="gGoronCityDaruniaCorrectSongCs" Offset="0x59E0"/>
<Cutscene Name="gGoronCityDaruniaWrongSongCs" Offset="0x7DE0"/>
<!-- This cutscene is not used in normal gameplay. -->
<Cutscene Name="gGoronCityDaruniaDancingCs" Offset="0x6930"/>
<Cutscene Name="gGoronCityIntroCs" Offset="0x8400"/>
<Cutscene Name="gGoronCityCreditsCs" Offset="0x7840"/>
<Texture Name="gGoronCityNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FC8"/>
<Texture Name="gGoronCityDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x9808"/>
<Scene Name="spot18_scene" Offset="0x0"/>

11
assets/xml/scenes/overworld/spot18_pal_n64.xml
View file

@ -1,9 +1,14 @@
<Root>
<File Name="spot18_scene" Segment="2">
<Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
<Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
<Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DF4"/>
<Cutscene Name="gGoronCityDaruniaCorrectSongCs" Offset="0x59E0"/>
<Cutscene Name="gGoronCityDaruniaWrongSongCs" Offset="0x7DF4"/>
<!-- This cutscene is not used in normal gameplay. -->
<Cutscene Name="gGoronCityDaruniaDancingCs" Offset="0x6930"/>
<Cutscene Name="gGoronCityIntroCs" Offset="0x8380"/>
<Cutscene Name="gGoronCityCreditsCs" Offset="0x7844"/>
<Texture Name="gGoronCityNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8F48"/>
<Texture Name="gGoronCityDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x9788"/>
<Scene Name="spot18_scene" Offset="0x0"/>

6
src/overlays/actors/ovl_En_Du/z_en_du.c
View file

@ -293,7 +293,7 @@ void EnDu_Init(Actor* thisx, PlayState* play) {
this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
if (gSaveContext.save.cutsceneIndex >= 0xFFF0) {
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDarunia01Cs);
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaDancingCs);
gSaveContext.cutsceneTrigger = 1;
EnDu_SetupAction(this, func_809FE890);
} else if (play->sceneId == SCENE_FIRE_TEMPLE) {
@ -341,7 +341,7 @@ void func_809FE4A4(EnDu* this, PlayState* play) {
play->msgCtx.ocarinaMode = OCARINA_MODE_00;
EnDu_SetupAction(this, func_809FE3C0);
} else if (play->msgCtx.ocarinaMode >= OCARINA_MODE_06) {
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaWrongCs);
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaWrongSongCs);
gSaveContext.cutsceneTrigger = 1;
this->unk_1E8 = 1;
EnDu_SetupAction(this, func_809FE890);
@ -349,7 +349,7 @@ void func_809FE4A4(EnDu* this, PlayState* play) {
} else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
Audio_PlaySfxGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaCorrectCs);
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaCorrectSongCs);
gSaveContext.cutsceneTrigger = 1;
this->unk_1E8 = 0;
EnDu_SetupAction(this, func_809FE890);