From 627168e771b839e38e89382e7a512f7f3aefcc33 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Mon, 26 Jun 2023 10:29:37 -0600
Subject: [PATCH] First pass on multiworld for enemy drops. Fixed a few
 graphical enemizer issues.

---
 MultiClient.py                  |  59 ++++++++++++++++++++++++--------
 MultiServer.py                  |  19 ++++++----
 Rom.py                          |   2 +-
 data/base2current.bps           | Bin 99517 -> 99523 bytes
 source/dungeon/EnemyList.py     |  10 +++++-
 source/dungeon/RoomList.py      |  15 ++++----
 source/dungeon/RoomObject.py    |   3 +-
 source/enemizer/Enemizer.py     |   5 +--
 source/enemizer/SpriteSheets.py |   4 ++-
 source/enemizer/enemy_deny.yaml |   5 ++-
 source/rom/DataTables.py        |  11 +++++-
 source/tools/MysteryUtils.py    |   2 +-
 12 files changed, 97 insertions(+), 38 deletions(-)

diff --git a/MultiClient.py b/MultiClient.py
index fbde673d..559f6f63 100644
--- a/MultiClient.py
+++ b/MultiClient.py
@@ -8,10 +8,12 @@ import shlex
 import urllib.parse
 import websockets
 
-from BaseClasses import PotItem, PotFlags
+from BaseClasses import PotItem, PotFlags, LocationType
 import Items
 import Regions
 import PotShuffle
+import source.dungeon.EnemyList as EnemyList
+import source.rom.DataTables as DataTables
 
 
 class ReceivedItem:
@@ -66,6 +68,9 @@ class Context:
         self.lookup_name_to_id = {}
         self.lookup_id_to_name = {}
 
