From 07e06add110f597cbe71001ee6c9cd2a49650885 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Wed, 11 Oct 2023 12:26:54 -0600
Subject: [PATCH] Fix for bonk torches counting issue Hera basement issue fixed
 by banning wallmasters Known Statue+Pull Switch interactions banned Making
 sprite spammers count for more on tile to increase chance of pots being
 available to pick up. More enemy bans

---
 RELEASENOTES.md                 |   6 +++
 Rom.py                          |   2 +-
 data/base2current.bps           | Bin 117471 -> 117459 bytes
 source/dungeon/EnemyList.py     |   2 +-
 source/enemizer/Enemizer.py     |  18 ++++++-
 source/enemizer/enemy_deny.yaml |  93 ++++++++++++++++++++++++--------
 test/customizer/test.yaml       |  20 +++----
 7 files changed, 106 insertions(+), 35 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b38e23e8..c875b8ab 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -141,6 +141,12 @@ These are now independent of retro mode and have three options: None, Random, an
 
 # Bug Fixes and Notes
 
+* 1.3.0.5v
+  * Hud/Map Counter: Collecting a keys for this dungeon of a bonk torch no longer increments the counter twice and immediately updates the hud.  
+  * Enemizer: Hera basement item counting twice fixed by banning wallmasters on the tile.
+  * Enemizer: Statues banned offscreen for pull switches 
+  * Enemizer: Several sprite producing enemies have been limited on crowded tiles. Offenders: Hinox, Sluggula, Bomb Guard, Beamos, Gibo, Wall Cannons, Probe using Guards. Others do not spam as many projectiles.
+  * Enemizer: More enemy bans (mostly Wizzrobes near walls where they won't spawn, couple missed firebar spots)
 * 1.3.0.4v
   * Enemizer: The bunny beam near Lanmo 2 and the 4 fairies near Ice Armos are not shuffled anymore. This is due to how bosses shuffle works and since it cannot be guaranteed to work within the current system, they are vanilla. (Vitreous still overwrites the fairies and Arrghus only lets two spawn, etc.)
   * Dropshuffle: Pokey 1 has been fixed to drop his item
diff --git a/Rom.py b/Rom.py
index 42d39e04..4995784b 100644
--- a/Rom.py
+++ b/Rom.py
@@ -40,7 +40,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '4935e770465a9fa00a1d642a657e43a8'
+RANDOMIZERBASEHASH = 'cafcf71aefe71fc6cd8ab8fef06794b0'
 
 
 class JsonRom(object):
diff --git a/data/base2current.bps b/data/base2current.bps
index e6b5fa48e063f14271fe6b1263392af539b1f791..85192376666d8b24ca2f6eb414aeeaa2fdf02123 100644
GIT binary patch
delta 5193
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
WI;pwvEZQX!+&lI^-ETFocl;k6cl5{r

delta 5167
zcmW+)c|a3a6VKa(5F$rVlpDix-*}-SC?X&#SUlQVM8!%g8t=294R50XqQ(TKVZ{hp
z0|)^zfhfU>MXj{bmNs7fEFM*?RZ^>|O0BeC`PT1`-QT>Kd2i>vH*aR%Ue`GOtZ_7T
zA#@tfqi8hOY(wJ^@9~FTHNfKzqUZ38J4v{=ov8|0SEnR5KooD1%X@8%$rn!$;|hwr
z1`=KxvVe)#9MEN9oUw{ikyWZVf07Bt6jfhAW(?|W&RD@|g-;xIp<m#+!wPg6viS>%
zvDcu6pG|PDz*GJ;bRD`KH=;p^5lkQDaf7k)ZE2Ju<c4{x;7f$g!xZ6UbkV$C_#r}1
zp>I^R|KqESxRlb0v6eq5!gXH>Fs04H6fVFO<hQWTd5Yf|oZKc``7bW`7srj@8d%i!
zqym#`IvILTFkE*wiiXZGPvzw9k(rnyQ_9EzsC233)w3UkiLOi0Q7Chb4V?TnbD@G<
zaHP@ZcTqzwF0Z%QmdYx~*H;-^ro4i5yaqqIc5&C195rj)Zt;=8ylLE8gf5wX^vp)C
z9SZ{QSNQiZ*yVzD)h>wl&gWC|%7qUppuLxKrQ`3zEAN#^4NH8|kRFcsEM)1&KG|qB
zO!1BJIM>4*(U9?K#u`X3+uwEY=PQbHu*)~j@n$n)Qj*`pN#7{XXJ+OkRo1D{UuL{0
z3)w|2)yWve26*QCn(*&|$9@T@#vI^p=AuHlCT>Qg`P0CDgyzGtpe^XGxi{z_@_E+I
z{6dum<5qG{d52AnB;;r19ZgD-FvF&hHSVI*jLi>I%6N)W7VN7a=fFTnB-#xwp<47i
z7(yG-Iam~yI6kqD!94Q2KIREUSvBO0Qbx`7!b;Lj)p$&qCx_;+vr&&vF;^%>SA&Ag
z8`NX&g8$Ym!__1<GIpLVhoTfsl!BG-Wqa+1!{Pf-0gR4_a}4cd?$mhpKxV{rR0gsL
zaFUrBTMoO^oe&UtSWxsG6HRHzZa5uz-J3Oobn0c))vP5X{Vg-Cj4CbMUrpu$6BR6)
zd5Yb*LsV%wRVu~?awpt~nlRe$t>yHD+er%AHGsNYL+%C7=**I<Uotk^No_;`r6fIj
zm?s+Y4-;ckAF0TD@m0MoO{VbrPJcs5Cbcss(p*@bOZW9(`PM7Rf(QCr|5+MKdDT>t
z{%!0SYLjAviAlq)+F!>GlP+zH+QDYyQB;{2Ye-!igGYbO-9jg^Lj<=oezFP~8Pmor
z<+1bAnFpd5BGd&FVvnQaa6PsQ+05#=6$E-0o=r$V$q+K}H3|a%Nx>-FoH}VK*Y)Xl
z%(;-A@+4GtTt+@O*C(h2(S}ZK_FCnkYEhWl(cl)Ag%zax_uWZuRHvMb{@O=)=oY2)
zV445)Y4wml%L_%Ci)Q6;{j1J0Pbn;79lrWzz0E{nXVylRnZs^S75thy4^=_@oG5g{
zoHyq(LTM0~J_bo)N_t?h@(N>PDD5#yn};9d`FzdT4$N;J5R-@4lVh_LWEW(RLr|Qq
zM}21hjGpkRp_iHbMxQwc(=eoMyg7M4RdWOu`Ss*usx$>F3R)SDGKK49hO>{VnT9J$
zNsm8k1f`06@ZNkEC7WMwjzl6|OPzB`jqZc>3{2l~P;u5gVQUC-b8cmhE(p1+V6mfA
z;S3*bdx@sQ2ivC;PQCEi_Gu^r`nE?A#Az7b{x3QKZ+0wlilD>ZXVUg7BFsy6vdcfk
ztl#w<p%|$AWDlAEu0=1=1t5x>(7(`9?2SawQyh*&=4ZuR<j0;`dX!h)F{)NAC)3T*
zn`)m>auX%*f<zCq%ii0gkkUL@mPeq;=8OaF9*!S2smc}Nc`#C&IG?4DK!O8q6YptK
z`{gphWXwZ-u|73zUuDT+s#-~ou`rTc*j_;uLjpW#V0yP(`Nn+8gq?d2vD9joA`HR#
z+9QB<|A<dDGd(;t_X!^AHa0U=h3gOgaX=_+?lv_u$|pJ9?Qo2l$cDKenB=)tO{y~o
z*I>o-BTcFg@%gX#c5aqeb4$1ciN#Z&e?`Chh(b_J<<l~XphKU)1RI5DWiKJgY&g)%
zwL6F}He;^%G%PtD<G8woQIq03P<A{vbF>qN^k+&ncNzw?U$yel@rp_b$!eG!tJZi?
zs*R&?buc!mw!M_rW%yu?F@$Yw*UIH~p??0-yOg`CTy7WWJmJ5`7qjk_qo0K~fLb3i
z@iPn4dYSh_AU4^x?la|Wy^eNY@&vm)hDq`(bW)#Ulrf4HJMOPGI7;5~b&2p;AAk-3
zzb?ZyIS5mBSjh$egBy7Oa_d6TJ)r7BP!TlNk$&sLUe{Jql1ittwoD_5O;#THZ!2RA
zf`N(vcvLqFjfar>c=w4R^1A7h%az>)M&@y;vgBj<xV|7r8vRhok@O$b1r4<+ZxPLg
z2!>DcY80lUq28s2ns`F|27a$!k+7m&{bym`v+A<`+yX8=5BKqlhr3ofOT?^TsCbwW
zOZpjPl!jr&K>V<Fc^Ix%zY>=LZU_iuHC$VrdGSsVAC6Ts!f~6I<otZ+-UzGX+ujfl
z-3`HhYxDlO+1+(ZAGht5)Xp0adr1ZYC8wNum&Cd)Fw!t>+M=*~wVX*<DHmc_<LKyn
z4RYatxOiC7-+D_syYaA~v~Q3nCk$da?=7#Nu#Z&`cK5nnu=&JX!Z8p!Ps9jA&AmJ|
zN|cC0;rWU2C?4DzV~`spHwK}Fu)5I~t%6S*!_X(t(D=T`o^H*62uB)2>CDCoV<a{;
z)rEkl$s5H&WYZ+H305|xdh9yG^l`b?B&~16>x#(+L1qj6F`RD7b(k|6tG2-yLoDGq
z7v>nEmaa_26{1UGW0I;;^O$SrsgfXMI@ZQc$2|*PNqto8ixhM)64mCH(td3LrZ%f&
z2b-!%J21J77o=Ni$WMlq&$t1@4}C1k24DNcI$yYG2nzkCqZp%bR`6C%Z?LEs7~_O%
z#NTv;4@)xpVfGnnCaecxb5wAH>i#RK>cK1NaG`Gc*)PrKdxNd~+$L7FSdvMOeWcep
zpN4tOaYT|FikpK8-!fpD6CJoSFyz9|&B56-$_CxoIc#7JW@o^{fY`X{rBsq>5GZ{K
zZS=nCZ(d66PR2x)Gd`2}N?MpD=*Tp1R8w+F=uMcO>hx2Mi*d%=>CT|HK~78LSV0H9
zC>dA9EofEk&A<@mj={&(tZES<WCrG>S4dn62P@j;L=cXi&0&vRRZdA_qDrYT=;R!O
zYz8K<BC8JWp7aqorE~BCnQJ<XoD?G?h+CKO>=(1lu(vfK!27cbjwx|Kyb2eq4FlrV
z;{m-K>omjAJNUhQt#x2+{gp_+37x0LqxEp>RG9bCF}qJH*jh-Na?fCLFenj@Gah~^
zg?GT)7%^^f&&AAEg6MU#I~3-556FXG<-CTiu*?`3RB(ZE(aC6stU>n7=HlwNVhJ-=
zpTzq^fvy~(R~8SzQDZ*Z1AiM8v9~TW*n?frz2^CDHpSp&=JO4yl~gXh%Gvgxbuvr1
zo2|m5@VCNTdUK|{aV4~yf`ubrNqPy6b+&i}?wh>W81Tjvj<x{VHphL<#6LBe&D|+7
z6CLwr9fhvI?zUX#Lf0c2)%uIl?hh@6aJMamjiCYUVT6-6%xz!pDDZqkdD2V3(7vN&
ze6OT|BVPWEq&wwHDcSO`O!tvb6D$iG(yk60f_xU&u~^9BRu;FgSj6HdETZrs;Dirp
zomdpG=+2^uMQ;|pSPW!Q96nT4vb?88#0Kl}y+%8|7Hd@Y9;xw#)|IMw(IbUp<_feN
zVo%4rE(#k`9>MDyDmhpe8U-6p=L$<wA1L!q4wq?j!FoD-sdw_w(N#{G114SbsXF<w
zzLwfk#~>qls4gaX$S7kOM?aSjh_&&FL-NsQD)+T)jHERA4V*?!w>dbLl3$9i9fPU9
z+Ip%_H)ZA!otHdRI}>)C`Pgyi7nC=hrho@$qFokR8MV+VFdhq#{*VPe9T6pC#^H;~
zV*#zT0rN&i)^Rw>+5iKBEfTE63BAN`8i*;8H|Q_L=Nl_2Q^bgN&%_rs(wq`j|A*9;
z=!tKxrm#cCwW<SrdW9Udu(dM4M_Cy_XJb{K?9sI6tdt$ySQ{XHp30K70l4dJ*Nm1K
z6qN?y6kO`?=Fe}5kx`lOpd$}$g_#y>z{2k(#_w`UtRhteX0x2tmDa-aI7+dRb=b+-
z5Z!qjeE@>9F%AXjFM1~=o=qoWOMp6iFr!F_Ct%Xr$&iU<)Fsggru)rJW<W$9E5q|{
zF!OIPKiyyoZ!)iMGJoA<B*xj;1QVv<noIHeJa2<lP~}F*zD`Yr#h+(Pnz~{5?}QD*
zlyDT5X?Mu3@03*~q&)J)p5p4oc**w1l*3C&&b36$7vVX0+^(nH-mdWN=RRz4^Xumk
z>|1m$lIJ;#S`RbN?L=eX^tm-i0$yDS#MJTToGwp9<dEid=Wn{8M)Rz1KjZu5C3d%`
z+^F1IplKM(AvuAZG|ocKr5yztcxR>g`PFVTDst}KFC0d9jKLWa^V#cu0@MjV-VP(y
zhQP?}U}97(gxs0w|LiQ2X*_a4YUdVWexdkp>p*<VaO)t^izM1;z;{-lJh*pf6_LIW
zX5D>TJbiFCDkyzw*~JvQmyx1O*3rh@Y{(NBcrd<GDKc<zm7nm5_FZVa`_Lh1TN&*O
zs(Vjd-9IU-xo`aRB^&uZZAk(7&l2MO-SFb)7-CwHIq?2W0_8ydKpcCcRSzsc!huf4
zfRuv-`KkHQ!yPEBYER5j)yn$TunSTHhfqabkQz5bP;;x5e?Fdw7~wF%oPKSp74|=h
zWYfLzk&PR(Y`^)~uXhk4q3DU<SpPI!;n~1A9H%{4s+X${nnt@p^OG}U#{`ut4N|!a
zWFM^F{B|X*<LJ$>WAFoapShTdr#*}n{cN^bMW?(E_XZ_wDLLO}6FN*Qr${>0qFM(t
ze+!S@KDnF<0T~sdlBqWBqYL87sZe@F7Zs}GoQJtn*cK}cRml{gucUM|eD>Q4hwP+s
zmB0DV-+~b80H5DuqBgZy7DV6{k4B~Hqnr{D4^YEesj=ssmr^VLfRBpBLJ6DKt<g{f
z+kS5t9Xt!uSvI+S+%<7}BPG$Lu7ikY>2B{&Ew71Z4d!P3JqRH!@aeN46k$I8tkZp5
zWGBN4!gS&D4nI6lvxzdvvxf8LX*Q$Bql#9SDSxP<OmyBBdNo3K1gU#}1j!?<za^bO
zJ&0JcjCSTBlGqz-iRYmM2o=%i98ev~p;z%y7!uHBd=wlIma05UCd(P};C?2&P(p5?
z811G56(YHxB(rV}-OEQyiLC@Z-Vw#Q%wB}$+g{N{3;z6XUIM+`5sgQA^d3jF-e-Mi
zIm{TVpai<fISO3@v0p<b?q`f;+O_nEBbuJp*vhb(y()Q8&G}>nmXHpeOkU1ahGZXD
z9glx^FnGw_B@Lq9(bk~?cgg={Zmdykbs>OlPboEcy+iL6pcwJT-et%6rx>@|6hd;4
z=7yAOjJli>yNFI{o`=~>B;6}O6P#nx@2sE%4RLlJDY5XK&@6=9=nNrBM?%XXAsWr)
zyH8f?@+Vp9U63C)VBW4ncUK7p;`?*SwH@`v!{MxdS{E8N`6~~Pq5UlPL@0=dezFi_
zkqc20^`2604IPK4xbzX_e!FXRvomccwq_}m1VKcE$_3d9df9AS<Hp=UMK^w-4W9Ry
ziu`*<mKvgp9zwj}FG`|clyOWOHJhRgu&R`rQ|IbQDG2P@zld8^Ctj(naWIy>kV*_<
ztz?C=HN9VOa6wDMfru3QRNCd26_&%EC=E^EEIC~LK>vq+SbzIVU7KBh?#h+D9L^UU
z&Xp^=QJa-#y|nrNZ(xU!5&d6!9bw^mqaU4ox35uN<#G&@Iclz9G@<%phBV&|yAkbC
zbhPCaiLM~Wje&=$SK0u}m%*rIl-SL)OzFU}JLx!%Wk2x;#I;tJ`~h);yVcK7#UOI3
z<#0Uu9l0cLE3LM^Dl{bHaJFmtL?l9l#|_KTNoXGHiA(86lTiwh`<^9i3VJgNxzmBO
zkw02xnKc^)x}iYJ>KwEX@m<8#TF3Y3GmB6QO0uk8jA{tcRG*^_CKFHZgbBUy04=n*
zzKgCQ6h=RI4+Rk+g%<w%hz&*gmh=x$AaV&DTdi?w5cY~VbYe2SJr`{v-kDE7%tax@
zyeNxsIf`)<Mxxgpg?^`k@E*(T579?lV(L`7=_3?N6vSF?eT3K_U`h0hwJ3Vbg$|}r
zvY*qP?<iHNzL(GHr;9AbYf&b0<}OxgNcVee)-<oRd|!x?y!bI8=V8)ni-<yV-T2$4
zJ)rZ`EGyKgKiWS(?a@y^2&e=rVc2&`EEG!Qh~aPyPI5w`-C<dJ9_@A!<Zy0lc=VB9
F{s-AN;SvA<

diff --git a/source/dungeon/EnemyList.py b/source/dungeon/EnemyList.py
index 7735c635..d69a0a88 100644
--- a/source/dungeon/EnemyList.py
+++ b/source/dungeon/EnemyList.py
@@ -181,7 +181,7 @@ class EnemySprite(FastEnum):
     Gibdo = 0x8b
     Arrghus = 0x8c
     Arrghi = 0x8d
-    Terrorpin = 0x8e 
+    Terrorpin = 0x8e
     Blob = 0x8f    
     Wallmaster = 0x90
     StalfosKnight = 0x91
diff --git a/source/enemizer/Enemizer.py b/source/enemizer/Enemizer.py
index 539591d1..411011a8 100644
--- a/source/enemizer/Enemizer.py
+++ b/source/enemizer/Enemizer.py
@@ -268,6 +268,21 @@ def get_randomize_able_sprites_ow(area_id, data_tables):
 sprite_limiter = {
     EnemySprite.Debirando: 2,
     EnemySprite.DebirandoPit: 2,
+    EnemySprite.Hinox: 2,
+    EnemySprite.Sluggula: 2,
+    EnemySprite.BombGuard: 2,
+    EnemySprite.Beamos: 2,
+    EnemySprite.Gibo: 2,
+    # EnemySprite.CannonTrooper: 2, ??
+    EnemySprite.WallCannonHorzTop: 2,
+    EnemySprite.WallCannonHorzBottom: 2,
+    EnemySprite.WallCannonVertLeft: 2,
+    EnemySprite.WallCannonVertRight: 2,
+    EnemySprite.BlueArcher: 2,
+    EnemySprite.BlueGuard: 2,
+    EnemySprite.GreenGuard: 2,
+    EnemySprite.RedSpearGuard: 2,
+    EnemySprite.RedJavelinGuard: 2,
     EnemySprite.AntiFairyCircle: 4
 }
 
@@ -300,7 +315,8 @@ def randomize_underworld_rooms(data_tables, world, player, custom_uw):
                 data_tables.room_headers[room_id].sprite_sheet = chosen_sheet.id - 0x40
                 candidate_sprites = get_possible_enemy_sprites(room_id, chosen_sheet, uw_candidates, data_tables)
                 randomized = True
-                wallmaster_chosen = room_id in {0x0039, 0x0049, 0x0056, 0x0057, 0x0068, 0x008d}
+                # wallmaster in hera basement throws off hera basement key code
+                wallmaster_chosen = room_id in {0x0039, 0x0049, 0x0056, 0x0057, 0x0068, 0x0087, 0x008d}
                 for i, sprite in randomizeable_sprites.items():
                     if room_id in custom_uw and i in custom_uw[room_id]:
                         sprite.kind = sprite_translation[custom_uw[room_id][i]]
diff --git a/source/enemizer/enemy_deny.yaml b/source/enemizer/enemy_deny.yaml
index 0af02b7c..b0b1854b 100644
--- a/source/enemizer/enemy_deny.yaml
+++ b/source/enemizer/enemy_deny.yaml
@@ -1,10 +1,16 @@
 UwGeneralDeny:
-  - [ 0x0002, 0, [ "RollerVerticalDown" ] ]  #"Sewers - Rat Pots - Rat 1"
-  - [ 0x0002, 1, [ "RollerVerticalDown" ] ]  #"Sewers - Rat Pots - Rat 2"
-  - [ 0x0002, 2, [ "RollerVerticalUp" ] ]  #"Sewers - Rat Pots - Rat 3"
-  - [ 0x0002, 3, [ "RollerVerticalUp" ] ]  #"Sewers - Rat Pots - Rat 4"
+  - [ 0x0002, 0, [ "RollerVerticalDown", "Statue" ] ]  #"Sewers - Rat Pots - Rat 1"
+  - [ 0x0002, 1, [ "RollerVerticalDown", "Statue" ] ]  #"Sewers - Rat Pots - Rat 2"
+  - [ 0x0002, 2, [ "RollerVerticalUp", "Statue" ] ]  #"Sewers - Rat Pots - Rat 3"
+  - [ 0x0002, 3, [ "RollerVerticalUp", "Statue" ] ]  #"Sewers - Rat Pots - Rat 4"
+  - [ 0x0002, 4, [ "Statue" ] ]  #"Sewers - Rat Pots - Rat 5"
   - [ 0x0002, 15, [ "RollerVerticalDown", "RollerVerticalUp", "RollerHorizontalRight", "RollerHorizontalLeft" ] ]  #"Sewers - Rat Pots - Rat 6"
   - [ 0x0002, 16, [ "RollerVerticalDown", "RollerVerticalUp", "RollerHorizontalRight", "RollerHorizontalLeft" ] ]  #"Sewers - Rat Pots - Rat 7"
+  - [ 0x0004, 1, ["Statue"]]
+  - [ 0x0004, 2, ["Statue"]]
+  - [ 0x0004, 3, ["Statue"]]
+  - [ 0x0004, 4, ["Statue"]]
+  - [ 0x0004, 15, ["Statue"]]
   - [ 0x000a, 0, [ "RollerVerticalDown", "RollerVerticalUp" ] ]  #"Palace of Darkness - Basement Ledge - Terrorpin 1"
   - [ 0x000a, 1, [ "RollerHorizontalRight", "RollerHorizontalLeft" ] ]  #"Palace of Darkness - Basement Ledge - Terrorpin 2"
   - [ 0x000b, 1, [ "RollerVerticalDown", "RollerHorizontalRight", "Beamos", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Palace of Darkness - Callback - Terrorpin 1"
@@ -73,9 +79,9 @@ UwGeneralDeny:
   - [ 0x003d, 10, [ "RollerVerticalUp", "RollerVerticalDown", "RollerHorizontalLeft", "RollerHorizontalRight", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Ganon's Tower - Torches 2 - Spark (Clockwise) 1"
   - [ 0x003d, 12, [ "AntiFairyCircle", "Bumper" ] ]  #"Ganon's Tower - Torches 2 - Bunny Beam"
   - [ 0x003d, 13, [ "AntiFairyCircle", "Bumper" ] ] #"Ganon's Tower - Torches 2 - Antifairy"
-  - [ 0x003f, 1, [ "RollerHorizontalLeft", "RollerHorizontalRight", "AntiFairyCircle", "BigSpike", "FirebarCW", "FirebarCCW", "SpikeBlock", "Bumper" ] ]  #"Ice Palace - P Room - Stalfos Knight 1"
-  - [ 0x003f, 3, [ "RollerVerticalUp", "RollerVerticalDown", "RollerHorizontalLeft", "RollerHorizontalRight", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Ice Palace - P Room - Stalfos Knight 2"
-  - [ 0x003f, 4, [ "Wizzrobe" ] ]  # Wizzrobes can't spawn on pots
+  - [ 0x003f, 1, [ "RollerHorizontalLeft", "RollerHorizontalRight", "AntiFairyCircle", "BigSpike", "FirebarCW", "FirebarCCW", "SpikeBlock", "Bumper", "Statue"] ]  #"Ice Palace - P Room - Stalfos Knight 1"
+  - [ 0x003f, 3, [ "RollerVerticalUp", "RollerVerticalDown", "RollerHorizontalLeft", "RollerHorizontalRight", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper", "Statue"] ]  #"Ice Palace - P Room - Stalfos Knight 2"
+  - [ 0x003f, 4, [ "Wizzrobe", "Statue"] ]  # Wizzrobes can't spawn on pots
   - [ 0x0040, 0, [ "RollerVerticalUp", "RollerVerticalDown", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  # Agahnims Tower - Bridge - Blue Guard 1
   - [ 0x0040, 1, [ "Statue", "RollerVerticalUp", "RollerVerticalDown", "Beamos", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  # Agahnims Tower - Bridge - Blue Guard 2
   - [ 0x0041, 0, [ "RollerHorizontalLeft" ] ]  #"Sewers - Dark Cactus - Rat 1"
@@ -124,6 +130,14 @@ UwGeneralDeny:
   - [ 0x0057, 12, [ "RollerVerticalUp", "RollerVerticalDown", "Beamos", "AntiFairyCircle", "Bumper", "BigSpike", "SpikeBlock"]]  #"Skull Woods - Big Key Room - Gibdo 6"
   - [ 0x0057, 13, [ "RollerVerticalDown", "Beamos", "AntiFairyCircle", "Bumper" ] ]  #"Skull Woods - Big Key Room - Blue Bari 1"
   - [ 0x0057, 14, [ "RollerVerticalDown", "Beamos", "AntiFairyCircle", "Bumper" ] ]  #"Skull Woods - Big Key Room - Blue Bari 2"
+  - [ 0x0058, 0, ["Statue"]]
+  - [ 0x0058, 1, ["Statue"]]
+  - [ 0x0058, 2, ["Statue"]]
+  - [ 0x0058, 3, ["Statue"]]
+  - [ 0x0058, 4, ["Statue"]]
+  - [ 0x0058, 6, ["Statue"]]
+  - [ 0x0058, 7, ["Statue"]]
+  - [ 0x0058, 8, ["Statue"]]
   - [ 0x0058, 7, [ "RollerHorizontalLeft" ] ]  #"Skull Woods - Lever Room - Hardhat Beetle 2"
   - [ 0x0059, 0, [ "RollerVerticalUp", "RollerVerticalDown", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Skull Woods - Bridge Room - Mini Moldorm 1"
   - [ 0x0059, 1, [ "RollerVerticalUp", "RollerVerticalDown", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Skull Woods - Bridge Room - Mini Moldorm 2"
@@ -466,21 +480,37 @@ UwEnemyDrop:
   - [0x00c6, 6, ["HardhatBeetle", "Wizzrobe", "MiniHelmasaur", "BlueGuard", "GreenGuard", "RedSpearGuard",
                  "BluesainBolt", "UsainBolt", "BlueArcher", "GreenBushGuard", "RedJavelinGuard", "RedBushGuard",
                  "BombGuard", "GreenKnifeGuard", "Stal", "GreenMimic", "RedMimic", "StalfosKnight", "Geldman", "Blob"]]
-  - [0x00e6, 6, ["HardhatBeetle", "Wizzrobe", "MiniHelmasaur", "BlueGuard", "GreenGuard", "RedSpearGuard",
+  - [0x00e6, 0, ["HardhatBeetle", "Wizzrobe", "MiniHelmasaur", "BlueGuard", "GreenGuard", "RedSpearGuard",
                  "BluesainBolt", "UsainBolt", "BlueArcher", "GreenBushGuard", "RedJavelinGuard", "RedBushGuard",
                  "BombGuard", "GreenKnifeGuard", "Stal", "GreenMimic", "RedMimic", "StalfosKnight", "Geldman", "Blob"]]
   # wizzrobe despawn issues - on pots/blocks - too close to some object
+  - [0x0013, 3, ["Wizzrobe"]]
   - [0x0016, 0, ["Wizzrobe"]]
   - [0x0016, 1, ["Wizzrobe"]]
   - [0x0016, 2, ["Wizzrobe"]]
   - [0x0016, 3, ["Wizzrobe"]]
+  - [0x0017, 5, ["Wizzrobe", "Stal"]]
   - [0x0019, 2, ["Wizzrobe"]]
   - [0x0019, 3, ["Wizzrobe"]]
+  - [0x001e, 1, ["Wizzrobe"]]
+  - [0x001e, 2, ["Wizzrobe"]]
+  - [0x0027, 5, ["Wizzrobe"]]
+  - [0x0027, 6, ["Wizzrobe"]]
   - [0x002a, 3, ["Wizzrobe"]]
   - [0x002a, 7, ["Wizzrobe"]]
+  - [0x002e, 4, ["Wizzrobe"]]
   - [0x0035, 5, ["Wizzrobe"]]
   - [0x0036, 8, ["Wizzrobe"]]
+  - [0x003b, 0, ["Wizzrobe"]]
+  - [0x003b, 2, ["Wizzrobe"]]
+  - [0x003b, 4, ["Wizzrobe"]]
+  - [0x003b, 6, ["Wizzrobe"]]
   - [0x003c, 1, ["Wizzrobe"]]
+  - [0x003d, 9, ["Wizzrobe"]]
+  - [0x003d, 10, ["Wizzrobe"]]
+  - [0x003d, 11, ["Wizzrobe"]]
+  - [0x003d, 12, ["Wizzrobe"]]
+  - [0x003d, 13, ["Wizzrobe"]]
   - [0x004b, 2, ["Wizzrobe"]]
   - [0x004b, 6, ["Wizzrobe"]]
   - [0x004b, 7, ["Wizzrobe"]]
@@ -488,6 +518,7 @@ UwEnemyDrop:
   - [0x0054, 3, ["Wizzrobe", "Stal"]]
   - [0x0055, 2, ["Wizzrobe"]] # slightly on wall
   - [0x005e, 4, ["Wizzrobe", "Stal"]]
+  - [0x0065, 3, ["Wizzrobe"]]
   - [0x0067, 5, ["Wizzrobe"]]
   - [0x0067, 6, ["Wizzrobe"]]
   - [0x0067, 7, ["Wizzrobe", "Stal"]]
@@ -501,23 +532,29 @@ UwEnemyDrop:
   - [0x008b, 6, ["Wizzrobe", "Stal"]]
   - [0x008b, 7, ["Wizzrobe", "Stal"]]
   - [0x008d, 9, ["Wizzrobe", "Stal"]]
+  - [0x0096, 0, ["Wizzrobe", "Stal"]]
+  - [0x009b, 11, ["Wizzrobe"]]
   - [0x009f, 5, ["Wizzrobe", "Stal"]]
   - [0x00a1, 1, ["Wizzrobe"]]
+  - [0x00aa, 5, ["Wizzrobe"]]
   - [0x00af, 0, ["Wizzrobe", "Stal"]]
+  - [0x00b0, 1, ["Wizzrobe"]]
+  - [0x00b0, 2, ["Wizzrobe"]]
   - [0x00b2, 4, ["Wizzrobe"]]
+  - [0x00b8, 2, ["Wizzrobe"]]
   - [0x00bf, 1, ["Wizzrobe"]]
   - [0x00c1, 3, ["Wizzrobe", "Stal"]]
   - [0x00c2, 0, ["Wizzrobe"]]
   - [0x00c2, 3, ["Wizzrobe"]]
   - [0x00c2, 7, ["Wizzrobe"]]
+  - [0x00ce, 4, ["Wizzrobe", "Leever", "BlueGuard", "GreenGuard", "RedSpearGuard", "BluesainBolt", "UsainBolt",
+                 "BlueArcher", "RedJavelinGuard", "GreenKnifeGuard", "GreenMimic", "RedMimic"]]
   - [0x00ce, 5, ["Wizzrobe", "Leever", "BlueGuard", "GreenGuard", "RedSpearGuard", "BluesainBolt", "UsainBolt",
                  "BlueArcher", "RedJavelinGuard", "GreenKnifeGuard", "GreenMimic", "RedMimic"]]
   - [0x00ce, 6, ["Wizzrobe", "Leever", "BlueGuard", "GreenGuard", "RedSpearGuard", "BluesainBolt", "UsainBolt",
                  "BlueArcher", "RedJavelinGuard", "GreenKnifeGuard", "GreenMimic", "RedMimic"]]
   - [0x00ce, 7, ["Wizzrobe", "Leever", "BlueGuard", "GreenGuard", "RedSpearGuard", "BluesainBolt", "UsainBolt",
                  "BlueArcher", "RedJavelinGuard", "GreenKnifeGuard", "GreenMimic", "RedMimic"]]
-  - [0x00ce, 8, ["Wizzrobe", "Leever", "BlueGuard", "GreenGuard", "RedSpearGuard", "BluesainBolt", "UsainBolt",
-                 "BlueArcher", "RedJavelinGuard", "GreenKnifeGuard", "GreenMimic", "RedMimic"]]
   - [0x00d0, 0, ["Wizzrobe"]]
   - [0x00d0, 2, ["Wizzrobe"]]
   - [0x00d0, 4, ["Wizzrobe"]]
@@ -599,25 +636,35 @@ UwEnemyDrop:
 
   # the following are all slightly in the wall on spawn - not too applicable right now, these don't drop anyway
   - [0x0064, 0, ["Leever"]]
-  - [0x00e5, 4, ["Leever"]]
-  - [0x00e5, 5, ["Leever"]]
+  - [0x00e5, 3, ["Wizzrobe"]]
+  - [0x00e5, 4, ["Leever", "Wizzrobe"]]
+  - [0x00e5, 5, ["Leever", "Wizzrobe"]]
   # the pit one in 0xe6 room is in the pit section
-  - [0x00e6, 1, ["Leever"]]
-  - [0x00e6, 2, ["Leever"]]
-  - [0x00e6, 3, ["Leever"]]
-  - [0x00e6, 4, ["Leever"]]
+  - [0x00e6, 1, ["Leever", "Wizzrobe"]]
+  - [0x00e6, 2, ["Leever", "Wizzrobe"]]
+  - [0x00e6, 3, ["Leever", "Wizzrobe"]]
+  - [0x00e6, 4, ["Leever", "Wizzrobe"]]
+  - [0x00e7, 0, ["Wizzrobe"]]
+  - [0x00e7, 1, ["Wizzrobe"]]
+  - [0x00e7, 2, ["Wizzrobe"]]
   - [0x00e7, 3, ["Leever"]]
-  - [0x00e7, 4, ["Leever"]]
+  - [0x00e7, 4, ["Leever", "Wizzrobe"]]
+  - [0x00e7, 5, ["Leever", "Wizzrobe"]]
+  - [0x00e7, 6, ["Wizzrobe"]]
   - [0x00f0, 2, ["Leever"]]  # clipped away
   - [0x00f0, 3, ["Leever"]]
   - [0x00f0, 4, ["Leever"]]
   - [0x00f0, 5, ["Leever"]]
   - [0x00f0, 6, ["Leever"]]
   - [0x00f0, 8, ["Leever"]]
-  - [0x00f1, 0, ["Leever"]]
-  - [0x00f1, 1, ["Leever"]]
-  - [0x00f1, 6, ["Leever"]]
-  - [0x00f1, 7, ["Leever"]]
-  - [0x00f1, 8, ["Leever"]]
-  - [0x00f1, 9, ["Leever"]]
+  - [0x00f1, 0, ["Leever", "Wizzrobe"]]
+  - [0x00f1, 1, ["Leever", "Wizzrobe"]]
+  - [0x00f1, 2, ["Wizzrobe"]]
+  - [0x00f1, 3, ["Wizzrobe"]]
+  - [0x00f1, 4, ["Wizzrobe"]]
+  - [0x00f1, 5, ["Wizzrobe"]]
+  - [0x00f1, 6, ["Leever", "Wizzrobe"]]
+  - [0x00f1, 7, ["Leever", "Wizzrobe"]]
+  - [0x00f1, 8, ["Leever", "Wizzrobe"]]
+  - [0x00f1, 9, ["Leever", "Wizzrobe"]]
 
diff --git a/test/customizer/test.yaml b/test/customizer/test.yaml
index 7d6381a7..64529753 100644
--- a/test/customizer/test.yaml
+++ b/test/customizer/test.yaml
@@ -1,12 +1,12 @@
 meta:
   players: 1
-  seed: 96
+  seed: 94
 settings:
   1:
 #    mode: standard
 
-    boss_shuffle: random
-    dropshuffle: underworld
+#    boss_shuffle: random
+#    dropshuffle: underworld
     enemy_shuffle: shuffled
     door_shuffle: crossed
     intensity: 3
@@ -15,10 +15,12 @@ settings:
 doors:
   1:
     lobbies:
-      Hyrule Castle South: GT Bob's Room SE
-bosses:
+      Hyrule Castle South: Hyrule Castle Lobby S
+    doors:
+      Hyrule Castle Lobby W: Desert Sandworm Corner E Edge
+placements:
   1:
-    Ganons Tower (bottom): Armos Knights
+    Desert Palace - Torch: Small Key (Escape)
 
 
 #    keyshuffle: wild
@@ -28,9 +30,9 @@ bosses:
 #    'Hera Basement Cage Enemy #9': Small Key (Tower of Hera)
 #    'Hera Basement Cage Enemy #11': Fire Rod
 #    Tower of Hera - Basement Cage: Small Key (Turtle Rock)
-#start_inventory:
-#  1:
-#    - Lamp
+start_inventory:
+  1:
+    - Pegasus Boots
 #    - Progressive Sword
 #    - Ocarina (Activated)
 #    - Hookshot