From 76c1b621ac10c92282c5ac921d888c58d8dc9a28 Mon Sep 17 00:00:00 2001 From: Yanis <35189056+Yanis002@users.noreply.github.com> Date: Sun, 15 Dec 2024 20:29:52 +0100 Subject: [PATCH] Name cutscenes of remaining actors (#2366) * name cs from remaining actors * small change for consistency * review --- assets/xml/scenes/dungeons/bdan.xml | 2 +- assets/xml/scenes/dungeons/bdan_mq.xml | 2 +- src/overlays/actors/ovl_En_Jj/z_en_jj.c | 2 +- .../actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c | 2 +- .../actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c | 8 ++++---- .../z_en_okarina_tag_cutscene_data.c | 4 ++-- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 6 +++--- .../actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c | 6 +++--- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 4 ++-- .../actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c | 12 ++++++------ 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/assets/xml/scenes/dungeons/bdan.xml b/assets/xml/scenes/dungeons/bdan.xml index 4ef99be369..ceee898fb5 100644 --- a/assets/xml/scenes/dungeons/bdan.xml +++ b/assets/xml/scenes/dungeons/bdan.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/scenes/dungeons/bdan_mq.xml b/assets/xml/scenes/dungeons/bdan_mq.xml index a40d025c0e..8f73efde9b 100644 --- a/assets/xml/scenes/dungeons/bdan_mq.xml +++ b/assets/xml/scenes/dungeons/bdan_mq.xml @@ -1,7 +1,7 @@ - + diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index f758cbc18c..a03c20c9ea 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -214,7 +214,7 @@ void EnJj_BeginCutscene(EnJj* this, PlayState* play) { this->cutsceneCountdownTimer--; } else { EnJj_SetupAction(this, EnJj_RemoveDust); - play->csCtx.script = D_80A88164; + play->csCtx.script = gJabuInhalingCs; gSaveContext.cutsceneTrigger = 1; DynaPoly_DisableCollision(play, &play->colCtx.dyna, bodyCollisionActor->bgId); Camera_SetFinishedFlag(GET_ACTIVE_CAM(play)); diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c index 4df9c702cb..0cf56d63e6 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_80A88164[] = { +static CutsceneData gJabuInhalingCs[] = { CS_HEADER(26, 1629), 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)), diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 324166d437..96928130ae 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -35,8 +35,8 @@ ActorProfile En_Okarina_Tag_Profile = { /**/ NULL, }; -extern CutsceneData D_80ABF9D0[]; -extern CutsceneData D_80ABFB40[]; +extern CutsceneData gWindmillSpinningFasterCs[]; +extern CutsceneData gDoorOfTimeOpeningCs[]; void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play) { } @@ -247,14 +247,14 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) { SET_EVENTCHKINF(EVENTCHKINF_39); break; case 2: - play->csCtx.script = D_80ABF9D0; + play->csCtx.script = gWindmillSpinningFasterCs; gSaveContext.cutsceneTrigger = 1; // 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 Audio_SetMainBgmTempoFreqAfterFanfare(1.18921f, 90); break; case 4: - play->csCtx.script = D_80ABFB40; + play->csCtx.script = gDoorOfTimeOpeningCs; gSaveContext.cutsceneTrigger = 1; break; case 6: diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c index db54a80643..f0c0b4d3b3 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_80ABF9D0[] = { +CutsceneData gWindmillSpinningFasterCs[] = { CS_HEADER(4, 360), CS_DESTINATION(CS_DEST_KAKARIKO_VILLAGE_DRAIN_WELL, 200, 201), CS_CAM_EYE_SPLINE(0, 331), @@ -28,7 +28,7 @@ CutsceneData D_80ABF9D0[] = { CS_END_OF_SCRIPT(), }; -CutsceneData D_80ABFB40[] = { +CutsceneData gDoorOfTimeOpeningCs[] = { CS_HEADER(18, 3000), CS_UNK_DATA_LIST(0x00000021, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFAA, 0xFFFFFFAE, 0x00000000, 0xFFFFFFAA, 0xFFFFFFAE, 0x00000000, 0x00000000, 0x00000000), diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index db4adcbf62..3586ed73d7 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -862,7 +862,7 @@ void func_80AEC780(EnRu1* this, PlayState* play) { (!(player->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_21))) && (player->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) { - play->csCtx.script = D_80AF0880; + play->csCtx.script = gRutoFirstMeetingCs; gSaveContext.cutsceneTrigger = 1; player->speedXZ = 0.0f; this->action = 8; @@ -1552,7 +1552,7 @@ s32 func_80AEE394(EnRu1* this, PlayState* play) { if (dynaPolyActor != NULL && dynaPolyActor->actor.id == ACTOR_BG_BDAN_OBJECTS && dynaPolyActor->actor.params == 0 && !Player_InCsMode(play) && play->msgCtx.msgLength == 0) { func_80AEE02C(this); - play->csCtx.script = D_80AF10A4; + play->csCtx.script = gRutoObtainingSapphireCs; gSaveContext.cutsceneTrigger = 1; this->action = 36; this->drawConfig = 0; @@ -1625,7 +1625,7 @@ s32 func_80AEE6D0(EnRu1* this, PlayState* play) { func_80AED600(this); this->action = 34; this->unk_26C = 0.0f; - play->csCtx.script = D_80AF1728; + play->csCtx.script = gRutoFoundSapphireCs; gSaveContext.cutsceneTrigger = 1; } this->roomNum3 = curRoomNum; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c index 1b933926b2..b948631d4d 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_80AF0880[] = { +static CutsceneData gRutoFirstMeetingCs[] = { CS_HEADER(15, 1306), 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)), @@ -112,7 +112,7 @@ static CutsceneData D_80AF0880[] = { static u32 D_80AF10A0 = 0; -static CutsceneData D_80AF10A4[] = { +static CutsceneData gRutoObtainingSapphireCs[] = { CS_HEADER(14, 1299), 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)), @@ -201,7 +201,7 @@ static CutsceneData D_80AF10A4[] = { static u32 D_80AF1724 = 0; -static CutsceneData D_80AF1728[] = { +static CutsceneData gRutoFoundSapphireCs[] = { CS_HEADER(7, 1160), CS_MISC_LIST(1), CS_MISC(CS_MISC_STOP_CUTSCENE, 75, 627, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000), diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index b334a67d8d..8a01936fff 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -23,7 +23,7 @@ void func_80B4BBC4(EnZl1* this, PlayState* play); void func_80B4BC78(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" @@ -318,7 +318,7 @@ void func_80B4B240(EnZl1* this, PlayState* play) { if (this->skelAnime.curFrame == frameCount) { animHeaderSeg = &gChildZelda1Anim_00438; sp3C = 1; - play->csCtx.script = D_80B4C5D0; + play->csCtx.script = gTriforceCreationStartCs; gSaveContext.cutsceneTrigger = 1; this->actionFunc = func_80B4B8B4; this->unk_1E2++; diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c index a3fe5e1944..6c268600ec 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -CutsceneData D_80B4C5D0[] = { +CutsceneData gTriforceCreationStartCs[] = { CS_HEADER(28, 3000), 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)), @@ -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_TEXT_LIST(10), 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(0x7036, 300, 800, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT(0x7036, 300, 800, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF), 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(0x7005, 1190, 1200, 0x0000, 0xFFFF, 0x700B), + CS_TEXT(0x7005, 1190, 1200, CS_TEXT_NORMAL, 0xFFFF, 0x700B), 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(NA_BGM_HYRULE_CS, 230, 231, 0x0000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000), CS_START_SEQ_LIST(1),