From 581597234cb871e3fa763e6f63f1a906b931a0f9 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Fri, 7 Jul 2023 01:33:39 -0500
Subject: [PATCH] Changing retro so bottle vendor fish prize gives a key
 instead of arrows

---
 Rom.py                |   5 +++--
 data/base2current.bps | Bin 107664 -> 107720 bytes
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Rom.py b/Rom.py
index 216c8c9f..c21832e0 100644
--- a/Rom.py
+++ b/Rom.py
@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '497c4ca85d803687a8de846211824bd7'
+RANDOMIZERBASEHASH = '614fa2fcbb4644beddadcf356e121d5a'
 
 
 class JsonRom(object):
@@ -1582,7 +1582,8 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
     rom.write_byte(0x301FC, 0xDA if world.bow_mode[player].startswith('retro') else 0xE1)  # rupees replace arrows under pots
     if enemized:
         rom.write_byte(0x1B152e, 0xDA if world.bow_mode[player].startswith('retro') else 0xE1)
-    rom.write_byte(0x30052, 0xDB if world.bow_mode[player].startswith('retro') else 0xE2) # replace arrows in fish prize from bottle merchant
+    if world.bow_mode[player].startswith('retro'):
+        rom.write_byte(0x30052, 0xE4 if world.keyshuffle[player] == 'universal' else 0xDB) # replace arrows in fish prize from bottle merchant
     rom.write_bytes(0xECB4E, [0xA9, 0x00, 0xEA, 0xEA] if world.bow_mode[player].startswith('retro') else [0xAF, 0x77, 0xF3, 0x7E])  # Thief steals rupees instead of arrows
     rom.write_bytes(0xF0D96, [0xA9, 0x00, 0xEA, 0xEA] if world.bow_mode[player].startswith('retro') else [0xAF, 0x77, 0xF3, 0x7E])  # Pikit steals rupees instead of arrows
     rom.write_bytes(0xEDA5, [0x35, 0x41] if world.bow_mode[player].startswith('retro') else [0x43, 0x44])  # Chest game gives rupees instead of arrows
diff --git a/data/base2current.bps b/data/base2current.bps
index 386d328769d8bd4a00008ef00f264b209e7d9c4f..99b8b7507ad96bcc7ec31a11eb97881f656b9117 100644
GIT binary patch
delta 559
zcmV+~0?_@C$p*;D29SygHMpqi9EXh}N|BSB0g#g~0Z#;%-Do1Sf&mr>4QPd(B5bm#
z>gww1XpXa*2n9$1<CCCJ(gCZpb5UR%0jsmrZHo;EtFow%R)D4BvuAs&0RiK)6MZd^
z0jsw`4FN7N0X>&+Jpnc#xgZY7<j@SMubF@jsR5ag2Y?94-tY{`;_wKbAaw5em!&-c
zLjgyZ={*4~7(}$mppYWTu&^GaUBDTT2EZGz0)P^$PM0k{0UrVDmrXtaIU7?OpUn=*
z<nRi~JMad{=kNl67O4WAkO!wI9had#0Z;)+m-0RVM+eEYsDK2&*_S{+0Tm-~djf!!
zh|u|s0z;QC5RH~W7{s$t1rmUnXpI&jj0-}SG8dP4KLIu@eE^?@!XTFtf1arYskOF%
zBdNu=fF83Of1alx0iUTAwtxevRkwu*y?~Qtm)bu8Auc(k21<|%sQ>_tHNcHGz<?>e
zAP$!q8jYdw9;KkkAOY|fmPZb+mtS2BfCYfimmNR>B3Vdf`;7{%H^7gIk&QRNz_q7L
zDxRG|z&Pm;0F6Pjkbys!f~h~isWrfb2;v}Q2bXUHpObptn-P_f=91=;XqQM)nU;J)
zz=;R|P?}%4mvd0si3k8vn<zS$m_Px42u*hwfD3>Oc$XhR0V5tORokZuQ`?gTHv63q
xfC8x>jSE5trYuL@Zxw?`bGKkY0i+5CB2El|pGiZv3rqohSO^ov%%FgAXUP<J=MDe>

delta 495
zcmV<L0TBMk$p(<g29Syg1GuQ_9EXh}CXthy0c?{m0Z#-Z``ZMwf&mr>0(6zLr3eK`
z0l$;0P|^X1vwl%v907;3-))Nx2#2z$k5+)Czq4|Cs{sMOvmSjdkO7CcObr1pFab%I
zdp!X*m(o1}LIER}6+Qth7$CICppYWTu&^GaUBDTT2EZGz0)P^$2A5er0UrU!mw7$`
zIU5TbpUn=*<nRi~JMad{=kNl67O4WAkO!w=9GA^L0Z;(}mmWU>M?a;ssDK2&wX~>>
z79kjE00Bs%evTAFsQ}Et0GB9x0)Ul>(D{u5Lzia{jh1j)sk2c95`dX#jTRw{3qqG_
z7MG+y0X8f(0H1}zAeTyho~Z??gSLPpsgt*W9<x(^o~Kv<pQ+=ufCH%`w}lA3fRi1U
z20#HJA}gf^N{|bw0050Oz>PP+fE&Fa4wo4kjUj;W5T&5WAOY}~RX_nE6AO2bjS8(d
zz>kWNjW@u+wWnw)mx@3E9VrU~pObptn-P_f=91=;XqQM)nU+E`kckKYP?}%4mvd0s
zi3k8vn?yO6&_Dry2x)d0fD3>qcb8W|0V5tqRNJQ}QrnXuHT#_pfC8x>jSE5trYuL@
lHy49sa<`a40i+5CK1~dOpJhU~LrejESP1z;hX1jbU#<|5!rA};