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

ok, now the last two CS_INDEX_* are less unknown

Browse source 
the purpose of `CS_INDEX_BARRIER` is not quite clear still
This commit is contained in:
feacur 2024-11-05 18:58:03 +01:00
parent eb75a6dea4
commit 02a977f27d
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/z64cutscene.h
View file

@ -355,7 +355,7 @@ correlation with `enum EntranceIndex`
`z_select.c` naming: `z_select.c` naming:
CS_INDEX_AUTO: "Stage: night" CS_INDEX_AUTO: "Stage: night"
CS_INDEX_LAST: "Stage: day" CS_INDEX_UNUSED: "Stage: day"
CS_INDEX_*: "Stage demo 0*" CS_INDEX_*: "Stage demo 0*"
*/ */
typedef enum CutsceneIndex { typedef enum CutsceneIndex {
@ -373,8 +373,8 @@ typedef enum CutsceneIndex {
CS_INDEX_9 = 0xFFF9, CS_INDEX_9 = 0xFFF9,
CS_INDEX_A = 0xFFFA, CS_INDEX_A = 0xFFFA,
CS_INDEX_TRIGGERED = 0xFFFD, CS_INDEX_TRIGGERED = 0xFFFD,
CS_INDEX_STOP = 0xFFFF, // a guess as per `z_demo.c:1369` and `z_demo.c:1372` CS_INDEX_BARRIER = 0xFFFF, // CS_DEST_GANONS_CASTLE_DISPEL_BARRIER_CONDITONAL
CS_INDEX_LAST = 0x8000 // unknown, `z_demo.c:747` for CS_DEST_DEATH_MOUNTAIN_TRAIL CS_INDEX_UNUSED = 0x8000 // CS_DEST_DEATH_MOUNTAIN_TRAIL
} CutsceneIndex; } CutsceneIndex;
typedef union CsCmdCam { typedef union CsCmdCam {

6
src/code/z_demo.c
View file

@ -744,7 +744,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0; play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0;
play->transitionTrigger = TRANS_TRIGGER_START; play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
gSaveContext.save.cutsceneIndex = CS_INDEX_LAST; gSaveContext.save.cutsceneIndex = CS_INDEX_UNUSED;
break; break;
case CS_DEST_LAKE_HYLIA_WATER_RESTORED: case CS_DEST_LAKE_HYLIA_WATER_RESTORED:
@ -1365,10 +1365,10 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gTowerBarrierCs); play->csCtx.script = SEGMENTED_TO_VIRTUAL(gTowerBarrierCs);
play->csCtx.curFrame = 0; play->csCtx.curFrame = 0;
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
gSaveContext.save.cutsceneIndex = CS_INDEX_STOP; gSaveContext.save.cutsceneIndex = CS_INDEX_BARRIER;
csCtx->state = CS_STATE_STOP; csCtx->state = CS_STATE_STOP;
} else { } else {
gSaveContext.save.cutsceneIndex = CS_INDEX_STOP; gSaveContext.save.cutsceneIndex = CS_INDEX_BARRIER;
csCtx->state = CS_STATE_STOP; csCtx->state = CS_STATE_STOP;
} }
break; break;

12
src/overlays/gamestates/ovl_select/z_select.c
View file

@ -335,7 +335,7 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
} }
if (CHECK_BTN_ALL(input->press.button, BTN_Z)) { if (CHECK_BTN_ALL(input->press.button, BTN_Z)) {
if (gSaveContext.save.cutsceneIndex == CS_INDEX_LAST) { if (gSaveContext.save.cutsceneIndex == CS_INDEX_UNUSED) {
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO; gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_AUTO) { } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_AUTO) {
gSaveContext.save.cutsceneIndex = CS_INDEX_0; gSaveContext.save.cutsceneIndex = CS_INDEX_0;
@ -360,13 +360,13 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_9) { } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_9) {
gSaveContext.save.cutsceneIndex = CS_INDEX_A; gSaveContext.save.cutsceneIndex = CS_INDEX_A;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_A) { } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_A) {
gSaveContext.save.cutsceneIndex = CS_INDEX_LAST; gSaveContext.save.cutsceneIndex = CS_INDEX_UNUSED;
} }
} else if (CHECK_BTN_ALL(input->press.button, BTN_R)) { } else if (CHECK_BTN_ALL(input->press.button, BTN_R)) {
if (gSaveContext.save.cutsceneIndex == CS_INDEX_LAST) { if (gSaveContext.save.cutsceneIndex == CS_INDEX_UNUSED) {
gSaveContext.save.cutsceneIndex = CS_INDEX_A; gSaveContext.save.cutsceneIndex = CS_INDEX_A;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_AUTO) { } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_AUTO) {
gSaveContext.save.cutsceneIndex = CS_INDEX_LAST; gSaveContext.save.cutsceneIndex = CS_INDEX_UNUSED;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_0) { } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_0) {
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO; gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_1) { } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_1) {
@ -611,7 +611,7 @@ void MapSelect_PrintCutsceneSetting(MapSelectState* this, GfxPrint* printer, u16
label = GFXP_HIRAGANA " ﾖﾙ " GFXP_KATAKANA "ｺﾞﾛﾝ"; label = GFXP_HIRAGANA " ﾖﾙ " GFXP_KATAKANA "ｺﾞﾛﾝ";
gSaveContext.save.dayTime = CLOCK_TIME(0, 0); gSaveContext.save.dayTime = CLOCK_TIME(0, 0);
break; break;
case CS_INDEX_LAST: case CS_INDEX_UNUSED:
// clang-format off // clang-format off
gSaveContext.save.dayTime = CLOCK_TIME(12, 0); label = GFXP_HIRAGANA "ｵﾋﾙ " GFXP_KATAKANA "ｼﾞｬﾗ"; gSaveContext.save.dayTime = CLOCK_TIME(12, 0); label = GFXP_HIRAGANA "ｵﾋﾙ " GFXP_KATAKANA "ｼﾞｬﾗ";
// clang-format on // clang-format on
@ -778,6 +778,6 @@ void MapSelect_Init(GameState* thisx) {
DMA_REQUEST_SYNC(this->staticSegment, (uintptr_t)_z_select_staticSegmentRomStart, size, "../z_select.c", 1115); DMA_REQUEST_SYNC(this->staticSegment, (uintptr_t)_z_select_staticSegmentRomStart, size, "../z_select.c", 1115);
} }
gSaveContext.save.cutsceneIndex = CS_INDEX_LAST; gSaveContext.save.cutsceneIndex = CS_INDEX_UNUSED;
gSaveContext.save.linkAge = LINK_AGE_CHILD; gSaveContext.save.linkAge = LINK_AGE_CHILD;
} }