mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-08-13 17:03:47 -04:00
fix death mountain cloud in rando (#2691)
This commit is contained in:
parent
b6e9e9cd0f
commit
d56899dd0b
@ -396,7 +396,7 @@ typedef enum {
|
|||||||
#define EVENTCHKINF_2B 0x2B
|
#define EVENTCHKINF_2B 0x2B
|
||||||
#define EVENTCHKINF_2C 0x2C
|
#define EVENTCHKINF_2C 0x2C
|
||||||
#define EVENTCHKINF_2D 0x2D
|
#define EVENTCHKINF_2D 0x2D
|
||||||
#define EVENTCHKINF_2F 0x2F
|
#define EVENTCHKINF_DEATH_MOUNTAIN_ERUPTED 0x2F
|
||||||
#define EVENTCHKINF_30 0x30
|
#define EVENTCHKINF_30 0x30
|
||||||
#define EVENTCHKINF_31 0x31
|
#define EVENTCHKINF_31 0x31
|
||||||
#define EVENTCHKINF_32 0x32
|
#define EVENTCHKINF_32 0x32
|
||||||
|
@ -826,6 +826,8 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
|
|||||||
if (gSaveContext.n64ddFlag) {
|
if (gSaveContext.n64ddFlag) {
|
||||||
play->nextEntranceIndex = 0x564;
|
play->nextEntranceIndex = 0x564;
|
||||||
gSaveContext.nextCutsceneIndex = 0;
|
gSaveContext.nextCutsceneIndex = 0;
|
||||||
|
// Change Death Mountain cloud since we aren't warping to the cutscene
|
||||||
|
Flags_SetEventChkInf(EVENTCHKINF_DEATH_MOUNTAIN_ERUPTED);
|
||||||
} else {
|
} else {
|
||||||
Item_Give(play, ITEM_MEDALLION_FIRE);
|
Item_Give(play, ITEM_MEDALLION_FIRE);
|
||||||
play->nextEntranceIndex = 0xDB;
|
play->nextEntranceIndex = 0xDB;
|
||||||
@ -847,8 +849,8 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
|
|||||||
if (gSaveContext.n64ddFlag) {
|
if (gSaveContext.n64ddFlag) {
|
||||||
play->nextEntranceIndex = 0x60C;
|
play->nextEntranceIndex = 0x60C;
|
||||||
gSaveContext.nextCutsceneIndex = 0;
|
gSaveContext.nextCutsceneIndex = 0;
|
||||||
// Set "raised lake hylia water" since we aren't warping to the cutscene
|
// Fill Lake Hylia since we aren't warping to the cutscene
|
||||||
gSaveContext.eventChkInf[6] |= 0x200;
|
Flags_SetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER);
|
||||||
} else {
|
} else {
|
||||||
Item_Give(play, ITEM_MEDALLION_WATER);
|
Item_Give(play, ITEM_MEDALLION_WATER);
|
||||||
play->nextEntranceIndex = 0x6B;
|
play->nextEntranceIndex = 0x6B;
|
||||||
|
Loading…
Reference in New Issue
Block a user