mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-03 18:14:26 +00:00
Code Issues Projects Releases Wiki Activity

Name cutscenes of remaining actors (#2366)

Browse source 
* name cs from remaining actors

* small change for consistency

* review
This commit is contained in:
Yanis 2024-12-15 20:29:52 +01:00 • committed by GitHub
parent b270d58f43
commit 76c1b621ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/xml/scenes/dungeons/bdan.xml
View file

@ -1,7 +1,7 @@
<Root> <Root>
<File Name="bdan_scene" Segment="2"> <File Name="bdan_scene" Segment="2">
<Cutscene Name="gJabuIntroCs" Offset="0x155E0"/> <Cutscene Name="gJabuIntroCs" Offset="0x155E0"/>
<Cutscene Name="gJabuSapphireRetrieveUnusedCs" Offset="0x13080"/> <Cutscene Name="gJabuRutoObtainingSapphireUnusedCs" 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">

2
assets/xml/scenes/dungeons/bdan_mq.xml
View file

@ -1,7 +1,7 @@
<Root> <Root>
<File Name="bdan_scene" Segment="2"> <File Name="bdan_scene" Segment="2">
<Cutscene Name="gJabuIntroCs" Offset="0x15600"/> <Cutscene Name="gJabuIntroCs" Offset="0x15600"/>
<Cutscene Name="gJabuSapphireRetrieveUnusedCs" Offset="0x130A0"/> <Cutscene Name="gJabuRutoObtainingSapphireUnusedCs" 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">

2
src/overlays/actors/ovl_En_Jj/z_en_jj.c
View file

@ -214,7 +214,7 @@ void EnJj_BeginCutscene(EnJj* this, PlayState* play) {
this->cutsceneCountdownTimer--; this->cutsceneCountdownTimer--;
} else { } else {
EnJj_SetupAction(this, EnJj_RemoveDust); EnJj_SetupAction(this, EnJj_RemoveDust);
play->csCtx.script = D_80A88164; play->csCtx.script = gJabuInhalingCs;
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
DynaPoly_DisableCollision(play, &play->colCtx.dyna, bodyCollisionActor->bgId); DynaPoly_DisableCollision(play, &play->colCtx.dyna, bodyCollisionActor->bgId);
Camera_SetFinishedFlag(GET_ACTIVE_CAM(play)); Camera_SetFinishedFlag(GET_ACTIVE_CAM(play));

2
src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c
View file

@ -2,7 +2,7 @@
#include "z64cutscene_commands.h" #include "z64cutscene_commands.h"
// clang-format off // clang-format off
static CutsceneData D_80A88164[] = { static CutsceneData gJabuInhalingCs[] = {
CS_HEADER(26, 1629), CS_HEADER(26, 1629),
CS_PLAYER_CUE_LIST(4), CS_PLAYER_CUE_LIST(4),
CS_PLAYER_CUE(PLAYER_CUEID_5, 0, 240, 0x0000, 0x4000, 0x0000, -1732, 52, -44, -1732, 52, -44, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_5, 0, 240, 0x0000, 0x4000, 0x0000, -1732, 52, -44, -1732, 52, -44, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)),

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

@ -35,8 +35,8 @@ ActorProfile En_Okarina_Tag_Profile = {
/**/ NULL, /**/ NULL,
}; };
extern CutsceneData D_80ABF9D0[]; extern CutsceneData gWindmillSpinningFasterCs[];
extern CutsceneData D_80ABFB40[]; extern CutsceneData gDoorOfTimeOpeningCs[];
void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play) { void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play) {
} }
@ -247,14 +247,14 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) {
SET_EVENTCHKINF(EVENTCHKINF_39); SET_EVENTCHKINF(EVENTCHKINF_39);
break; break;
case 2: case 2:
play->csCtx.script = D_80ABF9D0; play->csCtx.script = gWindmillSpinningFasterCs;
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
// Increase pitch by 3 semitones i.e. 2^(3/12), scale tempo by same ratio // Increase pitch by 3 semitones i.e. 2^(3/12), scale tempo by same ratio
// Applies to the windmill bgm once the song of storms fanfare is complete // Applies to the windmill bgm once the song of storms fanfare is complete
Audio_SetMainBgmTempoFreqAfterFanfare(1.18921f, 90); Audio_SetMainBgmTempoFreqAfterFanfare(1.18921f, 90);
break; break;
case 4: case 4:
play->csCtx.script = D_80ABFB40; play->csCtx.script = gDoorOfTimeOpeningCs;
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
break; break;
case 6: case 6:

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

@ -2,7 +2,7 @@
#include "z64cutscene_commands.h" #include "z64cutscene_commands.h"
// clang-format off // clang-format off
CutsceneData D_80ABF9D0[] = { CutsceneData gWindmillSpinningFasterCs[] = {
CS_HEADER(4, 360), CS_HEADER(4, 360),
CS_DESTINATION(CS_DEST_KAKARIKO_VILLAGE_DRAIN_WELL, 200, 201), CS_DESTINATION(CS_DEST_KAKARIKO_VILLAGE_DRAIN_WELL, 200, 201),
CS_CAM_EYE_SPLINE(0, 331), CS_CAM_EYE_SPLINE(0, 331),
@ -28,7 +28,7 @@ CutsceneData D_80ABF9D0[] = {
CS_END_OF_SCRIPT(), CS_END_OF_SCRIPT(),
}; };
CutsceneData D_80ABFB40[] = { CutsceneData gDoorOfTimeOpeningCs[] = {
CS_HEADER(18, 3000), CS_HEADER(18, 3000),
CS_UNK_DATA_LIST(0x00000021, 1), CS_UNK_DATA_LIST(0x00000021, 1),
CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFAA, 0xFFFFFFAE, 0x00000000, 0xFFFFFFAA, 0xFFFFFFAE, 0x00000000, 0x00000000, 0x00000000), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFAA, 0xFFFFFFAE, 0x00000000, 0xFFFFFFAA, 0xFFFFFFAE, 0x00000000, 0x00000000, 0x00000000),

6
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -862,7 +862,7 @@ void func_80AEC780(EnRu1* this, PlayState* play) {
(!(player->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_21))) && (!(player->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_21))) &&
(player->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) { (player->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) {
play->csCtx.script = D_80AF0880; play->csCtx.script = gRutoFirstMeetingCs;
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
player->speedXZ = 0.0f; player->speedXZ = 0.0f;
this->action = 8; this->action = 8;
@ -1552,7 +1552,7 @@ s32 func_80AEE394(EnRu1* this, PlayState* play) {
if (dynaPolyActor != NULL && dynaPolyActor->actor.id == ACTOR_BG_BDAN_OBJECTS && if (dynaPolyActor != NULL && dynaPolyActor->actor.id == ACTOR_BG_BDAN_OBJECTS &&
dynaPolyActor->actor.params == 0 && !Player_InCsMode(play) && play->msgCtx.msgLength == 0) { dynaPolyActor->actor.params == 0 && !Player_InCsMode(play) && play->msgCtx.msgLength == 0) {
func_80AEE02C(this); func_80AEE02C(this);
play->csCtx.script = D_80AF10A4; play->csCtx.script = gRutoObtainingSapphireCs;
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
this->action = 36; this->action = 36;
this->drawConfig = 0; this->drawConfig = 0;
@ -1625,7 +1625,7 @@ s32 func_80AEE6D0(EnRu1* this, PlayState* play) {
func_80AED600(this); func_80AED600(this);
this->action = 34; this->action = 34;
this->unk_26C = 0.0f; this->unk_26C = 0.0f;
play->csCtx.script = D_80AF1728; play->csCtx.script = gRutoFoundSapphireCs;
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
} }
this->roomNum3 = curRoomNum; this->roomNum3 = curRoomNum;

6
src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c
View file

@ -2,7 +2,7 @@
#include "z64cutscene_commands.h" #include "z64cutscene_commands.h"
// clang-format off // clang-format off
static CutsceneData D_80AF0880[] = { static CutsceneData gRutoFirstMeetingCs[] = {
CS_HEADER(15, 1306), CS_HEADER(15, 1306),
CS_PLAYER_CUE_LIST(10), CS_PLAYER_CUE_LIST(10),
CS_PLAYER_CUE(PLAYER_CUEID_39, 0, 50, 0x0000, 0x6C16, 0x0000, 12, -340, -2810, 12, -340, -2810, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_39, 0, 50, 0x0000, 0x6C16, 0x0000, 12, -340, -2810, 12, -340, -2810, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)),
@ -112,7 +112,7 @@ static CutsceneData D_80AF0880[] = {
static u32 D_80AF10A0 = 0; static u32 D_80AF10A0 = 0;
static CutsceneData D_80AF10A4[] = { static CutsceneData gRutoObtainingSapphireCs[] = {
CS_HEADER(14, 1299), CS_HEADER(14, 1299),
CS_PLAYER_CUE_LIST(3), CS_PLAYER_CUE_LIST(3),
CS_PLAYER_CUE(PLAYER_CUEID_5, 0, 272, 0x0000, 0xC000, 0x0000, -1085, -1025, -3347, -1085, -1025, -3347, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_5, 0, 272, 0x0000, 0xC000, 0x0000, -1085, -1025, -3347, -1085, -1025, -3347, CS_FLOAT(0xF671408, 1.1393037e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)),
@ -201,7 +201,7 @@ static CutsceneData D_80AF10A4[] = {
static u32 D_80AF1724 = 0; static u32 D_80AF1724 = 0;
static CutsceneData D_80AF1728[] = { static CutsceneData gRutoFoundSapphireCs[] = {
CS_HEADER(7, 1160), CS_HEADER(7, 1160),
CS_MISC_LIST(1), CS_MISC_LIST(1),
CS_MISC(CS_MISC_STOP_CUTSCENE, 75, 627, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000), CS_MISC(CS_MISC_STOP_CUTSCENE, 75, 627, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000),

4
src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
View file

@ -23,7 +23,7 @@ void func_80B4BBC4(EnZl1* this, PlayState* play);
void func_80B4BC78(EnZl1* this, PlayState* play); void func_80B4BC78(EnZl1* this, PlayState* play);
void func_80B4BF2C(EnZl1* this, PlayState* play); void func_80B4BF2C(EnZl1* this, PlayState* play);
extern CutsceneData D_80B4C5D0[]; extern CutsceneData gTriforceCreationStartCs[];
#include "z_en_zl1_camera_data.inc.c" #include "z_en_zl1_camera_data.inc.c"
@ -318,7 +318,7 @@ void func_80B4B240(EnZl1* this, PlayState* play) {
if (this->skelAnime.curFrame == frameCount) { if (this->skelAnime.curFrame == frameCount) {
animHeaderSeg = &gChildZelda1Anim_00438; animHeaderSeg = &gChildZelda1Anim_00438;
sp3C = 1; sp3C = 1;
play->csCtx.script = D_80B4C5D0; play->csCtx.script = gTriforceCreationStartCs;
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
this->actionFunc = func_80B4B8B4; this->actionFunc = func_80B4B8B4;
this->unk_1E2++; this->unk_1E2++;

12
src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c
View file

@ -2,7 +2,7 @@
#include "z64cutscene_commands.h" #include "z64cutscene_commands.h"
// clang-format off // clang-format off
CutsceneData D_80B4C5D0[] = { CutsceneData gTriforceCreationStartCs[] = {
CS_HEADER(28, 3000), CS_HEADER(28, 3000),
CS_PLAYER_CUE_LIST(3), CS_PLAYER_CUE_LIST(3),
CS_PLAYER_CUE(PLAYER_CUEID_5, 400, 1211, 0x0000, 0xC000, 0x0000, -422, 84, 1, -422, 84, 1, CS_FLOAT(0xF6484E4, 1.1266862e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), CS_PLAYER_CUE(PLAYER_CUEID_5, 400, 1211, 0x0000, 0xC000, 0x0000, -422, 84, 1, -422, 84, 1, CS_FLOAT(0xF6484E4, 1.1266862e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)),
@ -228,15 +228,15 @@ CutsceneData D_80B4C5D0[] = {
CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x412FFF56, 10.999838f), -1349, 124, -6, 0x392C), CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x412FFF56, 10.999838f), -1349, 124, -6, 0x392C),
CS_TEXT_LIST(10), CS_TEXT_LIST(10),
CS_TEXT_NONE(0, 50), CS_TEXT_NONE(0, 50),
CS_TEXT(0x7035, 50, 190, 0x0000, 0xFFFF, 0xFFFF), CS_TEXT(0x7035, 50, 190, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_TEXT_NONE(190, 300), CS_TEXT_NONE(190, 300),
CS_TEXT(0x7036, 300, 800, 0x0000, 0xFFFF, 0xFFFF), CS_TEXT(0x7036, 300, 800, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_TEXT_NONE(800, 970), CS_TEXT_NONE(800, 970),
CS_TEXT(0x7037, 970, 1150, 0x0000, 0xFFFF, 0x7038), CS_TEXT(0x7037, 970, 1150, CS_TEXT_NORMAL, 0xFFFF, 0x7038),
CS_TEXT_NONE(1150, 1190), CS_TEXT_NONE(1150, 1190),
CS_TEXT(0x7005, 1190, 1200, 0x0000, 0xFFFF, 0x700B), CS_TEXT(0x7005, 1190, 1200, CS_TEXT_NORMAL, 0xFFFF, 0x700B),
CS_TEXT_NONE(1200, 1340), CS_TEXT_NONE(1200, 1340),
CS_TEXT(0x7009, 1340, 1420, 0x0000, 0xFFFF, 0xFFFF), CS_TEXT(0x7009, 1340, 1420, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
CS_START_SEQ_LIST(1), CS_START_SEQ_LIST(1),
CS_START_SEQ(NA_BGM_HYRULE_CS, 230, 231, 0x0000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000), CS_START_SEQ(NA_BGM_HYRULE_CS, 230, 231, 0x0000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000),
CS_START_SEQ_LIST(1), CS_START_SEQ_LIST(1),