mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-06-08 09:31:52 +00:00
Code Issues Projects Releases Wiki Activity

Rename EVENTCHKINF_69 (#2330)

Browse source 
* Rename EVENTCHKINF_69

* Rename CS flag
This commit is contained in:
Jordan Longstaff 2024-12-11 05:51:51 -05:00 • committed by GitHub
parent b01b20697e
commit c780c4e147
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/z64cutscene.h
View file

@ -175,7 +175,7 @@ typedef enum CutsceneMiscType {
/* 0x12 */ CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY, /* 0x12 */ CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY,
/* 0x13 */ CS_MISC_SET_FLAG_FAST_WINDMILL, /* 0x13 */ CS_MISC_SET_FLAG_FAST_WINDMILL,
/* 0x14 */ CS_MISC_SET_FLAG_DRAINED_WELL, /* 0x14 */ CS_MISC_SET_FLAG_DRAINED_WELL,
/* 0x15 */ CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED, /* 0x15 */ CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA,
/* 0x16 */ CS_MISC_VISMONO_BLACK_AND_WHITE, /* 0x16 */ CS_MISC_VISMONO_BLACK_AND_WHITE,
/* 0x17 */ CS_MISC_VISMONO_SEPIA, /* 0x17 */ CS_MISC_VISMONO_SEPIA,
/* 0x18 */ CS_MISC_HIDE_ROOM, /* 0x18 */ CS_MISC_HIDE_ROOM,

2
include/z64save.h
View file

@ -537,7 +537,7 @@ typedef enum LinkAge {
#define EVENTCHKINF_65 0x65 #define EVENTCHKINF_65 0x65
#define EVENTCHKINF_DRAINED_WELL 0x67 #define EVENTCHKINF_DRAINED_WELL 0x67
#define EVENTCHKINF_68 0x68 #define EVENTCHKINF_68 0x68
#define EVENTCHKINF_69 0x69 #define EVENTCHKINF_RESTORED_LAKE_HYLIA 0x69
#define EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO 0x6A #define EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO 0x6A
// 0x6B // 0x6B

4
src/code/z_demo.c
View file

@ -404,8 +404,8 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
SET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL); SET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL);
break; break;
case CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED: case CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA:
SET_EVENTCHKINF(EVENTCHKINF_69); SET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA);
break; break;
case CS_MISC_VISMONO_BLACK_AND_WHITE: case CS_MISC_VISMONO_BLACK_AND_WHITE:

2
src/code/z_scene_table.c
View file

@ -1226,7 +1226,7 @@ void Scene_DrawConfigLakeHylia(PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 7058); OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 7058);
if (IS_CUTSCENE_LAYER || (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_69))) { if (IS_CUTSCENE_LAYER || (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA))) {
play->roomCtx.drawParams[0] = 87; play->roomCtx.drawParams[0] = 87;
} }

6
src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
View file

