diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2022-11-29 20:01:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-30 02:01:41 +0100 |
| commit | b976ef58fe14783c2e2ba2e4d0a4b6b85c628e58 (patch) | |
| tree | 0ad362cfd2a181da3aa1f7ae0406c5e72f14ff32 /soh/src/code | |
| parent | a15f89a3e48b4b599d1324b743b74d1d625c6d94 (diff) | |
use enum for ganon's boss key (#2046)
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_play.c | 10 | ||||
| -rw-r--r-- | soh/src/code/z_sram.c | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 8282fef01..b08f9cee4 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -343,27 +343,27 @@ void GivePlayerRandoRewardZeldaLightArrowsGift(PlayState* play, RandomizerCheck u8 meetsRequirements = 0; switch (Randomizer_GetSettingValue(RSK_GANONS_BOSS_KEY)) { - case 7: + case RO_GANON_BOSS_KEY_LACS_MEDALLIONS: if (CheckMedallionCount() >= Randomizer_GetSettingValue(RSK_LACS_MEDALLION_COUNT)) { meetsRequirements = true; } break; - case 8: + case RO_GANON_BOSS_KEY_LACS_STONES: if (CheckStoneCount() >= Randomizer_GetSettingValue(RSK_LACS_STONE_COUNT)) { meetsRequirements = true; } break; - case 9: + case RO_GANON_BOSS_KEY_LACS_REWARDS: if ((CheckMedallionCount() + CheckStoneCount()) >= Randomizer_GetSettingValue(RSK_LACS_REWARD_COUNT)) { meetsRequirements = true; } break; - case 10: + case RO_GANON_BOSS_KEY_LACS_DUNGEONS: if (CheckDungeonCount() >= Randomizer_GetSettingValue(RSK_LACS_DUNGEON_COUNT)) { meetsRequirements = true; } break; - case 11: + case RO_GANON_BOSS_KEY_LACS_TOKENS: if (gSaveContext.inventory.gsTokens >= Randomizer_GetSettingValue(RSK_LACS_TOKEN_COUNT)) { meetsRequirements = true; } diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index bf3718d50..a6168a957 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -503,8 +503,7 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) { gSaveContext.inventory.dungeonItems[SCENE_HAKADAN] |= 1; // Shadow } - // "Start with" == 2 for Ganon's Boss Key - if(Randomizer_GetSettingValue(RSK_GANONS_BOSS_KEY) == 2) { + if(Randomizer_GetSettingValue(RSK_GANONS_BOSS_KEY) == RO_GANON_BOSS_KEY_STARTWITH) { gSaveContext.inventory.dungeonItems[SCENE_GANON] |= 1; } |