From 6ab426b9f3dd63f26d74c7cfc3cc8b75cee1e7b8 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@sirsidynix.com>
Date: Tue, 3 May 2022 13:55:39 -0600
Subject: [PATCH] Fix for keydrops/enemy drops to not be repeatable

---
 Main.py               |   2 +-
 PotShuffle.py         |   2 +-
 RELEASENOTES.md       |   3 +++
 Rom.py                |   2 +-
 data/base2current.bps | Bin 93062 -> 93043 bytes
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Main.py b/Main.py
index ba55ad46..ea40af54 100644
--- a/Main.py
+++ b/Main.py
@@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names
 from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config
 from source.tools.BPS import create_bps_from_data
 
-__version__ = '1.0.2.1-v'
+__version__ = '1.0.2.2-v'
 
 from source.classes.BabelFish import BabelFish
 
diff --git a/PotShuffle.py b/PotShuffle.py
index 17107bae..90258478 100644
--- a/PotShuffle.py
+++ b/PotShuffle.py
@@ -1052,7 +1052,7 @@ class PotSecretTable(object):
                 rom.write_bytes(pointer_address + room * 2, int16_as_bytes(data_address))
                 for pot in self.room_map[room]:
                     rom.write_bytes(data_pointer + list_idx * 3, pot.pot_data())
-                    if pot.location is not None:
+                    if pot.location is not None and not pot.location.forced_item:
                         collection_rate_mask |= 1 << (15 - list_idx)
                         if colorize and pot.obj_ref:
                             pot.obj_ref.change_type(Shuffled_Pot)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ebaf2919..8c5a8589 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -157,6 +157,9 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o
 
 #### Volatile
 
+* 1.0.2.2
+	* Change to all key pots and enemy key drops: always use the same address
+	* Don't colorize key pots in mystery is the item is "forced"
 * 1.0.2.1
 	* Fix for paired doors
 	* Fix for forbidding certain dashable doors (it actually does something this time)
diff --git a/Rom.py b/Rom.py
index 3819158a..25ee90e3 100644
--- a/Rom.py
+++ b/Rom.py
@@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '490b6fa137b3f76a76d4e4905ddfb34b'
+RANDOMIZERBASEHASH = '94fd47b16641a1aa44f22e21c8a7a024'
 
 
 class JsonRom(object):
diff --git a/data/base2current.bps b/data/base2current.bps
index 0f751ab3d93517643c9682d32f5a16a11fcf30d6..9643a3cd34345ca166283b87a106c8f27708a869 100644
GIT binary patch
delta 228
zcmV<A02}{?*9G&|1(1pXN|B4t1f@_~uajN@E&&L$jRA}W0kV@C2Y&$=lbQ#W8JLxR
zuc&|l>O6>*B6zT<um_hZGJ&NDBEOSL2xAD2u&8LWo&X-RwFp813GJ|`>bQ*}{;+}y
zwh93r6afjBA07cD2*(I~gMk^Vf|pz#0cHVim%|<bDFGCh?H&Oi5T&p56o6bh(gtfH
zow2CL50@Mt0W$$!mrx%8H33kUh93bs0Z^C09|7M1lb4|&0YVE%vVan^gt5XPsrZ-f
eAOSZ4ZkHw@0XqR7w_+gy97+hmA=Hu}wj{B<SW|NV

delta 249
zcmV<V00#f_)&+*w1(1pXP?3wz1P)E{vXfo`E&&d+jRA}W0l1SI2Y&$`lbQ#W8=5b@
zm4vUTfC1_}h?OFKu&A&HmnkxVr3oU%lSl|-2$Zm>XtSOmT(h$XLIDZ$u&C;|jUoiG
zgZ>G({s{pd6ag8R9UcKB8Lv>PsFQc8jTt!5YnOB;gn<Z`f`#zvpOTkJ9sy<ndY7;s
z0Vx3*m)afy9}ugr^b~+xI?@JfBBQaW#~YUk9|1D~WS2c30W|?umvbKhIssOft{(y4
z0hyPMAOS)PPO^X!vxKq2AgTVB+aLiq0eY7cAptu92e(fl0USyQz3d=x522L+PS9R}