From 4006c10bda5b1a16a6349e9e72745d621ac2cd92 Mon Sep 17 00:00:00 2001 From: Ralphie Morell Date: Wed, 1 Nov 2023 22:15:03 -0400 Subject: [PATCH] don't kill ganon if no ganon boss soul setting; save editor support --- soh/soh/Enhancements/debugger/debugSaveEditor.h | 10 ++++++++++ soh/soh/Enhancements/mods.cpp | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h index 3c3b66d73..96af28375 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.h +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h @@ -503,6 +503,16 @@ const std::vector flagTables = { { RAND_INF_CHILD_FISHING, "RAND_INF_CHILD_FISHING" }, { RAND_INF_ADULT_FISHING, "RAND_INF_ADULT_FISHING" }, { RAND_INF_10_BIG_POES, "RAND_INF_10_BIG_POES" }, + + { RAND_INF_GOHMA_SOUL, "RAND_INF_GOHMA_SOUL" }, + { RAND_INF_KING_DODONGO_SOUL, "RAND_INF_KING_DODONGO_SOUL" }, + { RAND_INF_BARINADE_SOUL, "RAND_INF_BARINADE_SOUL" }, + { RAND_INF_PHANTOM_GANON_SOUL, "RAND_INF_PHANTOM_GANON_SOUL" }, + { RAND_INF_VOLVAGIA_SOUL, "RAND_INF_VOLVAGIA_SOUL" }, + { RAND_INF_MORPHA_SOUL, "RAND_INF_MORPHA_SOUL" }, + { RAND_INF_BONGO_BONGO_SOUL, "RAND_INF_BONGO_BONGO_SOUL" }, + { RAND_INF_TWINROVA_SOUL, "RAND_INF_TWINROVA_SOUL" }, + { RAND_INF_GANON_SOUL, "RAND_INF_GANON_SOUL" }, } }, }; diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp index 212bdb587..24bdb7ca7 100644 --- a/soh/soh/Enhancements/mods.cpp +++ b/soh/soh/Enhancements/mods.cpp @@ -1052,10 +1052,10 @@ void RegisterBossSouls() { rand_inf = RAND_INF_TWINROVA_SOUL; break; case SCENE_GANONDORF_BOSS: - rand_inf = RAND_INF_GANON_SOUL; - break; case SCENE_GANON_BOSS: - rand_inf = RAND_INF_GANON_SOUL; + if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BOSS_SOULS) == RO_BOSS_SOULS_ON_PLUS_GANON) { + rand_inf = RAND_INF_GANON_SOUL; + } break; default: break; }