diff options
| author | Pepe20129 <72659707+Pepe20129@users.noreply.github.com> | 2023-12-28 20:19:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-28 14:19:23 -0500 |
| commit | c860f7a73af9466c678f39258beaa46cd92ff550 (patch) | |
| tree | dea46e70f780f3d25ecbfa63fa44f44c0f42266b /soh/src/code/z_parameter.c | |
| parent | 2495f4512484afa2f1ea8e459dd17b7dec06e666 (diff) | |
Rando: Shuffle Ocarina Buttons (Rando V3) (#3735)
* Shuffle Ocarina Buttons
* Address review
* Add trick names
* Temporarily remove the ocarina button ice trap models
* Update soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp
Fix lost closing brackets from merge resolution.
---------
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Diffstat (limited to 'soh/src/code/z_parameter.c')
| -rw-r--r-- | soh/src/code/z_parameter.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 802abc951..141dbaf6a 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -2664,6 +2664,13 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) { return Return_Item_Entry(giEntry, RG_NONE); } + if (item >= RG_OCARINA_A_BUTTON && item <= RG_OCARINA_C_RIGHT_BUTTON) { + u8 index = item - RG_OCARINA_A_BUTTON; + Flags_SetRandomizerInf(RAND_INF_HAS_OCARINA_A + index); + + return Return_Item_Entry(giEntry, RG_NONE); + } + temp = gSaveContext.inventory.items[slot]; osSyncPrintf("Item_Register(%d)=%d %d\n", slot, item, temp); INV_CONTENT(item) = item; |