From ea83df044200d785cb3450bc0a38805e7fe23fb6 Mon Sep 17 00:00:00 2001 From: lil David <1337lilDavid@gmail.com> Date: Fri, 23 Aug 2024 20:09:54 -0500 Subject: [PATCH] Update check names in location groups and enum constants --- data/basepatch.bsdiff | Bin 45665 -> 45657 bytes locations.py | 66 +++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/data/basepatch.bsdiff b/data/basepatch.bsdiff index db3ad35145f9c75a37cb2d76d6bc7677e6e93297..3dbbdc471794980f09b309cb7d36a9f58a948539 100644 GIT binary patch delta 12736 zcmV;xF+a}X%yOeUIb0W`>98VREa(mf_mNvWeWr|6A66GkQycvEQ6Fw{Ir z=+QinRN5z~%@fd>8flst8AC^@qer2X8$mrle;Q=a05pUE0%@QonKWpaA&6l#z2pn%6fxLYHvY6@_-Le^&X>7O-&jy z13&-((?lkOOqeE`1WyU3rqXOv3Vw!Cc$-RW6IA?ak0m_HdYPu0N0fM`6V%yBwkms6 ze|aaV`jgcCQ_-aIP3l8!K$x@8UsdvGzNn} z00002Nf1C2MolzmCJBa<35aQtlSYYvf0>~SgC?dl)bzyCVLbrU+D}tzH9a*vCe%%- z>UwHkCqHr?`z}%u4Oq%mBDr@%{+HIL*q?K*D_+L z8;2}!fERSgv%<E@nJ-bmrA~GYuS*O$9@zsn2@&Jgp}+e z9)VexWwsK5D*W_phEXW>aTS=i8C7`!gc-u&tfjSEv3>Oyr_=&+44_g$Y=P@A>y5xE za3IbZYt6+yHo6|L8RG&p{7yZ7G#m{D7%s@_^y^_b99{&F$_sK!e}OX7a-HyIh2P_7 z0NVP-t?TCHI2XvjeyeFG1^xXX5M^#qN zK(B1O?Ab)Y(||k701}GQfW#+BaLUTpxnJ^@B~K&F!t{Y;f|Izf3vd0+L)KXz7aGY| z1VOmS8&GJ#FwDJof4~wA6pAu*(8fgSq-Ovw(r!^DI<8-AB2q>`|yRz}Vqy zX6o>K-$|?fK6Q*wMXQjeV?mTqh=YO$an%wtl}#6&wwC5tMPkn@&sQ_mgpsoh^dUP; z>P*cd!iPOnz4X|q&hA&Z(B18129K1qCBqg*zfr@#){!OZf42b9*ml8(2x|dC3<^N8 zlmR#)2bi2_GY6Z>v%{8 zVV59-b`B2}e`B$0-;vKub&zp0Y_6XDA5QK_1p$xDsCU`bEQp6@RdDpU1D-rxe6rE- zi&IO-2qaRCTQQxol6%_%l1Hd}e$Ik(;fHceDlWW<=lr;J%;=iLHy zCpPx|{Q02Z`e4~VE5;sHSP96qkl^h&darMrMn)Jzf6S5>yKx9+5=a+>=Q{X0?{^`C zBLzvRv4!T5%s7sc1WAzhr@r)?EUW5L+O>6Uv}`p)n8s(DLekn-$$X)YEm&Z<0IjEX zR`XY08sNbWjCO~(P8Oo--056!;w}CLMJ|l~gD3@sNQ}MjcgT#4e(-^Fbe-ko(?Ef#%JZr%BkcZn0H$qZULX#Tx zMtqJ0#L&qY7?Kzz^{jLm?U%JeIt5ws83UOG{Km@Yi2)rH0%-jp)aYV%XimKX&hS^v zGI>c)j1zL;BqSh82%>qv>snewXhK*tfwYDuOcG<|1FbWcO$SdSX@A+=zsv5+^n`_y ze-j8`K%$gQsF)YxC%@{ zJ1D~07!9o$U{rDPTGa;2x4wB{C=$fa?58{=rpU|(w{Xu@$!|TKOncxqfqtjhGu))+ z6wa(!7;=}DPx6t?93tnPOeq)5RKLsTf0^YYPp78#vO`4UoA!O2$%QQITQH_lrmd10 zg+l|Dat)PnEBo__A8_oXNrOSX?>nr>IOm1(&zx+i8)I%_9-}X6`vf0w*4j)rjwI6S z!{tOoqEw}g^YDRxaf>g7VO?RfDzU9b1q@udcE$d`@cL4|eZLjO-T8TY+Va;ef64>h zgsgV(r>0Bqo%4xu_Sx6oZNZG%X{WF`a!!M^Pb~C#a0Y-)a5y;RlL(WPwDM&ftUKGE z`9RjpARO=dLR-G#Lpy2f4l{D9sNpEpGVd?s9*7x#Zhljt2{svk1RmbVivyo z-$xXgI2txVHW=xp*ai|cCfM>feo1NM}9k-}8VTNViIy5`<-gBAJpB^L*+ z4dX=L5GlIwVFx9W*SvB0&GQ+Y;QJPNByJk6SIgeYA066`0Yr(Ie5sgxe_%F}FiHh7 zPBGQxab20Hzw9yrL;_J?grFlGLa5hi)Jw%G4{+HG>>e0{IH*I zHHI_~o$r4^%xktErK zhgMv72PC1vYhLZ#XczQ<&3jTgLa1m!@0hyE!gc>%ZbyE~d5}}gHipuZrzlo?O!qzb z)vA#s1^C;dyw^L5z&u6nwL|MS`XmGLru0nm#`i;+_`SKCUmUkCe^@bU`;z4!rSYHM ze(v-pHD%3V9a+1s?QZ(+zS^!Fe0qTcUM&1KLeF-e^e7;AC}Irq{H9s+GnuRO3#{ zbV=M5I#`o9KxrOToFK!Amv0!7HngqW93^|@kcdD9Box?Zb~+m`fxEb($lI6mcw*cL zL7b=y`ixLM6>WGBT{dUSlr`?$o;s z$@mdLdT1NisxeE33W^IAnaYBT-h_$|R2?A!#4sRRf5@&11W*UL8On?#SEiN)hi@Xt zLZTW4X09#@BuMOm9XUw@%%eEqz(j#b>IELESe^YA7O$NUl7K|2>JnUOg%`Y*mW_Ad zLVzbe>LOY%KnX^_r{TCd#25sL0!OGlhCvc-z18pq#RP7t!0Kc}0Kyb-0g&} zSykG>tC;E$Mtl$`FU5{dvL)EpW?J-k)Pj+lf9Z|Y`On$B*e;PHFlhQaK~s$poI;p| zdyZ=?!Z}$Kqj?GrR1pmW&H5WSR25;}2(=gAK-09m<6$zYM#WhhwC@72j2pT~6OOBHSQ@!I$-LoB>gLV!?Ll#MMlz*bAL9`ya_&P`1b+A%b-4z1uWP$~;BPv2$R zhQ>)x5RMoIxcFe*h;| zx`#KLM34$VyZ~H0j`QJgY7!>FYbpSm8`lSX+!ib#9HnX;x2#Mi4kDJYMTK=TR?gB$ zP0Pem)v&RqU@h{oB?V#5=5;VxYW^E38+*ZQaS0lxss=KgoKZrqehUcwp#D#qVFZOG z7>qizoMiyl;99E-^*Ho}e6)5BRocr55)XTKUYgX4I@oaddU}v3K!mYDBErpBj?{hb zPD(^Tq?QkmK&7F_1bG4A5b!sp`REiEfoekC4P~vVI>fF9CTH&M^qqGX4jq z2=Fi`YTrq1R@T>ZI|6maOiM{k8vD)2-DitzDpfG3clcJ2|CK<#2F(?~?qn4E_#zi{ zC|D8M^#UQ{Zk4KM{cik4;WLphMqPB(S8Y6n>?#faVAN>(SW`owJAI!P>JLvq5kX2b zLc+k%)AyEvuj=$$e|PY6Lee~5;5Wq`<(h<83Ja@HZz;^kdLdKD=s!fZUv03)>i2K6 z%S*C@eh6X;`sd?wI?HwPYpt0y#}n&r2?A2ptjl7q=U9vV3VfV9XME%UB5&n$PUFUq zkN3SgR+ErnXGvml*_|#wZ{JRwt)0~ka_(E+8;&r_CN)!~eq)78`c0^~ zg0CyFtTEl?8=EGAl}&qB`5v+TZ{VdQ#76TJ1&Rsa75rsJ;2@;XTY`oo;o;HjkcdqXqQ1n9=X~#|-&HK}!Qfi8} zVfi`hjQI}eYa3QurvZsbZl&kEen&p~Y3CV1P7Nq8R-_*kxwQK1GxYuXHB!@7^%){? zraYaVvh_r@-e(ctHy$O|hootlsDsrh1{WXHsXGbv_Nwd=oyJg%D0kUR&*Zef+jY~gGg47>XXc$R?ajDxw#F(MtdiRo> zKOKSI3Oj!OR-ALm=h0}Q^wfMLm&V~y^a=AVtnWzI^GKfn{W=plKO3brTLP}shkn2ug z73=A6h_kezu1ea*Hkvw?rR236Ty|}P@T_wc6g6;Rl&kul7ra2?@|9>@PzkPWTw4$U z3kTZnX;>r>b(9};Cl*4MQ#Ip?_3zk=f4Btzbs1kFvn!zp$cc&g5QgPsz!=O04yUNc zmF&tooZ3>gd})tSrUuS4Ls<9)2;n;{%muv#R1`YmgGa9?htcL1&j_Rfu9BxLyTMzB zP@~fuSg^~eNk(Ah^|TEP$f3FJboY<}bX7YJ{>4j#_P~!$E)*|jFS1jON;ibne|!o% zecNpNnYh{T){>fEQ&!WbXzyJ$a%sTS?IxMwnW}qX!K!>^Z`x_&M5c}G0&4mF>&UDz z>>vd+7ZqA}Ml6(wK|`P2*zJ5O-ot9@cG(ieFe%h#UssjX(c|&3%srJ}AwRRTEdfGX z7xMD4d`Lsw4UUT&!QmCW5Wj~Ue?gDx4u%eIVbsfv+igrh!3EgLKv@l_+ z7C?uMUIA3KPeouw!QeI0-worY(gtff)}Sb)p$f#Z#p~LM3@9rBKoG)(0MM$rwTi_q z^`!LM#Xw*SCqS-1Soae+2zgllzO_!=a)HNscHqzLY#`@Jv|yBwt%}Fke=+&cur3iN zjGk$k9iJDMsaK_l(L~cwBrL$vARCF%;;&k)eac+|kWYJqnp(^&hGJr}f~L1qoncyV zqWGihsVO1r3Z0E>?3YeX6>a_BH!M_wtRj{U*yoFgoT(UO0(i*f90Tj|)!$WX^e-tm zXvGz=sb1&oDjYXP63JfWf2!(j+MD8-210WL60vY}=0`tWXawi)Mwfo1Aj3jtLOX{E zP}yJbF;L@UsmrmKn&RE4?Qny0~DmCfC?k&q)qN0jEFDTYR)+u+VCB@c;ugjc=RnV{gx zb~_VEC#N;Z_MCk#r0(b+U<1i<;6Kh}{=|Pf0~X%ywU!$^)Sbnmv`EqpbD6@03KSd9 zTRUNQ-qjnP3Q>SEf8=Krv-zy1zX zWJVs#6z#SpESTrFBh{lW0jMVqt)Z~O3S?oB7eRe}Gc6=je*s#B5?gtuY4rWA8Q@O^ z@pK-x%gdT4g2dgv(7z^5Cz!^PQ;KsJ8iJOz;o}ABh_43P2X0(6+kjCPj0{_E|KStci%(Cj7XdM~-*M;>E1X!JE8-*bvRjE|@M4-T8fHz2cw2%0`gqGBlh%gU( zH@^=mF9(0;PR4FxA_;mBA99R z>ea_Je30eiQqS8Fy$KLfMy^a)J-2C2J~0iBqq5dOL9lbVIiK&E2K~2ZH;Is?mKCa% zN-5szTv^2`NcLNGha$yiBfa>G`qziGsS<89+;G=XkvNkHjQG1;E$?Bn`Vz~4xA8E# zf8^pv1cAe^pF^+iQpi!A8+VUdc|bYy^X5beHCIf_#JkUo&1!AwS$@yj>A^w@<-ob( zdREM@Q)5v%I{h$y>$|AY3; z=*0nP7ixN+c5~-%s7@$5ZvhFbd=Mzt2f=2rH2PZlMJ3e&&9k%io9Um~TU$&wfAG9& z1KJD-;xlVUqk+F6J!Fz!E63SL5KIRk1*>J8fQ#r}>&OP;0R->eAI9IK@n~M&^f%kf z4}YfNiyLX@97(mmcQ%d<(!5IeZNELVH!dMJiB~=;ahtK$CiG%nIlxY8g2nccQk1!I zcH_^T<_4V0Z--&iqWNzt+G@(?e^&kTEo|vKD4Tgr_KRDzo^BQLPwR2zM@e(W>QR3N zTRM!{U@cy~kq&iUHAoL(yDRo3)f z!<^}tZ;aC7M9eo)-ZH>vIh)*SDOG(Qbea(H8_K|dgnE?`nDU*Z9^8d8YnXX<}E2Nr{brh zTIt2*G_P0KeC~zw>F}f_dlrnl%Ml-?4uvYt@9EO7R{fLMG^*C6iGxxiSa@}sSBE|g zSXa|!Z7=eugFAMd^3Shuf4|!#0tL`;y2{Psrs}$@Rn;aU1mIfVEWY5UkvEUc;+$9x zA(^|g>7B}{3_Xw4vBR9=n?p!A!JK@t4oU zKkjg3w6d9qyfI}w;b0~J#xNHK?j>3&bHCD_N7Eu$!~$H+dS15LBRTC=hCa$%=erqa zUFk@sUD8!q)EyAYsHQu=h|zucLcVPD*65_cWzD*y(qSo7f5N>1Y5KRfTROs|Zz|qg zBJuo%u6HIzTU&Fsd370BjBrz~cJzB4YQ?NAAcX~RFZfTLFHRljCfrgoNukGdL6x!X zb8#b_HU!-?*G_TH^xn#sLOl{S-sT)Gm#5=fawWLa*VNd5dt(N+R5c5&=cN>hDOr3~@hyg@e43G8|#6&UHQ zv>IWH)Kg(e`_Hn&67RgvOXm6hUji_ewtVkkx|=s7e~MHFY>L)lCdSFM|BI36xx+)L z!ADTYCM+fx8~es*9`i&%{53bQ6s%P>n%QuF?MCe}w|&&ui)`nGUZXqYdd?)*++ zTMdshaa(%lUDB}hQd8Sj+&X<*zL)$3pi+k1^Yihn~(#{RhpsHOv4kqMx z-tTvmf2QTsB~CS90NImWjbbtS`m31&{=Un9~Vf|8EgV2CcYu^y202M7|E1Y#Iro6N)qm(LCb#MjH&HV|`nBT_Def|n}-0}!O*@4IVu|Ak29 zf1&+Ky#sqTQZ=za*Le^Sp^ zY%{CFSx7Ot#@SugWl`a#*cKN-i#va&-%~Ho=$>ovm+>=Ftn%rM5(oR$=Jt*ntl5}< zXUDP5(sd3!QF|+juL)fRE^DEu_k)tR$*h!4G&L%x$&@dj8Y&iQ5f9Sxjw!$YDIX~mr<0o&sjK3wf`vto)KwQOcG>8-p zrzB$&9hgFE#sW!CT;UdZ^f-6lH<#F-ubJjvmYf#$``Zmikw8=U_gv8;xLNAPh(7>g zk0@(HqD7m*o6*<*wI|3aS>$iVUPy*FD zkYh~tq!@&@2sZ@S0dSeHu>#~L0FA7B=McQx)Wxn*Vb9&Nu#mfk$asA2w9TfWRSbP# zR=mQX`KcEcW}q5B(4ww%e?#}zhZ6p8Q*mec9<5IQuJK}@tx=)I%Eo*(#KTY4dv>11 zfSoyxs_G8U43h&!yusqW=D|4dT|O1B*W{g|JsNLavqegZw|xZ6_tOAmrp6}p&;lep z3r#XK{dr!-3Zaq(Gl_xRee4dG_3}LXv-%{Ix_4om@0V7p4TkHbf7E$~j}hd;YD^yf z#?-{gpeRX6!b}YC4fT}utjDCg*GGut_6x`f-IWkhXET&QHn3Lqn9U$!)zErud)_6L z2WJ3h+X1Ui4b~kl;ro%J?EmunScB z{cQHaXZTNAmb5+%fAfR%D!?-H5K;)1jx^Ct(~-GTfX)_F2IwFj+K|LKBm-OE>Vik? zc(F+;6)*Jy7Y9F1)~DrN<3lT63sa*C`x0kP8+7z*0OkOptjTVBIaZ7maxWEu$O3D{ zYG8Fe6erMq+AoMEorf3j~HbS6<3p>CNqpADPH ziYtU1C&gNjm-2idmhxyFm}G?V5Zwp% zcaI}i8&mR3e`Y4EVN)4t?SfEV;oSYrmuP}BCcVh^d2kIefCsDf8ZQ2M^d(>!Z1Uy;N<&{j?Z}< z>$UH@R3mdnjd(H+uPWoLgGu)@bpT(B@u83EZTgfWfsRHQl-|bMY%pNWcRX`}jLZp~ zl#+@(F8KhjvMcbN`}5^gH3LjE7;o>tIOG2ljxTXh^Cu*>P-01Ol*y?H(VHy|D+mG& z?JF1Xe;}b$YFp7-+olO>q7F^6G9nPaX2;d4sQI&sk%WF$2D69div71=h`8Flb!Fs%1dYZ zSvnfIo;*+Fh-V=ZD&T(}>oc|Ze>-(e(dtM{e^;AN1F^-)^(^H1x@8E?Pz(H2GIrzG z`Ys`IqrTKQq(2jk)xDq3*?g6WDasdJn3GD10}zDhHM!)kQbd=>q~b2?kZ6jiYdfbi zZx@tG#I#oSpDzX;gpXAe>AP*Dw{weu9%duY2awcg%5HGo(tS9jD}t|HU$T9`@e+A8 ze`9*#;V_Wr!pczUR1-V4z*~{CD?kY%W>^JH&Ut-KdgHpS1qK5GRJ0@#+8Q_r5=0$F zIkmY_51Sl}&uzQ}o-@G6P(o#p%KgyAeL+afkYs&E$9`L$2*+IB-+a;RyjzR zxq&_JeZwi`-29vmTFyF!!F9hY#>0k!vZ4|n*hmxb4%r(IK(pFf0{ss zP@Ua|>8vzn3@yn*jQ~ywfU1FtS(r$5+_7KHyw+l*^S)9qTzs~*Bri?_!gU-$hzzQo zEFUT=U4#XeMwb9JPB&L)$-&ia^SeF3oD0M_)(2p3&MnjeWluZ@ zhknk`yk|(5!IluhHdl(@W@o;6e|uk#R$R4qYL9;BV=GupDOySgGd-N|Xb)zL5}>Rh zcgWlB>j^%1NQ{L|z6#b#slZRK-q zZ1D{#>qJRv>87h7X;fBcS}IUwN@jFIgo+MH&@$}7l1W^&{A`orpDbk5%N;6Qe~xunMATi|b$Vqj)Ng6J{s=9+3|_ob^TQi^y#P2SybzR9 zpy}*Lk9+uN71V8{B1;`;EXvd8Hzc)K)!$#5otX%9UaCQUqeZ@;&C^RAf z3P-3AJA*bhk@ewVVNqQjN@a+m5;DyNf5)t(=<+TWCJBLa zH3m{#=$e!uKV0$lEIY``vgcUA^-tBig4cNz8*9W=ZWB7B{Re#o-PjwoSBv^;ZGg&^ z7R;DjoiKCITDuxiU2@hUSm*C#*qQ?$)cgrldP+mVc;O6xvkbAO4$BKw{+%~hY)p=> z@ex`hvu8w2dg%hWe^Ojq1qTn0=5`fmP)Kw1kdy^)`PX0&;uE+i?;Wr(uLU?`eYA04 zig47$gB6ph(>TI2LK8bD1APlk9oR*XOhs_PQ*%1{syVc|yZxi5+4>xy!$H^716R*o zk+z&yVJJyK+#S++^%u|&k;8KkqqTq~@+JvO7LWj}>jS!_f3iBoLHP|rX+R2!0UZ=E zw>NeeJGaE>+!$(b7kPnqqYYPi1*%FZT;`T`&SBEN#kAk|#EJDpf=>pLC0&LVgB3T- z!4t04J?BMrU~yGu9Z@1tqKS3bQ6#|T6!VGR5GU!~o}S?{865)>1SsewtmT(k>0aWv zOjT||p+fb1e}ajTw^*OZ;9(2!SSkvL;b!F%tn1o!(-O?27dwMuGs>mUf0Kv`c;;psAaTen z9xZBGgsyd#t~79|R%B4Z=lhhSr`Vr^sI<(?$BEUjf8khPn7V4ilh>#JlM5MYQPfBU zcnjbjsG!hNg7n2OpmH*p1EIok7}EDz{(S{vFA%DvWuM?kCBoiwbv%bX9?pjy2TDxK z)-N<)DL*}WKViQLzL`0Bqltb1TPUEF3WbQT7ZEV>Tv)Tqh6q<8wwAvpuAUQ+YaxBtV;`Mq9j!29Q=Nyq20BDzdlXe|6S=ULwa}dfc33=fIXNMK)(>`h$t~ z@{Pc$GI(t!TWK9HY(Z=eYS;byDq3 ze@(QM;;s5?Pn51fxN+E}aG!aYDbw^x-}yh>SEB_pBb0DsgZ-L7siqkQN6|PFBcPcD)wK;Y zvqPLgVMT*?d~lGBQAp&X=26s<;3vqx5bb|vGC4Gr+fTskmVc6W$haUW3VDuJf5Vyk z+@ZpfA-pf#X?)iTCZF`sbCb?95H_9bT5#{+xzA}UH>V#-e9z$fM(~C|15{AFmHK?# ztd?W?&SD=y<>B95Y`Axna;#k^*|O8+Ok?0&K*;0Mt(aE*@{ zQbnJGAC6Vd)3|rzSzVm@2uwnge;Kv8ECCweikLwrtt2y|b?H^yK_sYK;ZZLhJKf#hdzYpUUFpr$eeHJjH{We{+}ZWtPhSdv4M7kZOqyh9n?^=cBV=k|nrM2O zV4Fn9f6<836+cAvHlCwRF*F)a5_l?kHjOmY^hc#U(NAihqF^IxVJDHMr-e3{O(w~S zwHjp9^w7~ZQ`Ge`WY9GTnE(Ma(-S6`1k*u)Xoid?Nk2*HGHEo;Df%GvLFk%fo=r?N z4K)uTlS3%|Q(~GkMD;RcX{KssN2LuOrh)0Ee^6}=Kmn6L0MZZu38sLWWXYmwiKZ!- zLnA{$G}@aGr|O%~1v4g$6!xY7h9;&X)bzy)Ot@- z#XUxbfB*mkO%QUqY%=Y(w+p>KTWDUgC<6rX(!~T;+Zt`We*CT zf7KpFr|CUY^-t9vlk`)1kn>UpsCtjpJxvUnJqD0JQ%yr@2kL-m10XXfB$8TO4<(HU7pQKSQ=N#deEr^!1jopjqz5^G2hr_3A(SSIf+!<^yHe|T3W zU}iYsRqGU2WQ8q2v%-)>auc8jGPY609VdZsd~vev&%GI-V$|Ek9jYTjYu_4CZf^;q zAstO~vYS{Q_hejhpx^I&B!Y7-0~vkTe2yN|L%>}WKC;}Fgm9FLry!&~(bzgCukh~(H#|oQG_lE4Gx1a6y8bB7p69YfQ)Kfrwb7n^mp2f0yCb69pK) zsP#avA*fFqzlgn_9tr>6&vYV7iPMepSn3R!S zY8UUmwTd(bm>V1IB;6JNx4zE%zU6E`dz}$X_Jb&$7=wZba#a#Jil&#`?j*I65v*+T zy;XBPSVbLpV8RnLuAvo zYrC+(gf&2+1_c~gY5!>7EX<*0_LN zyLAkS-34I5H`5DdcubnUXbz67Of4~b`QvAQ^Q4Tg%!;dbB^{N6D^3rG&A)vZStgyQ z$qdM?XNat|s-6lsPHolW`V#@c^ue+Ical7+uTzm_e;vWyZ?zuRHiUcthnFBP_ah7> zGcyBt&U3IMub09YG7wLis<>Wg+=mgFm>86jd)e=$WoXqC?B05(rqsm5&bbynGSDds zKhJ@@Mv&M{E+{FcjW;H95Ga8V4pJ@0t`>qyxpXvL>yQq*nGHEhxGpqPwbYPW0p|hR z#_1R3e_`Cc<8(I4+`{YBeI|Z+pK(H*ZHpqEm^7QQ%Nl1WPuiUg zbw~rRCp+6xT#=_^8>jo&lA(~&0Ycd};&wS^fTzaj*^c&zQYQMJ{eS(qkd{n7qcs(9Hj z_nL>>3^zhjQbLm&_6B5*1jNwE7#NZl<@IcHS&d%d2g%DT<1!-na z!AQ3plp0XZX$xxEy6kT+zZk4QL|4)%r0f^{Z!s>$fFuHv7L3KpK`9$19f_Kr&uJvK zfA~AQ&-uV?|5!*aq&YYg>Vmh;!C zk9r2QFVgzvdybsKnbV7%g(-PeKP4W3f8Q4T`awjyYK7)cK+Pzan3SH@2xy#he!o*H zSw}L?#3>YMD@2B2Prc+ELt$7+`?-XFi0$LZgE_t*H?hVzXEX8-plm0bGiYF*qc3Le z_#bT6nk)y7BvI`{=R`!JRAmk6UxNFF6s_%bWp`FoV^)jV_*pWo3(ara^kn*0f4mnL zH-?Vu~TLL*Abez?i`B%lU+5J_8nJnElN}$1;8;7yr z{BbZK3fs4z1!iMZsHQw2GX8}Ce|b1m5&)2urFkMP=qs}6Q=>8OdzUop-a^)>EUC4d z!~q!cMg~q9Yp<>Q_>~Gk(Z7WlL#&@*7)jL|Wy{|ACMVRCGbrn%wq|gR)2Lk3tj~VE zubf{+czsDFvFk&lXq&_ePSK1Y;<8%Tjz2ZNdo!FK{f;>q!&}Y$&HRD!fA17)H z^W|atKy9L6lZs^=W1X4Dc7Ce&zsLm;2?bsvfQ)rYqhF~}Cmg6gLu50r_@WH!H3FGL z8?a1essz~9&SAzZ)keAr9a{lWkVTl}qO5Ron~vI?w^%T9HnX?x=+tyZTVJp$w(WaY z1K?Lc-mq_NQDdd9!-4aDe_s{53#cVZCu^&E#*Tz7{gp}%WT?c8V=?SGo~q;bVq&4IgO>l+Ez{aI-qJ1OJ=PcYV- zI7&ip3he4GFMiq)Pk?u zE$wG4MIB*m?#-vwe*@TI?N6;>c{^b8TxSvo!fLWi_DfXl#)_Kp<+S_<;P1QndiDAZ$k zF38t!E$c0A+Yg5D*+>eYBYLh?liZ8tfh6k7%1wNFbyv0ke?*Gi>Ohc~9K`XZ)1t6O zJ2xiK0|)MEEcVXqITK6lc$Uz36e^Qs!=7TV#EZynA)QkmkRrSiOcC%&HE|%ne9g$?p#)y_C`=IwgaM*?R&aw3Hf@w~k~Z{goE#*3F_JcA!FXZ?(mrwlQYWN@5E(Y?^teDS7$+7ql$uVsE|pa4 z$O|%7WD=A}PBJlylw<-yB0Bfy;YN&n9`p$TuvDQW1d-tkyd~I!+bWWZmp7a2eYua9ugR4P+NXQXALFh~oS#CGCz!Pi{I_CqXScU-% zG++TRfA*kJ#VkRY1ZWvd7YT@0n4F+II3UPm2;f6RfkM4NoclMq5(NgWJaetwxLFAz zV1s%HU{aHiEM)=9#GWLv0z`3Pw-{H)G^NYj3b$CPqNg zGL#R-fOfR`Va%4DZE}>L#M{8)^A$0y ze^a&8-b%&c-A}(Q9=W>OW!5Z7VDsV=w?`6UNRUYF+xJ35MLKRB4+oT_T6=uz3J1#4 zWMo`YLMTWV1uoc zR{};UBcuWkH8o3kemK*j*&=q8YMphSf4{becAF^NNmzHJfk%?f2M-bv%p@?it4+wn z4=+2opeMS|nPusuYN)a!q&-f7J&4P%lVWe=7lrdAoa^ z7bl^%&dG-gXKhfRQR5I62sDv{V{2gZ*wX|zqghXgEA|MR;=0r54GhAKQyi)m+f9PN5hw9^WoMsk4#=I2pR$`7C6L}KQp)G}CoJl1Rk0+}@ zUm93o8fgU$2sU)IS}oo$g9B`Jel`Iy^m(QL&=o&5g_{>mTprWat@ zVzwR2f|rE^LhpqO0yIr98;E3lR5Gczx8gHw!a_=bwQ_3V*!xSLW(DPh0HE+HwYAG1N^N8Uzy9 zZH(pk6tQsk8Bsi~#Jwfr_%MXzDz+0Hz=_^Sy5GmhmN9mzjXpb@BNY*Ei|T8)XeY`T z<+M()nQ!1lw-%69=J*z49p1^cu4gG!*tK7s@SolPbr_{0JB&aZT)5_}vSk*Euz+c1 z5D($+uDn%je+;QX2B2ed{XNFp1#ZQDuwDyMd@u$h__Tnz5W~Vp1KYPEoZ69WSA7jj z+L+~*g_IXmxCSMEbtQ2E;<*<7bNF}j3LNQdTVEt$u!O!`WaXuNam1CG)v}EBbIwO4 zTr+ac8!~Hy8Zd$SVSvGLN%IlX1A1T{*q0rvc3}~tf4&3}&?lvO40b$@JarU35XIVY z(}!o3dUOg+QC7@97cFs_A*C8N)t2eNVp1EWN|&M1`FYmsa$qijwGv>$pH)2@t@i1E zU(Rmo!{XMqi6|wtC**GRuy*^;;k)Kz#kk_>+GcAZbxJ{tmX#OCzVRtTme2k0uac5* z@}52Pe@iuWpt=3ZGg#(mXbCInr6W%+45K!J?nj*2Qoh^y8e_<#qNKrTj=Ih;iu~hJ zp$`ILhl%W`88&`91Su++E+Rq)RkMt#hp8pO@iA+eu*%0l(lIfrsMbRq z=Xn@iq@Au-zKm*DP0kZxP))0PERhfa4h$N-e^mhs5&K=V*m-@Lg_;+eIt*7p%1%o{ z5CXI*AM#-I$AWbQ0_ZD_o$_T|KTOR5bUna>5-bJ;f9jf1sI0=lNu24H%w()Frg+YY zeYj_t$9|%zAMmbZifacMi38(=hk(JFC`Laxu&q;>-}9 z;0!hbe_gu8lhl%R*>q&;cv9Y@CI-wh!&LYM2;n;<$_2RvP!u}Cdq&oigY)@iqrxcQ zt0XC_Cq^q!-6+~qWflQ(2_(uKy}aW)DkyFE_?kEXxGEjDgXLvm!W#D1wZ69&vB@U6{ZdB z0&3aZmyuUu*FXwjE()^mj425af`>Q1ui0}d`wgk5-Q!9Wu%%6zeO@2SW!pw(F%vHhUukFeMUNTDHrQ zLU-4=8MrW&3m`+ouK=kvQ$=7!z1}s@+>NuQ&W3AxmcS^ap$f#Z#q3&%3@9rBKoJ6k z0N|>r)e6Ng4W#tjwLo8s2f?a9SoYI5$oaVMzPVla=7XQnxCVl0VF^4nYO{foH+D=;n%WRfK6+_Xh;HiHebgKqrunQNliM zI=im5de;=1)XeOm|87jwcKv_-z!r-tK zf4n|=uWsQg8!WE#OotmCE=7#ImkRAiCS~5RlytHpp#ofifytbODXPYIte5f&(@m-* zyVn*sj(FZoDo)DvSBQnSuyK4>k@Zo}EJW_MQW-?kG61-DK9|y*e_~l$V%UTTq=~PV z0}}0smU0`d$_FKROADh4kvf%=;!LZ?knLNib8ByAWC+m_X1B7Pj>OVQ>CJJyuM<6|JNf6n0p&R5Kh0$Q`2KzF6|K!%3k)j;u zGldEiC^sJxX29rtf23}xDLw$nk#?n@-gtxao$4MK=L;_?KtC42zX>s}kZz7fraLH* zx31$xQElVWW_MQhvI8s@s8$pJ4E+W8DF9R`xTRS^v@a}EKnxzoP(LF$?od7$UzvW!n1rzc%mW z^tQG?Df%%>e_&YZ=4QogP!`YzA&aCod9M^An_qZ9Hz~HHUd8FJitOYpaa=`}V z*OSr3XhiE02x*&|b1b@NoCijKfyDXff-Fw7jlz(TDbl8ds&HU2ARDSUw2)C72YX^t zBEUWFUi1sqm`_3JAe`c$Nkg2K_kuN0Uo}}Cf?}fBVsQni^4rm0dRTN#7zhJYR>hQ%KKK&W znez+`OvaE@N_5Ep_S{=9e${|UB0-18)_@O5h|KJpX>(W!v{S|uu_7wez8$O`7{D_l z;XZRwe=6-e&he?9FnAxGwT94$8O6OIve<689$chX7^Kk zW^@t@CIni^+SBc|zf8SN4ZRH(^J9>aQzdD{e|_3%eo7CS^kjN06uvF6L}c)TuC9|& z7{gP3`1v5w_Dh|NPeE=*)I>#D6+0sc^?;7!<``B|)tcxCHcodrIsW;;aXW9)bh(15AbO7{kw?7)wU zf?{Bli$mHCsmaVn@9?goQzLgV0s$3=e-9F&F8WVmTO5fgu~qO8)}Rtw`uywYvX@*- z;~dyc_KwFrwqfV4J+aX+f%ZF}MI6rCfR8-2`=BNO>1B1kSmMuf5rSBt2wdUw03|Uu zdS0;4g9pJ-Er9smvxsv*`+@WK4iOua4sxbqf$2++VS6I_Rc2%hs3EPjGUD5je|>!b zCP0VUf!hOhAVy6n^l*2?C#ad<#PR}G3=?$V0J(I-fD(WY&U}DwF$k%F>V7vJPwSz3 zd(+@=tUcbdb}Vh@+wtcYeccK;M=zLqXq*0%Se|rJkFjS;F?pLY)+otEym7ixa)QR^ zK2nsqakk^qo#%#}yHDq_)V_YVf0fQ^$<(g>`z?g&J2<;}P4QE|i$?z&%IJ%;h+WPO^(7k^?9E7gpU`x8M76MTyVAOYgM+U7s=1*Z@)2V}tg-R+| zn3Wn;i9QuLce7<|Z!#zYe>-lR^2fDszVrx|On4=3lklv*}HrEx;|K4q1i|Cigyf60R0%357Wuzm}= zCD_~e+rdX`digWDwa*S;R6ACE`8Kz*7P$%D?)SZyPaFk+rE0fdx5iq~!q^L~xxkvX zCtV&aM9bL#!SqkTQ95V$^q?p`&+7R_y7 z!gh}X9s`__cd&`we{N+WnUfN*TKW};6FMlxcQVp^c2??~C!>?aKx2u|Ae+Yn*>hfa zDY8mF68c!EeU1c{mJ=}-Mp;KVR|$YIj0MTN>DLNe_q91$&ifUC zj^#dgiyf=4{nBa|^;TB($2>BsDh}`9G+%lUuctjVx#=)if8%W^^cYH2K(9breu?d- zvb3q2&$yRdZ%5=gQMf&mm%ELvRSPDCl0lCOeIeHH+j0CARmnA5XU3;F<%IoGdwa9R zEIBTW85Lz1>A zKETl$p46xae<|;wxcRFcG{#HyMy{ztsgH{lrq{Bq8bmzl&EDnV_r6z+YD8%a?ci?ItQl%xWPK0rNU9R&Mk*sVMN1IVV`OB& z@$CJVIEeK)PqmDKV#gCLHLypk=;j3vn#E^=Da@IJmSHVDE3f(O9Z~knpOw@p_3U9R z(y(7c-S`~Cv>Ps8X;XOTuKiWsj1@iSDm!-wrGFL1dGhkI$b)4afo}TKvUaQHtt{Z( z^#xMsf7fv~&x!8u@|3!_hN;I^01cTn*;FGRrLJ`#Usc*@#8-Zw%SICy+YeJ9u3ZsW zqvTo8!}jBHlMHbkCv{cLQ$n}k{*D4KHi>7K zM{-KQi`+iBp0Wcz$qEJq$G?FQlyL(WltELowU(`D?`n+D96IiwI8%r=Xv~}a;Wpo6 zbM=c_F$+)?(htEP^R{q;K3pkT$sU@Q^^w@!nhTM4;ggONl>5$WGGEA_q*&_ zNNLb%%6H~GW=YcwBXat>v*ktLL!lToCq{^7n;xj+u_~l-juvmd?{7B$oxjRHf2X_x zqf$REd3 zqvAMgbR}W&{%vlipH}0rFJ*C6;wzw~&1^M3nC30wYxz3}ZZht*SozrP$}Pwd6MM?t z)!Jfff_r-XUh6-UUY#6_;$!xne}RDCcLS5M{0r) z0@gLO)1Xi`+`)`Xc2Nnf7zqU}V}w}d&);47e2w}08DEcdS$2)>a%;5TjXYDhcO23) zpe!@Y5*w2I{u4NYI~EpZ=c%#v=R+8sVd8fNuON#H?lUmr$nC~#U4hT%e`Mv@6(rjy z@o*~%vvET{Mr}Lp>$Rg6VG-jV?QlFP7G?{rvm(*_T8HOBY`c=FoTtV5v{eQEI_&nKqFfp3CLcB>Vns*u<37K>?E$@avm=` zohxZ))I%QFD?V9Fe8h`ue-lg%8}ukEeE|M7&WV3lskO2EPgbAI>^zvrY!r0Z*;voV zTuem$Z?}^6G!*I0Z%ce{h^QAQY_V<@lpb zoN!ha5QPJyQzl|$&{QO(@g@#{2YU*7_G8pt?7rc-L4xuEZ_4--nat%74Xh=-&NE0g zsp&mdJ|7OkgY$ql*8!_e1;!>0>I0Fc?n1RTXRj%IJt?*+$C4gK^xQ_Z`^2m5XtL&p{ZEY4fC>uA=2&jC|OqTP2g(5w}5 z?-hZ_0&B%;VD(;Xx6}z_ql?1&Y*2dQqD2X=Gb4iwpMG5{e^%%~JjXj-dHgC58A2bE zbcGF$_@0D0NhROR(zpRCOArbdpt;FC2eYhu%u5eYe)MqX=7hEBb9utMKVW<8q5y+$ zrU7ISQ40Wl{Gr08HaC4Y?gnj$Wp3?YG5ECk_gwfc?(VwzGpBcJeUV? z7~wdCHo^WLe*?(M+hl$zhQ!5&Dnl$wK#~_&7XKE*yWU1cp@0OfC?HkM!4TtK+XD8g zL1UL|-w3FxbIkA7A?S zGiXBoz+cPW`&H~deW_*iX>Ft=0SWTS1{9if4`>m;C+P=o8yEC_e)|-0|a|* z&ZlwkYWLC(d%o+XfV}%N9 zx#OA)%)v8~l2Jz!#6&CY%K#^V0SQ!&MB^L`Z|%W3(ELtv_tqgabk^#OM|_oXio%qq z3q?x9e-J^xrDFsGICWNSvsTv%0(!WksM;AJ3}2^Z=~dMHdDV$SK)wO2<9TC0UFYI1 zcGdDf;UCE_sNc~_1RpG;K|{S)Exb=a;&Mbp5C|#IsP~5zFd{tPTdfFnaX4Sm>%wTd zo~PwSLH_zKwsfx^x86n>$V5uF-*?H+@qTB~f8Ek_e&~e6d9d(23{0L+( z6FhT!4PN^nWffCBZfSF`;qM6eF{fwnHqu+nEd+f0H=Z9Yr_Yeu;XAVa7}6C%SFbzd ze?H)Ni9BMly^!*lNOIw2D0C_bo%>)d#nu(51d%f=0;uIYzK1beMtM^9x{-E|4M87C zgAzk??y-KC;t&Z07_Sbe)2ISvxH+Mi;%Iu#X8^(tu6CUDd_V|LW7fj&yA!_Hf*;9A z_pQh{1&PRA%(;Ga#Chzbf|lv&-&)Uge>U)j=5ZX>HhBc2Tnq{!1$l13sHQpm);R}M zSwf-eM8(Vr?|beUPcGx)-+LA@)GiCHd0thkj(Raf--pYh-W(>QnAi)$l2sfX1P*1n z3MFF%!Zs`64)8(3mBIti8|zj;2sv39=@Z}>%@erpbK}^_^9t}^L}HU*888lKf4PT_ zFwD2)kRg;Ocj3B=4B>+dagd`x6M|qWuws^G5*=48SM>6FJu*)_=c6d&<)xV&dT<=a zP{A00$fxe#bYhWXT4?InlZ_GGda$D8AS^Mom!YZhJ9_@b{?wcLq-xI>Ltcjols zTR?VJ`&Rn-I-*%d%1Akx?B{zR zdI-TOi!lp+UgLRYBS@-TM{M*_ZY={0gR7A`f<3 zm3PI&sRcSzHo@V-`ZS)8D0x&K{Pi3oXp9spgd4|*1fmrKMfVH*P^#Wee~YlXF6C+} zx-w3YKujDSM+^vft>T=Bo@U!WwG&2+?3C#j6^5ARrQFfq-vLmG)f9#S=`I}~%sg*| zs?2_kte$P1jtQhaXo(G3Fw|oWCW6ZBg+>gCEY{>GNTBqs!LCd)2`fcE8zBhD*HEJ6 za^-;Dw@)1CcanNc*Z{P;f3`InKDLc5M^dCCG}n0DzDkzW@98@B2q<~jo$#gFjBWn> z0N|StLP<8%k zYE5uKp%4cpBgPn!3dg(=V$XJPEpTv`5XbgYN>m^m(QXMyrAjkU<%^4xtp=v+F zP2IZ_6RNyMEaM&%e>yQO%c2V9Ns(?99DE-eptC}XW5Bx-psl|;{m~9Wcf}p!rUn{d zQ;cV_lt3c9Ov!{rB^=Wy7<8ct&e_1XO{R?OJ7d`qcdRVVXJJDvK{3!^^A4M9?=u4p zCw)u|?yBt#358Y?1dtuc-KMcc)C1yh-9{96umstpV4Sh3e}E5%us>k7N3m3fLsX(v z0;GsbMG|e@-G&DB^-5PJ7I(|NzPHl`sl9^KB^0gRqGr3oqjia4zvqn^_#}c)4vHmB zmIjj%H_X8kuGPKjMRj0tS7;qkB2l7=b=XlPz~q$kiQZ5r>Rq0m$uc&221pR2pq9Tx zy8lw{vxLP~f8;6@F4xE?nR(k{{}aK8UX^m9sE!uy(mtE3(lhVT8y@0j-RIccg0|3*ONV>Ygeeg8JE^aw;)1?W znFgqw=&c`SwLMCA8p~$-ICSeWC}48^!co)fPruMwf8-`&MC#a3tTLu9im>A~3IF86 z##)?p5&>P}_sA+JI253|f|#IkGMEG6LveUmxZhwr-|La{p={>G)(%-CTh=f8X_FA2+9n3BZ3Uy@{|mcx)2intZJiS6cQh0|krJ zP;8tkcHOa-Rd>ewh?#e%*9Uo$>UX1 zX7;cMx1en+lv72fk9G5|4usIu``QP}<^B%~=kC%#ebe51NgS_3zjo`*faZ=%5fq>0 zV3@_ ze~ulWC{W?+L@6eW7FO$m zC~x3!pwx36ZWpeP*Tj>ckqGoH1K4==k%p4?<%7~CPCfUCFk$7vNNOv3Q^{cF2)8`> zcvJteGB~Pa!PxtMQ=6p1xByO{ZC%3Be{Pn{={&1iY3sf-%WbPWqtj)J;kLn+d$Oj$ zd>`^za@V$=M{e=yl#U86rChr}1vwZJA79*#kWlXK7w|q$Kg>VEf4m|o z3W1LJ!=L+IBgBd@-hcfXKS9EIrT8g0hf#v=`d@w9{Up%c z2mv;6A0jfujY9%Q8ndIRZtKRjf4@8MkeFpAD{Xbn%-GA^Q%=FpZF8O7FS8vPL*?O9 zz}vmT03r)oqsa>d*VfnJ5?5zc4+`t7Q43ciq4J?SVS&Eec;{srwQAGc_3QjyX-~85 zRiN47>uL3IUo~DrZ*Z!vFYaT>@l3GR`f<~8T=?0ZPicmS$Bo`LWLqv)e+p$3MJ32N zOhc4jncqyvrU5a(Nq&g@~Ry>0pDPs zuM7k}5ouYDLaxej`xBe?^d2|@i&65dxYs6qn&+K{!9wEV{`O{t;vQ)8xL;fU3u0G& zi_F7Kzi`5j;M&&F+s@+bE}_fIP_9Rn!#^WaJ&$A{K}xvP=ddYGC<+3!3!+MXL2oPn Oi@744C`b-y{lS3A6f!vg diff --git a/locations.py b/locations.py index f53130c..94b7882 100644 --- a/locations.py +++ b/locations.py @@ -155,10 +155,10 @@ def __init__(self, reg, id): } mzm_location_name_groups = { - "Brinstar": {name for name, id in brinstar_location_table.items() if id is not None}, - "Kraid": {name for name, id in kraid_location_table.items() if id is not None}, + "Brinstar": {name for name, id in brinstar_location_table.items() if id.code is not None}, + "Kraid": {name for name, id in kraid_location_table.items() if id.code is not None}, "Upper Norfair": { - "Norfair Power Grip Missile", + "Norfair Hallway to Crateria", "Norfair Under Crateria Elevator", "Norfair Bomb Trap", "Norfair Heated Room Under Brinstar Elevator", @@ -167,43 +167,43 @@ def __init__(self, reg, id): "Norfair Hi-Jump", "Norfair Big Room", "Norfair Behind Top Chozo Statue", - "Norfair Right Shaft Lower", + "Norfair Right Shaft Near Hi-Jump", }, "Lower Norfair": { - "Norfair Lava Power Bomb", - "Norfair Lava Missile", + "Norfair Lava Dive Left", + "Norfair Lava Dive Right", "Norfair Screw Attack", - "Norfair Screw Attack Missile", + "Norfair Next to Screw Attack", "Norfair Wave Beam", - "Norfair Bottom Heated Room First", - "Norfair Bottom Heated Room Second", - "Norfair Space Boost Missile", - "Norfair Space Boost Super Missile", - "Norfair Larva Ceiling E-tank", + "Norfair Heated Room Below Wave - Right", + "Norfair Heated Room Below Wave - Left", + "Norfair Behind Lower Super Missile Door - Right", + "Norfair Behind Lower Super Missile Door - Left", + "Norfair Larva Ceiling", "Norfair Right Shaft Bottom", }, - "Ridley": {name for name, id in ridley_location_table.items() if id is not None}, - "Tourian": {name for name, id in tourian_location_table.items() if id is not None}, - "Crateria": {name for name, id in crateria_location_table.items() if id is not None}, + "Ridley": {name for name, id in ridley_location_table.items() if id.code is not None}, + "Tourian": {name for name, id in tourian_location_table.items() if id.code is not None}, + "Crateria": {name for name, id in crateria_location_table.items() if id.code is not None}, "Chozo Ruins": { "Chozodia Upper Crateria Door", - "Chozodia Ruins Near Upper Crateria Door", + "Chozodia Ruins East of Upper Crateria Door", "Chozodia Chozo Ghost Area Morph Tunnel Above Water", "Chozodia Chozo Ghost Area Underwater", - "Chozodia Under Chozo Ghost Area Water", - "Chozodia Lava Super", + "Chozodia Triple Crawling Pirates", + "Chozodia Lava Dive", }, "Mother Ship": { "Chozodia Bomb Maze", "Chozodia Zoomer Maze", - "Chozodia Glass Tube E-Tank", + "Chozodia Left of Glass Tube", "Chozodia Original Power Bomb", "Chozodia Next to Original Power Bomb", - "Chozodia Glass Tube Power Bomb", + "Chozodia Right of Glass Tube", "Chozodia Chozo Ghost Area Long Shinespark", - "Chozodia Shortcut Super", - "Chozodia Workbot Super", - "Chozodia Mothership Ceiling Near ZSS Start", + "Chozodia Pirate Pitfall Trap", + "Chozodia Behind Workbot", + "Chozodia Ceiling Near Map Station", "Chozodia Under Mecha Ridley Hallway", "Chozodia Southeast Corner In Hull", }, @@ -211,14 +211,14 @@ def __init__(self, reg, id): "Brinstar Long Beam", "Brinstar Varia Suit", "Brinstar Bomb", - "Kraid Space Jump/Unknown Item 2", + "Kraid Unknown Item Statue", "Kraid Speed Booster", "Norfair Screw Attack", "Norfair Wave Beam", "Norfair Ice Beam", "Norfair Hi-Jump", - "Ridley Gravity Suit/Unknown Item 3", - "Crateria Plasma Beam/Unknown Item 1", + "Ridley Unknown Item Statue", + "Crateria Unknown Item Statue", }, "Freestanding Items": { "Brinstar Morph Ball", @@ -227,15 +227,15 @@ def __init__(self, reg, id): }, "Energy Tanks": { "Brinstar Ceiling E-Tank", - "Brinstar Post-Hive E-Tank", + "Brinstar Post-Hive Pillar", "Brinstar Acid near Varia", - "Kraid Worm E-Tank", + "Kraid Zipline Activator Room", "Kraid Speed Jump", - "Norfair Larva Ceiling E-tank", - "Ridley E-Tank behind Gravity", - "Ridley Fake Floor E-Tank", - "Ridley Owl E-Tank", - "Chozodia Glass Tube E-Tank", + "Norfair Larva Ceiling", + "Ridley Behind Unknown Statue", + "Ridley Fake Floor", + "Ridley Under Owls", + "Chozodia Left of Glass Tube", "Chozodia Chozo Ghost Area Long Shinespark", "Chozodia Under Mecha Ridley Hallway", },