mirror of
https://github.com/HarbourMasters/Shipwright
synced 2026-09-09 04:30:06 -04:00
use forest enum values instead of magic numbers (#2038)
This commit is contained in:
@@ -372,15 +372,15 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) {
|
||||
|
||||
int openForest = Randomizer_GetSettingValue(RSK_FOREST);
|
||||
switch (openForest) {
|
||||
case 0: // closed
|
||||
case RO_FOREST_CLOSED:
|
||||
break;
|
||||
case 1: // open
|
||||
case RO_FOREST_CLOSED_DEKU:
|
||||
Flags_SetEventChkInf(7);
|
||||
break;
|
||||
case RO_FOREST_OPEN:
|
||||
Flags_SetEventChkInf(7);
|
||||
gSaveContext.eventChkInf[0] |= 0x10;
|
||||
break;
|
||||
case 2: // closed deku
|
||||
Flags_SetEventChkInf(7);
|
||||
break;
|
||||
}
|
||||
|
||||
int startingAge = Randomizer_GetSettingValue(RSK_STARTING_AGE);
|
||||
|
||||
@@ -487,7 +487,6 @@ u8 EnMd_ShouldSpawn(EnMd* this, PlayState* play) {
|
||||
// if we have beaten deku tree or have open forest turned on
|
||||
// or have already shown mido we have an equipped sword/shield
|
||||
if (Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE) ||
|
||||
Randomizer_GetSettingValue(RSK_FOREST) == 1 ||
|
||||
gSaveContext.eventChkInf[0] & 0x10) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user