+        self.pottery_locations_enabled = None
+        self.uw_sprite_locations_enabled = None
+
 def color_code(*args):
     codes = {'reset': 0, 'bold': 1, 'underline': 4, 'black': 30, 'red': 31, 'green': 32, 'yellow': 33, 'blue': 34,
              'magenta': 35, 'cyan': 36, 'white': 37 , 'black_bg': 40, 'red_bg': 41, 'green_bg': 42, 'yellow_bg': 43,
@@ -96,6 +101,9 @@ SHOP_SRAM_START = WRAM_START + 0x0164B8             # 2 bytes?
 ITEM_SRAM_SIZE = 0x250
 SHOP_SRAM_LEN = 0x29  # 41 tracked items
 
+POT_LOCATION_TABLE = 0x142A60
+UW_SPRITE_LOCATION_TABLE = 0x142CB0
+
 RECV_PROGRESS_ADDR = SAVEDATA_START + 0x4D0         # 2 bytes
 RECV_ITEM_ADDR = SAVEDATA_START + 0x4D2             # 1 byte
 RECV_ITEM_PLAYER_ADDR = SAVEDATA_START + 0x4D3      # 1 byte
@@ -826,12 +834,16 @@ def get_location_name_from_address(ctx, address):
 
 
 def filter_location(ctx, location):
-    if (not ctx.key_drop_mode and location in PotShuffle.key_drop_data
-         and PotShuffle.key_drop_data[location][0] == 'Drop'):
-        return True
-    if (not ctx.pottery_mode and location in PotShuffle.key_drop_data
-         and PotShuffle.key_drop_data[location][0] == 'Pot'):
-        return True
+    if location in location_table_pot_items:
+        tile_idx, mask = location_table_pot_items[location]
+        tracking_data = ctx.pottery_locations_enabled
+        tile_pots = tracking_data[tile_idx] | (tracking_data[tile_idx+1] << 8)
+        return (mask & tile_pots) == 0
+    if location in location_table_sprite_items:
+        tile_idx, mask = location_table_sprite_items[location]
+        tracking_data = ctx.uw_sprite_locations_enabled
+        tile_sprites = tracking_data[tile_idx] | (tracking_data[tile_idx+1] << 8)
+        return (mask & tile_sprites) == 0
     if not ctx.shop_mode and location in Regions.flat_normal_shops:
         return True
     if not ctx.retro_mode and location in Regions.flat_retro_shops:
@@ -842,13 +854,6 @@ def filter_location(ctx, location):
 def init_lookups(ctx):
     ctx.lookup_id_to_name = {x: y for x, y in Regions.lookup_id_to_name.items()}
     ctx.lookup_name_to_id = {x: y for x, y in Regions.lookup_name_to_id.items()}
-    for location, datum in PotShuffle.key_drop_data.items():
-        type = datum[0]
-        if type == 'Drop':
-            location_id, super_tile, sprite_index = datum[1]
-            location_table_sprite_items[location] = (2 * super_tile, 0x8000 >> sprite_index)
-            ctx.lookup_name_to_id[location] = location_id
-            ctx.lookup_id_to_name[location_id] = location
     for super_tile, pot_list in PotShuffle.vanilla_pots.items():
         for pot_index, pot in enumerate(pot_list):
             if pot.item != PotItem.Hole:
@@ -862,6 +867,25 @@ def init_lookups(ctx):
                 location_id = Regions.pot_address(pot_index, super_tile)
                 ctx.lookup_name_to_id[loc_name] = location_id
                 ctx.lookup_id_to_name[location_id] = loc_name
+    logging.info('Init Lookups')
+    uw_table = DataTables.get_uw_enemy_table()
+    key_drop_data = {(v[1][1], v[1][2]): k for k, v in PotShuffle.key_drop_data.items() if v[1] == 'Drop'}
+    for super_tile, enemy_list in uw_table.room_map.items():
+        index_adj = 0
+        for index, sprite in enumerate(enemy_list):
+            if sprite.sub_type == 0x07:  # overlord
+                index_adj += 1
+                continue
+            if (super_tile, index) in key_drop_data:
+                loc_name = key_drop_data[(super_tile, index)]
+            else:
+                loc_name = f'{sprite.region} Enemy #{index+1}'
+            if index < index_adj:
+                logging.info(f'Problem at {hex(super_tile)} {loc_name}')
+            location_table_sprite_items[loc_name] = (2 * super_tile, 0x8000 >> (index-index_adj))
+            location_id = EnemyList.drop_address(index, super_tile)
+            ctx.lookup_name_to_id[loc_name] = location_id
+            ctx.lookup_id_to_name[location_id] = loc_name
 
 
 async def track_locations(ctx : Context, roomid, roomdata):
@@ -983,6 +1007,7 @@ async def game_watcher(ctx : Context):
 
         if not ctx.rom:
             rom = await snes_read(ctx, ROMNAME_START, ROMNAME_SIZE)
+            logging.info(f'Rom name: {rom} @ {hex(ROMNAME_START)}')
             if rom is None or rom == bytes([0] * ROMNAME_SIZE):
                 continue
 
@@ -996,6 +1021,12 @@ async def game_watcher(ctx : Context):
             logging.warning("ROM change detected, please reconnect to the multiworld server")
             await disconnect(ctx)
 
+        if ctx.pottery_locations_enabled is None:
+            ctx.pottery_locations_enabled = await snes_read(ctx, POT_LOCATION_TABLE, 0x250)
+
+        if ctx.uw_sprite_locations_enabled is None:
+            ctx.uw_sprite_locations_enabled = await snes_read(ctx, UW_SPRITE_LOCATION_TABLE, 0x250)
+
         gamemode = await snes_read(ctx, WRAM_START + 0x10, 1)
         if gamemode is None or gamemode[0] not in INGAME_MODES:
             continue
diff --git a/MultiServer.py b/MultiServer.py
index a9f9e9e2..7040ce27 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -16,6 +16,8 @@ import Items
 import Regions
 import PotShuffle
 from MultiClient import ReceivedItem, get_item_name_from_id, get_location_name_from_address
+import source.dungeon.EnemyList as EnemyList
+import source.rom.DataTables as DataTables
 
 class Client:
     def __init__(self, socket):
@@ -355,12 +357,6 @@ async def console(ctx : Context):
 def init_lookups(ctx):
     ctx.lookup_id_to_name = {x: y for x, y in Regions.lookup_id_to_name.items()}
     ctx.lookup_name_to_id = {x: y for x, y in Regions.lookup_name_to_id.items()}
-    for location, datum in PotShuffle.key_drop_data.items():
-        type = datum[0]
-        if type == 'Drop':
-            location_id = datum[1][0]
-            ctx.lookup_name_to_id[location] = location_id
-            ctx.lookup_id_to_name[location_id] = location
     for super_tile, pot_list in PotShuffle.vanilla_pots.items():
         for pot_index, pot in enumerate(pot_list):
             if pot.item != PotItem.Hole:
@@ -373,6 +369,17 @@ def init_lookups(ctx):
                 location_id = Regions.pot_address(pot_index, super_tile)
                 ctx.lookup_name_to_id[loc_name] = location_id
                 ctx.lookup_id_to_name[location_id] = loc_name
+    uw_table = DataTables.get_uw_enemy_table()
+    key_drop_data = {(v[1][1], v[1][2]): k for k, v in PotShuffle.key_drop_data.items() if v[1] == 'Drop'}
+    for super_tile, enemy_list in uw_table.room_map.items():
+        for index, sprite in enumerate(enemy_list):
+            if (super_tile, index) in key_drop_data:
+                loc_name = key_drop_data[(super_tile, index)]
+            else:
+                loc_name = f'{sprite.region} Enemy #{index+1}'
+            location_id = EnemyList.drop_address(index, super_tile)
+            ctx.lookup_name_to_id[loc_name] = location_id
+            ctx.lookup_id_to_name[location_id] = loc_name
 
 
 async def main():
diff --git a/Rom.py b/Rom.py
index f3fdfa59..cbeb9725 100644
--- a/Rom.py
+++ b/Rom.py
@@ -40,7 +40,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '79a57594c59b3fa2e9cf344fc7437bf9'
+RANDOMIZERBASEHASH = '563fe28515c5dd9f64270ca475d1c2d3'
 
 
 class JsonRom(object):
diff --git a/data/base2current.bps b/data/base2current.bps
index 55b2a98f5ba9ff7ba8b1b1b8b03e1f6b46aefc6c..214584d37c75193eab4cf42ed4efeadea411a5f8 100644
GIT binary patch
delta 2280
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
bJm0M8>I>cG_`VXp5sPOeh&wh~WY_-(ozBIV

delta 2244
zcmW+%d010d7Jug@kPr+Iq+t_C9w96);I6ooiVG+TjDl8Csg-`wSgG68h2_0KRM3~j
zJ9xE0$;d+k3IU#DTxzx8h#=J1#VS^(qt0kETGJ0uL~AGZpWnIneCM9;cfa57JEy(E
z`(lN+X*wJ-&&U?vY_%<;S?aX;V7G9fLox+@0yD_+R#XR@6aRIU6Vp}HB@^dzZJ11(
zspeC*d{vbh#BvaY95Ck{`#a~l%~J9^TwG;EH=0Y1CI>svHgW>Fz6qTqGvP6MO}-ER
zMbiY)Fbk~~Y$Q#s=!PH+b|IHw34D&;7tVwie2Fj`ARis`vO+AM>aBr*p%&Z8oDnQr
zS$4*?w_;=~x*$40<~5^CagKlT9d7m>W}zjEWE92<67k}ZGi-L7%Vp7K(p6WRZ8W&1
z@2#RPx7eCRc;Ub6d?-<iEsSbEbi!IiiJCo?K@3Y>{oa}-^?WMGjzWFr`P-XpuB~*%
zu`X*KU2&@g75c=&dLH{kKt%F2?x!P}kF6p3`xcz+kW>iE%+$J8o9iq~?QBIiCBMK8
zbir3a{&5H0^NsL{{+@H?m$B5BNHA<IY(bh~*>E16A2ttUh?LItPiwMqLWh+RXgn-7
zHKC=_Qt=iim$#3l3ebJ292W8e(jsrT$ZrnX2_gPHTt-K`LdQ~TdpIjgt?1$MJP-Sj
zP@W>*`#mT2u=x~a$kPi}^>V6xD09VuDMpqGzi)lVv!IuA&GwXgu2~+PJ>h3QW6J@L
zYO1^36T9`=g<o$!zn53e=6%!4ZP(RYsnYx9<=*Au_OW?7Prv;}(5YCIsv~IQ>>8H(
zlpm6>jfZr8bxNCH_?+vU@h9^}r-&-YmF7ZEZ09G;)_DcJxW?53`wL029h@C8Np3Gn
zfV$Gp!4tlGJ}r^X?c!(&rT3tay28tH^ur;7$C@PqIoH88UJ>3<(n)Sh!MNQmog#NQ
zbq2wPU^v5vZkQMX=TK(($8eYD%h&nCZa(5~zmJATe0ZA+<TI~vb>Z&V8o4+7u=2=8
zCP|+$l(&)(ztZRh4XCs87^I*LU2X_PE3co1U3_5oHTA><%Z`->A9@erjI6W83y4mV
za0bOKx2mYz9;-d8!R8bwo?hKaL)?j-D-FhjUbI&66v_Lh!Bg~?zFCQ%l~>K`F9|cw
zvhUw_mPxi(Fj5@7k!F&ytZ=_sqoqDNYtgJUn4{8q?Xi|j)ZRBScElJ{V^Ev2j)?z*
zC|uuPa^hE%y2hwCZmcc&$XI)p*-)d~cfRIh6xAOI8E9s|+$TNSfaj_Wcr{wtUmQr}
z80yshB_V~Avr6Or(QYI~Py6S{#Su*7l;<8c#+g~AaYLG;-jO;KgXRs45pAAkVpgGS
zR5YOWUZtk9>1Jdb;F1*G)Z_k0MSl0u>EoZ(j4gg;PSK0&yT1yQ>d^E}caO`G+L^)H
zT)!i1R|-K|CZeJjhl3M(Y~@Lc5gr_??X3)1ryv@vgklsL^>U(QL{CV;1N{T7A^~Y%
zrhyKfepwpxo0DrC1)XBI%pRsoa*FLIvr0SPIt3Y$8%?C*=f$Jlf{bNo+29HYK&J<*
zCO`b9{&ibGH8IOl5G<qrF<70VY)nx)2kRM@n1us^Wc1f5bpal0q<8wc=XClw6CVUv
zHjPB|t1uXaEU$9F7yb4s0@9HG(9M8`9@COGg&okQZ}sj-tU&Ie7~zbsaR3T^JpuNh
zMX!q?5p}=Li8}G!)A8W$t0(^Vj-gwMV$EY|(Uj*6S*3KJA`zv$nG-Bi`_T0S4V6Y>
zNvXjXa6qUJjTWNnH%btruik`u40`)bdwk{(oZGuA;AJJ<R!_4^Wm^&!B#7x(4HC&Z
z;vgHCy4<QD9w;uYKv#aR4gO5s?HG7|x#AMF>-sbw5$zzvA{sA6C2vDvIy&@rjAt@-
zyuAU^Wjl;j&#fZ}`**1DX;m$#KvH!L62~fMo0vGfJ%dK$iVRFBmM${c{T6w09XckS
z*B$WRuph-NGMkH+pSn$=-r5u#2T%;D_&7k~n6r1ecp#h+L-)sRJ2Q~i_QLPd`Mcau
z$U350Pk0d0>c<m$Qll5tkGHJB0ut1)7$=ah7ZzZigx!#jlLasaCgODhSWlL$#XksO
zhSYy4b8`DKMpTi$C+c%Yln@LO$i_{65CY2`9eyAe1td%`9hKxV%;obrfehaAq2t+m
z@THf?4~{b=mN}Zk;TS1S6;?8bhtu(n<&nUXUc*)}C&F={64HcPW6)^4N(srnd+j#8
z#NfWEc-V+*m5@u$55TXLkST+rva6=U8n)V3tEoPbR$PWxP_U4k--H_|*b*FTxBZiF
z4u5jVbI=n*8cqMLSBekpctSK}kg^=Ci-u9YMPUYZ=;CK0OKCbj7Y(swayEVt4HE=g
zN<=tR1yjhBFuYg=aipac7povr_N=)-h|Wv?cDI&N@wSefTzpCe<Ghczn1s|5{73~!
zGY+-bobTCl8f=MbQHfjpZr)H&u5v>fZKvJ+xKrhRI8?K(bgx;HthHM0zGF?6`D4HM
zkN^CJL-!7~;OrQfOy<zIG6oVTX!7i)b1z#?<|||eb7#8_gSJlEDR!dm!)Qi%aKWTr
z{9_D!F(Qn&v2x{~iXJO51f|v!11y<})f<giidi+p4!gnAfqZ#Oo1(sy$CuSGi7ZOQ
zgK9_)6RawOlHKFzlENRNXxMo+3e1Y_cHf=VQydwwzy^vkp(2*vG2QX=R1kuH_M}s6
z_F6)8;KN#Gu_e&amkgt)0)>@ZJ?0tbNZSf~NXgViSJ*~_P>X#Xcm4_og%bI;TSs>+
kFtrD7!#j3Cfw#!#OvkP@jz_!TN3r-5vg?DXMPsJ@9{}93eE<Le

diff --git a/source/dungeon/EnemyList.py b/source/dungeon/EnemyList.py
index 64beb1d0..fdde1426 100644
--- a/source/dungeon/EnemyList.py
+++ b/source/dungeon/EnemyList.py
@@ -2107,16 +2107,24 @@ class EnemyTable:
         data_pointer += 2
         for room in range(0, 0x128):
             if room in self.room_map:
+                tracking_mask = 0x00
                 data_address = pc_to_snes(data_pointer) & 0xFFFF
                 rom.write_bytes(pointer_address + room * 2, int16_as_bytes(data_address))
                 rom.write_byte(data_pointer, 0x01 if room in layered_oam_rooms else 0x00)
                 list_offset = 1
-                for sprite in self.room_map[room]:
+                idx_adj = 0
+                for idx, sprite in enumerate(self.room_map[room]):
                     data = sprite.sprite_data()
                     rom.write_bytes(data_pointer + list_offset, data)
                     list_offset += len(data)
+                    if sprite.sub_type == 0x07:  # overlord
+                        idx_adj += 1
+                        continue
+                    if sprite.location is not None:
+                        tracking_mask |= 1 << (15 - idx + idx_adj)
                 rom.write_byte(data_pointer + list_offset, 0xff)
                 data_pointer += list_offset + 1
+                rom.write_bytes(snes_to_pc(0x28ACB0) + room * 2, int16_as_bytes(tracking_mask))
             else:
                 rom.write_bytes(pointer_address + room * 2, int16_as_bytes(empty_pointer))
 
diff --git a/source/dungeon/RoomList.py b/source/dungeon/RoomList.py
index ecb2d8df..951f5b33 100644
--- a/source/dungeon/RoomList.py
+++ b/source/dungeon/RoomList.py
@@ -46,9 +46,10 @@ class Room:
 
     def find_all_pots(self):
         pots = []
-        pots.extend([x for x in self.layer1 if x.data[2] == 0xFA])
-        pots.extend([x for x in self.layer2 if x.data[2] == 0xFA])
-        pots.extend([x for x in self.layer3 if x.data[2] == 0xFA])
+        pots.extend([x for x in self.layer1 if x.data[2] in {0xFA, 0xFB} and not x.dummy])
+        pots.extend([x for x in self.layer2 if x.data[2] in {0xFA, 0xFB} and not x.dummy])
+        if self.layer3:
+           pots.extend([x for x in self.layer3 if x.data[2] in {0xFA, 0xFB} and not x.dummy])
         return pots
 
 
@@ -514,12 +515,12 @@ Room0127 = Room([0xE1, 0x00],
                  RoomObject(0x0AB61E, [0x43, 0xCB, 0xFA]),
                  RoomObject(0x0AB621, [0x4B, 0xCB, 0xFA]),
                  RoomObject(0x0AB624, [0xBF, 0x94, 0xF9]),
-                 RoomObject(0x0AB627, [0xB3, 0xB3, 0xFA]),
-                 RoomObject(0x0AB62A, [0xCB, 0xB3, 0xFA]),
+                 RoomObject(0x0AB627, [0xB3, 0xB3, 0xFA], True),
+                 RoomObject(0x0AB62A, [0xCB, 0xB3, 0xFA], True),
                  RoomObject(0x0AB62D, [0xAD, 0xC8, 0xDF]),
                  RoomObject(0x0AB630, [0xC4, 0xC8, 0xDF]),
-                 RoomObject(0x0AB633, [0xB3, 0xE3, 0xFA]),
-                 RoomObject(0x0AB636, [0xCB, 0xE3, 0xFA]),
+                 RoomObject(0x0AB633, [0xB3, 0xE3, 0xFA], True),
+                 RoomObject(0x0AB636, [0xCB, 0xE3, 0xFA], True),
                  RoomObject(0x0AB639, [0x81, 0x93, 0xC0]),
                  RoomObject(0x0AB63C, [0x81, 0xD2, 0xC0]),
                  RoomObject(0x0AB63F, [0xE1, 0x93, 0xC0]),
diff --git a/source/dungeon/RoomObject.py b/source/dungeon/RoomObject.py
index 4a890021..a541c926 100644
--- a/source/dungeon/RoomObject.py
+++ b/source/dungeon/RoomObject.py
@@ -8,9 +8,10 @@ Shuffled_Pot = (0xFB, 0, 0)  # formerly weird pot, or black diagonal thing
 
 class RoomObject:
 
-    def __init__(self, address, data):
+    def __init__(self, address, data, dummy=False):
         self.address = address
         self.data = data
+        self.dummy = dummy  # some room objects are dummies, unreachable
 
     def change_type(self, new_type):
         type_id, datum_a, datum_b = new_type
diff --git a/source/enemizer/Enemizer.py b/source/enemizer/Enemizer.py
index 00aba1a8..f14893ec 100644
--- a/source/enemizer/Enemizer.py
+++ b/source/enemizer/Enemizer.py
@@ -75,7 +75,7 @@ def get_possible_sheets(room_id, data_tables, specific, all_sheets, uw_sheets):
         req = requirements[key]
         if isinstance(req, dict):
             req = req[room_id]
-        if req.static or not req.can_randomize:
+        if req.static or not req.can_randomize or sprite.static:
             if req.groups:
                 match_all_room_groups.intersection_update(req.groups)
                 if not match_all_room_groups:
@@ -284,9 +284,6 @@ def randomize_underworld_rooms(data_tables, world, player, custom_uw):
         if room_id in {0, 1, 3, 6, 7, 0xd, 0x14, 0x1c, 0x20, 0x29, 0x30, 0x33,
                        0x4d, 0x5a, 0x90, 0xa4, 0xac, 0xc8, 0xde}:
             continue
-        if room_id not in data_tables.uw_enemy_table.room_map:
-            continue
-        # sprite_reqs = data_tables.sprite_requirements
         current_sprites = data_tables.uw_enemy_table.room_map[room_id]
         sprite_limit = sum(sprite_limiter[x.kind] if x.kind in sprite_limiter else 1 for x in current_sprites)
         randomizeable_sprites = get_randomize_able_sprites(room_id, data_tables)
diff --git a/source/enemizer/SpriteSheets.py b/source/enemizer/SpriteSheets.py
index 610f1696..b132dddd 100644
--- a/source/enemizer/SpriteSheets.py
+++ b/source/enemizer/SpriteSheets.py
@@ -189,7 +189,7 @@ def init_sprite_requirements():
         SpriteRequirement(EnemySprite.Ropa).sub_group(0, 0x16),
         SpriteRequirement(EnemySprite.RedBari).sub_group(0, 0x1f),
         SpriteRequirement(EnemySprite.BlueBari).sub_group(0, 0x1f),
-        SpriteRequirement(EnemySprite.TalkingTree).affix().sub_group(0, 0x15),
+        SpriteRequirement(EnemySprite.TalkingTree).affix().sub_group(3, [0x15, 0x1B]),
         SpriteRequirement(EnemySprite.HardhatBeetle).sub_group(1, 0x1e),
         SpriteRequirement(EnemySprite.Deadrock).sub_group(3, 0x10).exclude({0x7f, 0x10c}),
         SpriteRequirement(EnemySprite.DarkWorldHintNpc).affix(),   # no groups?
@@ -700,6 +700,8 @@ def setup_required_overworld_groups(sheets):
         [None, 73, 19, None],  # allow for green knife guard
         [22, None, 23, None],  # increase odds for snapdragon
         [70, 73, None, None],  # guards group (ballnchain, redbush, redjav, cannon, bomb, bluesain
+        [None, None, None, 0x15],  # an option for talking trees
+        [None, None, None, 0x1B],  # an option for talking trees
     ]
 
     for group in free_sheet_reqs:
diff --git a/source/enemizer/enemy_deny.yaml b/source/enemizer/enemy_deny.yaml
index 13bf6763..7e07e370 100644
--- a/source/enemizer/enemy_deny.yaml
+++ b/source/enemizer/enemy_deny.yaml
@@ -126,6 +126,7 @@ UwGeneralDeny:
   - [ 0x005f, 1, [ "RollerVerticalDown", "RollerHorizontalRight" ] ]  #"Ice Palace - Bari University - Blue Bari 2"
   - [ 0x0060, 0, [ "RollerVerticalUp", "RollerHorizontalLeft", "AntiFairyCircle", "BigSpike", "Bumper" ] ]  #"Hyrule Castle - West - Blue Guard"
   - [ 0x0062, 0, [ "RollerVerticalUp", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Hyrule Castle - East - Blue Guard"
+  - [ 0x0064, 2, [ "Bumper" , "Beamos" ] ]  #"Thieves' Town - Attic Hall Left - Keese 2"
   - [ 0x0064, 4, [ "RollerHorizontalLeft", "RollerHorizontalRight" ] ]  #"Thieves' Town - Attic Hall Left - Rat 1"
   - [ 0x0065, 0, [ "RollerVerticalUp", "Beamos", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Thieves' Town - Attic Window - Rat 1"
   - [ 0x0065, 1, [ "RollerHorizontalLeft", "RollerHorizontalRight" ] ]  #"Thieves' Town - Attic Window - Rat 2"
@@ -224,6 +225,7 @@ UwGeneralDeny:
   - [ 0x009e, 3, [ "RollerVerticalUp", "RollerVerticalDown", "RollerHorizontalLeft", "RollerHorizontalRight", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Ice Palace - Fairy Drop - blue - Red Bari 3"
   - [ 0x00a0, 1, [ "RollerHorizontalLeft", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Misery Mire - Boss Antechamber - Antifairy"
   - [ 0x00a1, 2, [ "Statue", "RollerHorizontalRight", "Beamos", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Misery Mire - Fish Room  - Spark (Clockwise) 2"
+  - [ 0x00a5, 2, [ "BigSpike" ] ]  #"GT Wizzrobes 1 - Wizzrobe 3"
   - [ 0x00a5, 10, [ "RollerHorizontalLeft", "RollerHorizontalRight", "AntiFairyCircle", "BigSpike", "Bumper" ] ]  #"Ganon's Tower - Laser Bridge - Red Spear Guard"
   - [ 0x00a8, 1, [ "RollerVerticalUp", "RollerHorizontalLeft" ] ]  #"Eastern Palace - West Wing - Top - Stalfos 2"
   - [ 0x00a8, 3, [ "RollerVerticalDown", "RollerHorizontalLeft" ] ]  #"Eastern Palace - West Wing - Top - Stalfos 4"
@@ -309,6 +311,7 @@ UwGeneralDeny:
   - [ 0x00f1, 4, [ "RollerVerticalUp", "RollerVerticalDown", "RollerHorizontalLeft", "RollerHorizontalRight" ] ]  #"Old Man Maze - Keese 5"
   - [ 0x00f1, 5, [ "RollerVerticalUp", "RollerVerticalDown", "RollerHorizontalLeft", "RollerHorizontalRight" ] ]  #"Old Man Maze - Keese 6"
 OwGeneralDeny:
+  - [0x1e, 3, ["Beamos"]]  # forbid a beamos here
   - [0x5e, 4, ["RollerVerticalUp", "Gibo"]]  # forbid that one roller for kiki pod, and the kiki eating Gibo
   - [0x5e, 5, ["Gibo"]]  # kiki eating Gibo
 UwEnemyDrop:
@@ -360,7 +363,7 @@ UwEnemyDrop:
                  "BombGuard", "GreenKnifeGuard"]]
   - [0x00c6, 5, ["HardhatBeetle", "Wizzrobe", "MiniHelmasaur", "BlueGuard", "GreenGuard", "RedSpearGuard",
                  "BluesainBolt", "UsainBolt", "BlueArcher", "GreenBushGuard", "RedJavelinGuard", "RedBushGuard",
-                 "BombGuard", "GreenKnifeGuard"]]
+                 "BombGuard", "GreenKnifeGuard", "Bumper"]]
   - [0x00c6, 6, ["HardhatBeetle", "Wizzrobe", "MiniHelmasaur", "BlueGuard", "GreenGuard", "RedSpearGuard",
                  "BluesainBolt", "UsainBolt", "BlueArcher", "GreenBushGuard", "RedJavelinGuard", "RedBushGuard",
                  "BombGuard", "GreenKnifeGuard"]]
diff --git a/source/rom/DataTables.py b/source/rom/DataTables.py
index 8cfb3c32..41b1f7ec 100644
--- a/source/rom/DataTables.py
+++ b/source/rom/DataTables.py
@@ -57,7 +57,6 @@ class DataTables:
             choice = SheetChoice(tuple(item['slots']), item['assignments'], item['weight'])
             self.sheet_choices.append(choice)
 
-
     def write_to_rom(self, rom, colorize_pots=False, increase_bush_sprite_chance=False):
         if self.pot_secret_table.size() > 0x11c0:
             raise Exception('Pot table is too big for current area')
@@ -175,3 +174,13 @@ def init_data_tables(world, player):
     data_tables.enemy_damage = {k: list(v) for k, v in world.damage_table[player].enemy_damage.items()}
     # todo: more denials based on enemy drops
     return data_tables
+
+
+def get_uw_enemy_table():
+    init_vanilla_sprites()
+    uw_table = EnemyTable()
+    for room, sprite_list in vanilla_sprites.items():
+        for sprite in sprite_list:
+            uw_table.room_map[room].append(sprite.copy())
+    return uw_table
+
diff --git a/source/tools/MysteryUtils.py b/source/tools/MysteryUtils.py
index 6229fac1..c7df3bdf 100644
--- a/source/tools/MysteryUtils.py
+++ b/source/tools/MysteryUtils.py
@@ -109,7 +109,7 @@ def roll_settings(weights):
     ret.standardize_palettes = (get_choice('standardize_palettes') if 'standardize_palettes' in weights
                                 else 'standardize')
 
-    goal = get_choice('goals')
+    goal = get_choice_default('goals', default='ganon')
     if goal is not None:
         ret.goal = {'ganon': 'ganon',
                     'fast_ganon': 'crystals',