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>
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user