ihateninjas/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-04-23 08:14:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Bug Fix: Setting Start with OoT only gives Fairy Ocarina in Rando (#6227)

Browse source
This commit is contained in:
anthony-barricelli 2026-02-14 20:19:31 -05:00 committed by GitHub
parent 3206425e1b
commit d67dcb92f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/randomizerTypes.h
View file

@ -6941,7 +6941,7 @@ typedef enum {
RO_SHUFFLE_MERCHANTS_ALL
} RandoOptionShuffleMerchants;
// Starting Ocarina Settings (off, fairy)
// Starting Ocarina Settings (off, fairy, oot)
typedef enum {
RO_STARTING_OCARINA_OFF,
RO_STARTING_OCARINA_FAIRY,

4
soh/soh/Enhancements/randomizer/savefile.cpp
View file

@ -162,7 +162,9 @@ void SetStartingItems() {
}
if (Randomizer_GetSettingValue(RSK_STARTING_OCARINA)) {
INV_CONTENT(ITEM_OCARINA_FAIRY) = ITEM_OCARINA_FAIRY;
INV_CONTENT(ITEM_OCARINA_FAIRY) = Randomizer_GetSettingValue(RSK_STARTING_OCARINA) == RO_STARTING_OCARINA_FAIRY
? ITEM_OCARINA_FAIRY
: ITEM_OCARINA_TIME;
}
if (Randomizer_GetSettingValue(RSK_STARTING_STICKS) && !Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG)) {