mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 11:24:40 +00:00
Code Issues Projects Releases Wiki Activity

rename the flag for automatic sceneLayer calc

Browse source 
it gets assigned to the `nextCutsceneIndex`,
so `CS_INDEX_NONE` name was misleading
This commit is contained in:
feacur 2024-11-05 17:07:03 +01:00
parent 6eaaa8706c
commit d9bbd67137
10 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/z64cutscene.h
View file

@ -346,20 +346,20 @@ typedef enum CutsceneDestination {
/*
correlation with `enum SceneLayer`:
CS_INDEX_NONE: [SCENE_LAYER_CHILD_DAY .. SCENE_LAYER_ADULT_NIGHT]
CS_INDEX_AUTO: [SCENE_LAYER_CHILD_DAY .. SCENE_LAYER_ADULT_NIGHT]
CS_INDEX_*: SCENE_LAYER_CUTSCENE_FIRST + (cutscene index & 0xF)
correlation with `enum EntranceIndex`
CS_INDEX_NONE: base entrance index + scene layer
CS_INDEX_AUTO: base entrance index + scene layer
CS_INDEX_*: base entrance index + scene layer
`z_select.c` naming:
CS_INDEX_NONE: "Stage: night"
CS_INDEX_AUTO: "Stage: night"
CS_INDEX_LAST: "Stage: day"
CS_INDEX_*: "Stage demo 0*"
*/
typedef enum CutsceneIndex {
CS_INDEX_NONE = 0x0000,
CS_INDEX_AUTO = 0x0000,
CS_INDEX_NEXT_EMPTY = 0xFFEF, // is allowed to schedule a cutscene
CS_INDEX_0 = 0xFFF0,
CS_INDEX_1 = 0xFFF1,

4
src/code/z_demo.c
View file

@ -591,7 +591,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
gSaveContext.forceRisingButtonAlphas = true;
}
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
switch (cmd->destination) {
case CS_DEST_CUTSCENE_MAP_GANON_HORSE:
@ -2267,7 +2267,7 @@ void CutsceneHandler_StopScript(PlayState* play, CutsceneContext* csCtx) {
PRINTF(T("\n\n\n\n\nやっぱりここかいな", "\n\n\n\n\nThis is it after all"));
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
gSaveContext.gameMode = GAMEMODE_NORMAL;
if (gUseCutsceneCam) {

2
src/code/z_kankyo.c
View file

@ -2618,7 +2618,7 @@ void Environment_StopStormNatureAmbience(PlayState* play) {
void Environment_WarpSongLeave(PlayState* play) {
gWeatherMode = WEATHER_MODE_CLEAR;
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
gSaveContext.respawnFlag = -3;
play->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex;
play->transitionTrigger = TRANS_TRIGGER_START;

4
src/code/z_parameter.c
View file

@ -3523,7 +3523,7 @@ void Interface_Draw(PlayState* play) {
(Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT)) {
// Trade quest timer reached 0
sSubTimerStateTimer = 40;
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.subTimerState = SUBTIMER_STATE_OFF;
@ -3861,7 +3861,7 @@ void Interface_Draw(PlayState* play) {
(play->sceneId != SCENE_INSIDE_GANONS_CASTLE_COLLAPSE))) {
sSubTimerStateTimer = 40;
gSaveContext.subTimerState = SUBTIMER_STATE_RESPAWN;
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
Message_StartTextbox(play, 0x71B0, NULL);
Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_8);
} else {

2
src/code/z_play.c
View file

@ -330,7 +330,7 @@ void Play_Init(GameState* thisx) {
}
if (gSaveContext.save.cutsceneIndex == CS_INDEX_TRIGGERED) {
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
}
if (gSaveContext.nextDayTime != NEXT_TIME_NONE) {

2
src/code/z_sram.c
View file

@ -797,7 +797,7 @@ void Sram_InitSave(FileSelectState* fileSelect, SramContext* sramCtx) {
#if OOT_DEBUG
if (fileSelect->buttonIndex == 0) {
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
}
#endif

24
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
View file

@ -500,7 +500,7 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
gSaveContext.nextCutsceneIndex = CS_INDEX_1;
} else {
play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_5;
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
}
} else if (play->sceneId == SCENE_DEKU_TREE_BOSS) {
if (!Flags_GetEventChkInf(EVENTCHKINF_07)) {
@ -511,11 +511,11 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
gSaveContext.nextCutsceneIndex = CS_INDEX_1;
} else {
play->nextEntranceIndex = ENTR_KOKIRI_FOREST_11;
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
}
} else if (play->sceneId == SCENE_JABU_JABU_BOSS) {
play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0;
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
}
PRINTF("\n\n\nおわりおわり");
play->transitionTrigger = TRANS_TRIGGER_START;
@ -706,7 +706,7 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
SET_EVENTCHKINF(EVENTCHKINF_48);
Item_Give(play, ITEM_MEDALLION_FOREST);
play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
gSaveContext.chamberCutsceneNum = CHAMBER_CS_FOREST;
} else {
if (!LINK_IS_ADULT) {
@ -714,7 +714,7 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
} else {
play->nextEntranceIndex = ENTR_SACRED_FOREST_MEADOW_3;
}
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
}
} else if (play->sceneId == SCENE_FIRE_TEMPLE_BOSS) {
if (!GET_EVENTCHKINF(EVENTCHKINF_49)) {
@ -728,14 +728,14 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
} else {
play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_5;
}
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
}
} else if (play->sceneId == SCENE_WATER_TEMPLE_BOSS) {
if (!GET_EVENTCHKINF(EVENTCHKINF_4A)) {
SET_EVENTCHKINF(EVENTCHKINF_4A);
Item_Give(play, ITEM_MEDALLION_WATER);
play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
gSaveContext.chamberCutsceneNum = CHAMBER_CS_WATER;
} else {
if (!LINK_IS_ADULT) {
@ -743,13 +743,13 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
} else {
play->nextEntranceIndex = ENTR_LAKE_HYLIA_9;
}
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
}
} else if (play->sceneId == SCENE_SPIRIT_TEMPLE_BOSS) {
if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT)) {
Item_Give(play, ITEM_MEDALLION_SPIRIT);
play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
gSaveContext.chamberCutsceneNum = CHAMBER_CS_SPIRIT;
} else {
if (!LINK_IS_ADULT) {
@ -757,13 +757,13 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
} else {
play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_8;
}
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
}
} else if (play->sceneId == SCENE_SHADOW_TEMPLE_BOSS) {
if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) {
Item_Give(play, ITEM_MEDALLION_SHADOW);
play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
gSaveContext.chamberCutsceneNum = CHAMBER_CS_SHADOW;
} else {
if (!LINK_IS_ADULT) {
@ -771,7 +771,7 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
} else {
play->nextEntranceIndex = ENTR_GRAVEYARD_8;
}
gSaveContext.nextCutsceneIndex = CS_INDEX_NONE;
gSaveContext.nextCutsceneIndex = CS_INDEX_AUTO;
}
}
play->transitionTrigger = TRANS_TRIGGER_START;