@ -124,7 +124,7 @@ void BgSpot06Objects_Init(Actor* thisx, PlayState* play) {
Collider_SetJntSph(play, &this->collider, thisx, &sJntSphInit, this->colliderItem); Collider_SetJntSph(play, &this->collider, thisx, &sJntSphInit, this->colliderItem);
if (LINK_IS_ADULT && Flags_GetSwitch(play, this->switchFlag)) { if (LINK_IS_ADULT && Flags_GetSwitch(play, this->switchFlag)) {
if (!GET_EVENTCHKINF(EVENTCHKINF_69)) { if (!GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) {
thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_LOWERED; thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_LOWERED;
} else { } else {
thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_RAISED; thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_RAISED;
@ -150,7 +150,7 @@ void BgSpot06Objects_Init(Actor* thisx, PlayState* play) {
Actor_ProcessInitChain(thisx, sInitChainWaterPlane); Actor_ProcessInitChain(thisx, sInitChainWaterPlane);
thisx->flags = ACTOR_FLAG_4 | ACTOR_FLAG_5; thisx->flags = ACTOR_FLAG_4 | ACTOR_FLAG_5;
if (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_69)) { if (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) {
if (!IS_CUTSCENE_LAYER) { if (!IS_CUTSCENE_LAYER) {
this->lakeHyliaWaterLevel = -681.0f; this->lakeHyliaWaterLevel = -681.0f;
play->colCtx.colHeader->waterBoxes[LHWB_GERUDO_VALLEY_RIVER_LOWER].ySurface = play->colCtx.colHeader->waterBoxes[LHWB_GERUDO_VALLEY_RIVER_LOWER].ySurface =
@ -482,7 +482,7 @@ void BgSpot06Objects_Draw(Actor* thisx, PlayState* play) {
* cleared. * cleared.
*/ */
void BgSpot06Objects_WaterPlaneCutsceneWait(BgSpot06Objects* this, PlayState* play) { void BgSpot06Objects_WaterPlaneCutsceneWait(BgSpot06Objects* this, PlayState* play) {
if (GET_EVENTCHKINF(EVENTCHKINF_69)) { if (GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) {
this->actionFunc = BgSpot06Objects_WaterPlaneCutsceneRise; this->actionFunc = BgSpot06Objects_WaterPlaneCutsceneRise;
} }
} }

2
tools/ZAPDConfigs/EnumData.xml
View file

@ -173,7 +173,7 @@
<Item Key="stop_storm_and_advance_to_day" ID="CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY" Index="18"/> <Item Key="stop_storm_and_advance_to_day" ID="CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY" Index="18"/>
<Item Key="set_flag_fast_windmill" ID="CS_MISC_SET_FLAG_FAST_WINDMILL" Index="19"/> <Item Key="set_flag_fast_windmill" ID="CS_MISC_SET_FLAG_FAST_WINDMILL" Index="19"/>
<Item Key="set_flag_drained_well" ID="CS_MISC_SET_FLAG_DRAINED_WELL" Index="20"/> <Item Key="set_flag_drained_well" ID="CS_MISC_SET_FLAG_DRAINED_WELL" Index="20"/>
<Item Key="set_flag_lake_hylia_restored" ID="CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED" Index="21"/> <Item Key="set_flag_restored_lake_hylia" ID="CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA" Index="21"/>
<Item Key="vismono_black_and_white" ID="CS_MISC_VISMONO_BLACK_AND_WHITE" Index="22"/> <Item Key="vismono_black_and_white" ID="CS_MISC_VISMONO_BLACK_AND_WHITE" Index="22"/>
<Item Key="vismono_sepia" ID="CS_MISC_VISMONO_SEPIA" Index="23"/> <Item Key="vismono_sepia" ID="CS_MISC_VISMONO_SEPIA" Index="23"/>
<Item Key="hide_room" ID="CS_MISC_HIDE_ROOM" Index="24"/> <Item Key="hide_room" ID="CS_MISC_HIDE_ROOM" Index="24"/>

2
tools/csdis.py
View file

@ -330,7 +330,7 @@ cutscene_misc_types = {
0x12: "CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY", 0x12: "CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY",
0x13: "CS_MISC_SET_FLAG_FAST_WINDMILL", 0x13: "CS_MISC_SET_FLAG_FAST_WINDMILL",
0x14: "CS_MISC_SET_FLAG_DRAINED_WELL", 0x14: "CS_MISC_SET_FLAG_DRAINED_WELL",
0x15: "CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED", 0x15: "CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA",
0x16: "CS_MISC_VISMONO_BLACK_AND_WHITE", 0x16: "CS_MISC_VISMONO_BLACK_AND_WHITE",
0x17: "CS_MISC_VISMONO_SEPIA", 0x17: "CS_MISC_VISMONO_SEPIA",
0x18: "CS_MISC_HIDE_ROOM", 0x18: "CS_MISC_HIDE_ROOM",