github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 05:43:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't kill ganon if no ganon boss soul setting;

Browse source 
save editor support
This commit is contained in:
Ralphie Morell 2023-11-01 22:15:03 -04:00
commit 4006c10bda
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
soh/soh/Enhancements/debugger/debugSaveEditor.h
View file

@ -503,6 +503,16 @@ const std::vector<FlagTable> 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" },
} },
};

6
soh/soh/Enhancements/mods.cpp
View file

@ -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;
}