From 321e563c8235bf4fc4c390ca5c0059239ab8406b Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Tue, 6 Dec 2022 00:34:30 -0500 Subject: [PATCH] use enum for starting age (#2085) Co-authored-by: briaguya --- soh/soh/Enhancements/presets.h | 4 ++-- soh/soh/Enhancements/randomizer/randomizer.cpp | 2 +- soh/src/code/z_parameter.c | 2 +- soh/src/code/z_sram.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h index 7f8a3ae07..cb85bf26f 100644 --- a/soh/soh/Enhancements/presets.h +++ b/soh/soh/Enhancements/presets.h @@ -570,7 +570,7 @@ const std::vector s6PresetEntries = { PRESET_ENTRY_S32("gRandomizeSkipChildZelda", 1), PRESET_ENTRY_S32("gRandomizeSkipEponaRace", 1), PRESET_ENTRY_S32("gRandomizeSkipTowerEscape", 1), - PRESET_ENTRY_S32("gRandomizeStartingAge", 2), + PRESET_ENTRY_S32("gRandomizeStartingAge", RO_AGE_RANDOM), PRESET_ENTRY_S32("gRandomizeStartingConsumables", 1), PRESET_ENTRY_S32("gRandomizeStartingDekuShield", 1), PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", 0), @@ -621,7 +621,7 @@ const std::vector hellModePresetEntries = { PRESET_ENTRY_S32("gRandomizeSkipEponaRace", 1), PRESET_ENTRY_S32("gRandomizeSkipScarecrowsSong", 1), PRESET_ENTRY_S32("gRandomizeSkipTowerEscape", 1), - PRESET_ENTRY_S32("gRandomizeStartingAge", 2), + PRESET_ENTRY_S32("gRandomizeStartingAge", RO_AGE_RANDOM), PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", 5), PRESET_ENTRY_S32("gRandomizeSunlightArrows", 1), PRESET_ENTRY_S32("gRandomizeZorasFountain", 2), diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 5889ecdb5..72106f7a1 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -2565,7 +2565,7 @@ void GenerateRandomizerImgui() { cvarSettings[RSK_KAK_GATE] = CVar_GetS32("gRandomizeKakarikoGate", RO_KAK_GATE_CLOSED); cvarSettings[RSK_DOOR_OF_TIME] = CVar_GetS32("gRandomizeDoorOfTime", RO_DOOROFTIME_CLOSED); cvarSettings[RSK_ZORAS_FOUNTAIN] = CVar_GetS32("gRandomizeZorasFountain", 0); - cvarSettings[RSK_STARTING_AGE] = CVar_GetS32("gRandomizeStartingAge", 0); + cvarSettings[RSK_STARTING_AGE] = CVar_GetS32("gRandomizeStartingAge", RO_AGE_CHILD); cvarSettings[RSK_GERUDO_FORTRESS] = CVar_GetS32("gRandomizeGerudoFortress", RO_GF_NORMAL); cvarSettings[RSK_RAINBOW_BRIDGE] = CVar_GetS32("gRandomizeRainbowBridge", RO_BRIDGE_VANILLA); cvarSettings[RSK_RAINBOW_BRIDGE_STONE_COUNT] = CVar_GetS32("gRandomizeStoneCount", 3); diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 1bd7c239c..1d4e59f07 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -1508,7 +1508,7 @@ void Inventory_SwapAgeEquipment(void) { gSaveContext.equips.equipment = gSaveContext.childEquips.equipment; gSaveContext.equips.equipment &= 0xFFF0; gSaveContext.equips.equipment |= 0x0001; - } else if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_STARTING_AGE)) { + } else if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_STARTING_AGE) == RO_AGE_ADULT) { /*If in rando and starting age is adult, childEquips is not initialized and buttonItems[0] will be ITEM_NONE. When changing age from adult -> child, reset equips to "default" (only kokiri tunic/boots equipped, no sword, no C-button items, no D-Pad items). diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index 7d9d85b68..02986a918 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -383,12 +383,12 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) { int startingAge = Randomizer_GetSettingValue(RSK_STARTING_AGE); switch (startingAge) { - case 1: //Adult + case RO_AGE_ADULT: //Adult gSaveContext.linkAge = 0; gSaveContext.entranceIndex = 0x5F4; gSaveContext.savedSceneNum = SCENE_SPOT20; //Set scene num manually to ToT break; - case 0: //Child + case RO_AGE_CHILD: //Child gSaveContext.linkAge = 1; break; default: