diff --git a/soh/include/z64save.h b/soh/include/z64save.h index bc563ac8a..08ee53c4d 100644 --- a/soh/include/z64save.h +++ b/soh/include/z64save.h @@ -396,7 +396,7 @@ typedef enum { #define EVENTCHKINF_2B 0x2B #define EVENTCHKINF_2C 0x2C #define EVENTCHKINF_2D 0x2D -#define EVENTCHKINF_2F 0x2F +#define EVENTCHKINF_DEATH_MOUNTAIN_ERUPTED 0x2F #define EVENTCHKINF_30 0x30 #define EVENTCHKINF_31 0x31 #define EVENTCHKINF_32 0x32 diff --git a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 094e00113..5152d290a 100644 --- a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -826,6 +826,8 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) { if (gSaveContext.n64ddFlag) { play->nextEntranceIndex = 0x564; gSaveContext.nextCutsceneIndex = 0; + // Change Death Mountain cloud since we aren't warping to the cutscene + Flags_SetEventChkInf(EVENTCHKINF_DEATH_MOUNTAIN_ERUPTED); } else { Item_Give(play, ITEM_MEDALLION_FIRE); play->nextEntranceIndex = 0xDB; @@ -847,8 +849,8 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) { if (gSaveContext.n64ddFlag) { play->nextEntranceIndex = 0x60C; gSaveContext.nextCutsceneIndex = 0; - // Set "raised lake hylia water" since we aren't warping to the cutscene - gSaveContext.eventChkInf[6] |= 0x200; + // Fill Lake Hylia since we aren't warping to the cutscene + Flags_SetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER); } else { Item_Give(play, ITEM_MEDALLION_WATER); play->nextEntranceIndex = 0x6B;