2
src/overlays/actors/ovl_En_Horse/z_en_horse.c
View file

@ -2544,7 +2544,7 @@ void EnHorse_UpdateHorsebackArchery(EnHorse* this, PlayState* play) {
EnHorse_UpdateHbaRaceInfo(this, play, &sHbaInfo);
if ((this->hbaFlags & 1) || (this->hbaTimer >= 46)) {
if ((isFanfarePlaying != true) && (gSaveContext.minigameState != 3)) {
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_16;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST);

8
src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
View file

@ -110,7 +110,7 @@ s32 EnHorseGameCheck_DestroyIngoRace(EnHorseGameCheckBase* base, PlayState* play
}
void EnHorseGameCheck_FinishIngoRace(EnHorseGameCheckIngoRace* this, PlayState* play) {
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
if (this->result == INGORACE_PLAYER_WIN) {
play->nextEntranceIndex = ENTR_LON_LON_RANCH_7;
if (GET_EVENTINF(EVENTINF_HORSES_06)) {
@ -297,21 +297,21 @@ s32 EnHorseGameCheck_DestroyMalonRace(EnHorseGameCheckBase* base, PlayState* pla
void EnHorseGameCheck_FinishMalonRace(EnHorseGameCheckMalonRace* this, PlayState* play) {
if ((this->result == MALONRACE_SUCCESS) || (this->result == MALONRACE_TIME_UP)) {
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
play->nextEntranceIndex = ENTR_LON_LON_RANCH_7;
play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST);
play->transitionTrigger = TRANS_TRIGGER_START;
} else if (this->result == MALONRACE_FAILURE) {
gSaveContext.timerSeconds = 240;
gSaveContext.timerState = TIMER_STATE_UP_FREEZE;
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
play->nextEntranceIndex = ENTR_LON_LON_RANCH_7;
play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST);
play->transitionTrigger = TRANS_TRIGGER_START;
} else {
// "not supported"
PRINTF("En_HGC_Spot20_Ta_end():対応せず\n");
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST);
play->transitionTrigger = TRANS_TRIGGER_START;

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

@ -336,8 +336,8 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
if (CHECK_BTN_ALL(input->press.button, BTN_Z)) {
if (gSaveContext.save.cutsceneIndex == CS_INDEX_LAST) {
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_NONE) {
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_AUTO) {
gSaveContext.save.cutsceneIndex = CS_INDEX_0;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_0) {
gSaveContext.save.cutsceneIndex = CS_INDEX_1;
@ -365,10 +365,10 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
} else if (CHECK_BTN_ALL(input->press.button, BTN_R)) {
if (gSaveContext.save.cutsceneIndex == CS_INDEX_LAST) {
gSaveContext.save.cutsceneIndex = CS_INDEX_A;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_NONE) {
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_AUTO) {
gSaveContext.save.cutsceneIndex = CS_INDEX_LAST;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_0) {
gSaveContext.save.cutsceneIndex = CS_INDEX_NONE;
gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_1) {
gSaveContext.save.cutsceneIndex = CS_INDEX_0;
} else if (gSaveContext.save.cutsceneIndex == CS_INDEX_2) {
@ -393,7 +393,7 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
}
gSaveContext.save.nightFlag = 0;
if (gSaveContext.save.cutsceneIndex == CS_INDEX_NONE) {
if (gSaveContext.save.cutsceneIndex == CS_INDEX_AUTO) {
gSaveContext.save.nightFlag = 1;
}
@ -607,7 +607,7 @@ void MapSelect_PrintCutsceneSetting(MapSelectState* this, GfxPrint* printer, u16
GfxPrint_SetColor(printer, 255, 255, 55, 255);
switch (csIndex) {
case CS_INDEX_NONE:
case CS_INDEX_AUTO:
label = GFXP_HIRAGANA " ﾖﾙ " GFXP_KATAKANA "ｺﾞﾛﾝ";
gSaveContext.save.dayTime = CLOCK_TIME(0, 0);
break;