github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-25 23:55:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Set RAND_INF_ZELDAS_LETTER.

Browse source
This commit is contained in:
Anthony Stewart 2025-02-26 18:53:30 -06:00
commit 6e01a6aec4
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
View file

@ -65,6 +65,10 @@ void GenerateStartingInventory() {
AddItemToInventory(RG_GERUDO_MEMBERSHIP_CARD); AddItemToInventory(RG_GERUDO_MEMBERSHIP_CARD);
} }
if (ctx->GetOption(RSK_SKIP_CHILD_ZELDA)) {
AddItemToInventory(RG_ZELDAS_LETTER);
}
//Starting Inventory Menu //Starting Inventory Menu
//Values are associated so that the count of items matches the index of //Values are associated so that the count of items matches the index of
//the option selected. If None is selected, the value will be zero and //the option selected. If None is selected, the value will be zero and

6
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View file

@ -1650,6 +1650,11 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
} }
break; break;
} }
case VB_GIVE_ITEM_ZELDAS_LETTER: {
Flags_SetRandomizerInf(RAND_INF_ZELDAS_LETTER);
*should = false;
break;
}
case VB_FREEZE_ON_SKULL_TOKEN: case VB_FREEZE_ON_SKULL_TOKEN:
case VB_TRADE_TIMER_ODD_MUSHROOM: case VB_TRADE_TIMER_ODD_MUSHROOM:
case VB_TRADE_TIMER_FROG: case VB_TRADE_TIMER_FROG:
@ -1666,7 +1671,6 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
case VB_GIVE_ITEM_WEIRD_EGG: case VB_GIVE_ITEM_WEIRD_EGG:
case VB_GIVE_ITEM_LIGHT_ARROW: case VB_GIVE_ITEM_LIGHT_ARROW:
case VB_GIVE_ITEM_STRENGTH_1: case VB_GIVE_ITEM_STRENGTH_1:
case VB_GIVE_ITEM_ZELDAS_LETTER:
case VB_GIVE_ITEM_OCARINA_OF_TIME: case VB_GIVE_ITEM_OCARINA_OF_TIME:
case VB_GIVE_ITEM_LIGHT_MEDALLION: case VB_GIVE_ITEM_LIGHT_MEDALLION:
case VB_GIVE_ITEM_FOREST_MEDALLION: case VB_GIVE_ITEM_FOREST_MEDALLION:

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

@ -325,6 +325,7 @@ extern "C" void Randomizer_InitSaveFile() {
// set this at the end to ensure we always start with the letter // set this at the end to ensure we always start with the letter
// this is for the off chance we got the weird egg from impa (which should never happen) // this is for the off chance we got the weird egg from impa (which should never happen)
INV_CONTENT(ITEM_LETTER_ZELDA) = ITEM_LETTER_ZELDA; INV_CONTENT(ITEM_LETTER_ZELDA) = ITEM_LETTER_ZELDA;
Flags_SetRandomizerInf(RAND_INF_ZELDAS_LETTER);
} }
if (Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && startingAge == RO_AGE_ADULT) { if (Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && startingAge == RO_AGE_ADULT) {