summaryrefslogtreecommitdiff
path: root/soh/src/code
diff options
context:
space:
mode:
authorAdam Bird <Archez@users.noreply.github.com>2023-09-29 16:28:16 -0400
committerGitHub <noreply@github.com>2023-09-29 16:28:16 -0400
commitaf19645a8880d6cc9f36aa4ac322eb6b4d9e77fe (patch)
tree21b2fd9d08e79b3a040177dfc5fb78b4be34aac5 /soh/src/code
parentd63c9d1774c13d192ba9a2ccf76d95fb016bc352 (diff)
Fixup remaining n64ddflag after IS_RANDO merge (#3240)
Diffstat (limited to 'soh/src/code')
-rw-r--r--soh/src/code/z_elf_message.c2
-rw-r--r--soh/src/code/z_play.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/soh/src/code/z_elf_message.c b/soh/src/code/z_elf_message.c
index 8236b8a78..6c5558faf 100644
--- a/soh/src/code/z_elf_message.c
+++ b/soh/src/code/z_elf_message.c
@@ -155,7 +155,7 @@ u16 ElfMessage_GetSariaText(PlayState* play) {
if (!LINK_IS_ADULT) {
if (Actor_FindNearby(play, &player->actor, ACTOR_EN_SA, 4, 800.0f) == NULL) {
- if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
+ if (IS_RANDO && Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
return 0x161;
}
msgs = sChildSariaMsgs;
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 45977b6e7..db938a4c2 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -2319,7 +2319,8 @@ void Play_PerformSave(PlayState* play) {
Save_SaveFile();
}
uint8_t triforceHuntCompleted =
- gSaveContext.n64ddFlag && gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) &&
+ IS_RANDO &&
+ gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) &&
Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT);
if (CVarGetInteger("gAutosave", AUTOSAVE_OFF) != AUTOSAVE_OFF || triforceHuntCompleted) {
Overlay_DisplayText(3.0f, "Game Saved");