Merge 'Prevent obtaining right side masks with only the Bunny Hood tr…

…ade' (OoTRandomizer#2194)
fenhl · Mar 27, 2024 · 86aec1e · 86aec1e
2 parents 2ecc523 + 638121d
commit 86aec1e
Show file tree

Hide file tree

Showing 8 changed files with 6,797 additions and 6,787 deletions.
diff --git a/ASM/build/asm_symbols.txt b/ASM/build/asm_symbols.txt
diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o
diff --git a/ASM/build/c_symbols.txt b/ASM/build/c_symbols.txt
diff --git a/ASM/c/trade_quests.c b/ASM/c/trade_quests.c
@@ -432,7 +432,8 @@ void TryPaybackMaskOverride(EnOssan* maskShop, z64_game_t* play) {
 }
 
 int32_t CanBuy_RightSideMask() {
- if (GET_ITEMGETINF(ITEMGETINF_3F)) {
+ uint16_t paid = (z64_file.scene_flags[0x62].unk_00_ >> 0x07) & 0xF;
+ if (GET_ITEMGETINF(ITEMGETINF_3F) && paid == 0xF) {
  return CANBUY_RESULT_SUCCESS_FANFARE;
  } else {
  return CANBUY_RESULT_CANT_GET_NOW;

diff --git a/README.md b/README.md
@@ -122,6 +122,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
 * Fix a softlock present in the original game when damaging Volvagia's second hitbox during the death cutscene.
 * Don't start the trade sequence timer if getting the `ZD King Zora Thawed` item while the Eyeball Frog is in the inventory.
 * Fix missing visual frost effect for ice traps in most chests.
+* Fix the items on the right side of the mask shop being available without paying for all borrowed masks first.
 
 #### Other Changes
 * Clarified the error message shown when an unshuffled trade quest item is used as a starting item.