mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-30 17:29:30 -04:00
Code Issues Packages 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
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
+3 -3
View File
@@ -124,7 +124,7 @@ void BgSpot06Objects_Init(Actor* thisx, PlayState* play) {
Collider_SetJntSph(play, &this->collider, thisx, &sJntSphInit, this->colliderItem);
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;
} else {
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);
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) {
this->lakeHyliaWaterLevel = -681.0f;
play->colCtx.colHeader->waterBoxes[LHWB_GERUDO_VALLEY_RIVER_LOWER].ySurface =
@@ -482,7 +482,7 @@ void BgSpot06Objects_Draw(Actor* thisx, PlayState* play) {
* cleared.
*/
void BgSpot06Objects_WaterPlaneCutsceneWait(BgSpot06Objects* this, PlayState* play) {
if (GET_EVENTCHKINF(EVENTCHKINF_69)) {
if (GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) {
this->actionFunc = BgSpot06Objects_WaterPlaneCutsceneRise;
}
}