From d6e74c638f4db15ebebe55536f644e4a8ad715a4 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@sirsidynix.com>
Date: Thu, 13 Jan 2022 15:06:08 -0700
Subject: [PATCH] Fix a bug and update the rom

---
 PotShuffle.py         |   8 ++++----
 Rom.py                |   4 ++--
 data/base2current.bps | Bin 82500 -> 82859 bytes
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/PotShuffle.py b/PotShuffle.py
index 9821dc2e..0da3c237 100644
--- a/PotShuffle.py
+++ b/PotShuffle.py
@@ -167,10 +167,10 @@ vanilla_pots = {
     104: [Pot(84, 14, PotItem.Nothing, 'Skull Pinball'), Pot(84, 13, PotItem.Nothing, 'Skull Pinball'), Pot(88, 12, PotItem.Nothing, 'Skull Pinball'), Pot(88, 6, PotItem.Nothing, 'Skull Pinball'), Pot(88, 5, PotItem.Nothing, 'Skull Pinball'),
           Pot(88, 4, PotItem.Nothing, 'Skull Pinball'), Pot(64, 17, PotItem.Nothing, 'Skull Pinball'), Pot(64, 15, PotItem.Nothing, 'Skull Pinball'), Pot(64, 7, PotItem.Heart, 'Skull Pinball'), Pot(88, 7, PotItem.SmallMagic, 'Skull Pinball'),
           Pot(64, 16, PotItem.Heart, 'Skull Pinball'), Pot(64, 24, PotItem.SmallMagic, 'Skull Pinball'), Pot(64, 25, PotItem.Heart, 'Skull Pinball')],
-    107: [Pot(28, 5, PotItem.Heart, 'GT Crystal Paths'), Pot(44, 5, PotItem.Nothing, 'GT Crystal Paths'), Pot(28, 8, PotItem.Nothing, 'GT Crystal Paths'), Pot(44, 8, PotItem.SmallMagic, 'GT Crystal Paths'),
-          Pot(28, 11, PotItem.SmallMagic, 'GT Crystal Paths'), Pot(44, 11, PotItem.Nothing, 'GT Crystal Paths'), Pot(94, 25, PotItem.Nothing, 'GT Mimics 2'), Pot(98, 25, PotItem.FiveArrows, 'GT Mimics 2')],
-    108: [Pot(20, 6, PotItem.Heart, 'GT Quad Pot'), Pot(40, 6, PotItem.FiveArrows, 'GT Quad Pot'), Pot(20, 10, PotItem.Bomb, 'GT Quad Pot'), Pot(40, 10, PotItem.SmallMagic, 'GT Quad Pot')],
-    109: [Pot(28, 26, PotItem.Heart, 'GT Gauntlet 5'), Pot(32, 26, PotItem.Heart, 'GT Gauntlet 5'), Pot(28, 27, PotItem.SmallMagic, 'GT Gauntlet 5'), Pot(32, 27, PotItem.SmallMagic, 'GT Gauntlet 5')],
+    0x6B: [Pot(28, 5, PotItem.Heart, 'GT Crystal Paths'), Pot(44, 5, PotItem.Nothing, 'GT Crystal Paths'), Pot(28, 8, PotItem.Nothing, 'GT Crystal Paths'), Pot(44, 8, PotItem.SmallMagic, 'GT Crystal Paths'),
+           Pot(28, 11, PotItem.SmallMagic, 'GT Crystal Paths'), Pot(44, 11, PotItem.Nothing, 'GT Crystal Paths'), Pot(90, 25, PotItem.Nothing, 'GT Mimics 2'), Pot(98, 25, PotItem.FiveArrows, 'GT Mimics 2')],
+    0x6C: [Pot(20, 6, PotItem.Heart, 'GT Quad Pot'), Pot(40, 6, PotItem.FiveArrows, 'GT Quad Pot'), Pot(20, 10, PotItem.Bomb, 'GT Quad Pot'), Pot(40, 10, PotItem.SmallMagic, 'GT Quad Pot')],
+    0x6D: [Pot(28, 26, PotItem.Heart, 'GT Gauntlet 5'), Pot(32, 26, PotItem.Heart, 'GT Gauntlet 5'), Pot(28, 27, PotItem.SmallMagic, 'GT Gauntlet 5'), Pot(32, 27, PotItem.SmallMagic, 'GT Gauntlet 5')],
     115: [Pot(154, 21, PotItem.FiveArrows, 'Desert Circle of Pots'), Pot(158, 21, PotItem.OneRupee, 'Desert Circle of Pots'), Pot(20, 23, PotItem.Switch, 'Desert Circle of Pots'), Pot(36, 23, PotItem.FiveRupees, 'Desert Circle of Pots'),
           Pot(144, 24, PotItem.Heart, 'Desert Circle of Pots'), Pot(168, 24, PotItem.FiveArrows, 'Desert Circle of Pots'), Pot(20, 26, PotItem.SmallMagic, 'Desert Circle of Pots'), Pot(36, 26, PotItem.Heart, 'Desert Circle of Pots'),
           Pot(154, 27, PotItem.OneRupee, 'Desert Circle of Pots'), Pot(158, 27, PotItem.FiveRupees, 'Desert Circle of Pots')],
diff --git a/Rom.py b/Rom.py
index f5461cf0..e745c253 100644
--- a/Rom.py
+++ b/Rom.py
@@ -35,7 +35,7 @@ from source.item.FillUtil import valid_pot_items
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '6c43ba88d17005bd1237fe1a62597705'
+RANDOMIZERBASEHASH = '8d13470d5a3127c6705846674cfb6209'
 
 
 class JsonRom(object):
@@ -874,7 +874,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
         if world.keydropshuffle[player] == 'potsanity':
             rom.write_bytes(0x04DFD8, [0x18, 0x0B, 0x1C])
             rom.write_byte(0x04E002, 0xFF)
-    rom.write_byte(0x142A52, credits_total - 216)  # todo: this is now a delta
+    # write_int16(0x142A52, credits_total - 216)  # todo: this is now a delta
 
     write_int16(rom, 0x187010, credits_total)  # dynamic credits
     if credits_total != 216:
diff --git a/data/base2current.bps b/data/base2current.bps
index 8be46f4bcb7506150763ecbabf41ed2f7313da58..4169ad035206b464201d27aad2c946655de89636 100644
GIT binary patch
delta 2251
zcmX9<YgiL!8l5j8nGi$}P!KSNS>!4jFDO!#7`)Je8n0EJSaG#B>?okCTSXx=fhZS4
z2%j)QjHEKr1PIYiT~Sxz!3#vOj#XE{Du}mdX{(`9*U~<+gZty0_xw2L{oWt%^M2O~
z1r3J<<q2S!ao+MVK}Ymhox`?)&|_PTrHlvOb94$+fWL!N@Sh+OZRw(;N{S(T4&p!y
z^y6g$J3Pos1eNeSZxR@U4|w}P3|zra1q)#fe<5gw-Te1F&u)0nqZ+WxPQe#IlvY)|
z!C?z6gSUkTKnVO4UGMX(i(Y(~d}mVfNU5Rt8f-#iqYE2s0|Un@H#OP_FfhNU68nq8
zb_S)QXOdP=%-m=T#@eY!OC|Pi$P+1p=Q(U@<^&?q>JRYQO`+WQMUYl;#h=+Bngn>D
z1D1NeQ{>;H2W&>{yQ7wY=SJ*hS>(X6Zx+>9RPP`?Fd#alSJ}GhjDkvR%?r!GK%>c^
z$EsgiLJ6bl2QHXVpvQ1{RlE&^!YHp*AQR?#C4r0ZqF3f*jHOkjdTeSt?W@&^L?(W;
zK8GY@&s1X?BaH<xiZST|pkd78_JN=)opf6JRjHO6?lx`FW8&MiiqvB#VVu8QH1|F&
zDllT9%wGT2Xz(jDXMvsXkKUpUtTBs4v87arF`KJ8=B*qTgf@53cA)<c&k0GHTYz1^
zN#pdG1Y8<)6mv4UOOJXaQp=NmT0r0_A03Dt7!ak#y2%ybo@hr#H3q-27^++Iu^BZM
zGcgvsQg2b?DVHY5e}c)Wv-rZ~`^^5-`2ugzO_~s6%Q*JH4l!-YCV%jp*|lvoe;VFS
zJFa=$2_s}~Q`q!FXI-c}1j}ouar-P?2Q~k8v6mC4mMROY?I@1rF@s;t4gzWzL2Lzu
zObIa;fOw{jTssAvVggSOfFMB!Z4Gfp)-D$5pOu)iNSQ8eSQQSBF~RnS0<Z)A+Em0t
z+nIyTFaY}Ci8IYW!F+yJEfH?gl0BwD=Ej|KXnc(6^Ncc2;xNKWthQ)A;^HA}KvcRV
z9NW`raVqO=EMLmp$R$A3=?xiW2Caa=r3|z_`~)!Y=|e@Fs<2WqlpkzRIFFPzlZnn^
z(wmCgQbs0HTB91rwlteEGRlmTQ+k|{rdX)#ijP#xDt835g;|m45hS~QDF5_pcwoCh
zXUM9Xv)xeFOg7ePOE1>0gpFOZ1oEgdYA1Z&mFp)I8LbgR`9axpm6~WDcnFS%Io*fR
zv5U&dFW_eQp*upjBb-=8Y=$vC^uqpI*sCFl6zi-NOshT-;cqbVbRv7_m8iHrxHnyU
zYMksU`MxgQ+kE||9N{^?;&x)Jb0Hyf3EV<z9vt(C2<+~(70RTyIG%y`lmul;k$MXv
zeFW<s#fxus27TGD>&K<tu>VmCm;qyd)I?ZV+A$TlMDB6UV6BW5IUAH3*9VrLcH#Rb
zp0saGoSUD9-hu3o>0l3xeOxuU;(PlaZNA45g(-Q$IO5#<<MJ?vJdAyBC-sPe%7T55
zCrDPtcoL^q6Gnk6hZR-Dtu)v9B1F}i54twrc5ws@c(N9(gPBhz@%;F(=m`rp!i~N0
z9{XFVG+5C)8_a?2y?NjXT++7=tcRw)Nu0jWw<It-+>@{)1Sl~eYc*wFfXWK=Bw#EY
z|1>OQdv>{_H>peJ7PfFqyftMVxoemTkQ7V}S3SKP^Zq{V7T)yzZwb+1C-h-qZ8B<0
zl!*AfUM$W;s`P%z=@u!{FKzL702BI81}dg>p8xGlYjF#9;Fh-tCC;xFq68HU2m2@T
z#)iW&&*H#-Ch^%_Fd^%Jq4JF-6mi~z<1bbwx<-&QNmL#Tdl3RuaKVe|v8ie0WE3@Z
zEditQ%E*oFT2jp+lhIcA>^K7Bmm7_F>5W}H*i)y3)Qddd@ri$u>aX`53Qix)o?R^5
z#)Q9ICia}WvZ&Yxt1yKyd)%9WU|B|yX&2Kqc+_Y77DA5ZcXX)L>Y?PTINl;d^W7m7
z3BY)b-P6o^<CiavVF8|-J5>GV?Yeno6A2yy5V_R3s@~>a(v#jMvs%Qq%Sx2nY;jM0
z%U>I8I%N2A4r-ErTD*Ypy40dnYr+w?AK`ha1=&6-(SBL(upQtZ3xYfN9`m#f_{W9`
zwJA9TMkj{mi%owkH(zo@pf2DR8)`~kmmW5hm43L+wHVEDq0!((E=VoNMTtq;6bFWy
zm8c^MHD{n)&YXj~r#Pi(K6kfLu<uS=%t{}%E1dPVT3iI{#W`4^JsjJ~eGNFJ;sJ?Y
zLE}&Wp-TKgh-2>@ws!gSS5y%XgloJV<sO*x2Cc>mk;@sV;aF=vi&0<CeEf?Q=^bgb
zv0kHhW7ILM#$8VLpex+{%W$o1+8d)f5w}>Jv*OFCIcRP7vBx8gEPps5gERa-9F*}d
zVr=V7*1JAEs-iduPk?AaCF`LIYWA+#5?E3pomW~VPwvrals;74K`~Jc@D!`JOJrI!
znK-M)^}8k9ao;6z<VdQPBd?w!`W%UwKzo{YOWLG%<V%A>sp*$Gc1vnMTmN$$(Jvdu
z`+eJ_O}ixSq~jlB;`)}K9X9=hu%Ju?q@2tz3rMyjzv+3&)chO+wK@0kx3RnQkJTE^
zal}i3Ba5YrTNj^6>sx`Hw_DBxFrww1)!b92Cc=*?Jj<!nrqa{~o#--w)+D5ys|t*v
zblcE|^*4<#D_&MKP*Zmrs#bhrEfyiln#~s|^fQ)|t4#qRy=0n6OR6~B;_!&WYm?Uc
z0g)nqj*N^X$dOaYOPh_OT5;*yQa~^W@qZ>?H}tMS3jxnGlgQ70Fqr`VptnvlF5Kc=
YmUcY&{3m<>l0<if_4jt|{o~;O0IFZ(Q2+n{

delta 1846
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
b&)dvJ6f`8BJs|}kTmH|-Pj<8(PS*S%f>tF9