From 4629285e7e41773e7bacea7c782eb5f2c43b8e40 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Thu, 14 Mar 2024 12:54:19 -0600
Subject: [PATCH] fix(dropshuffle): minor drops do not increase counter if in
 the wrong dungeon

---
 Main.py               |   2 +-
 RELEASENOTES.md       |   6 ++++++
 Rom.py                |   2 +-
 data/base2current.bps | Bin 117498 -> 117491 bytes
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Main.py b/Main.py
index 160ec9c6..4538bab4 100644
--- a/Main.py
+++ b/Main.py
@@ -38,7 +38,7 @@ from source.enemizer.DamageTables import DamageTable
 from source.enemizer.Enemizer import randomize_enemies
 from source.rom.DataTables import init_data_tables
 
-version_number = '1.4.1.7'
+version_number = '1.4.1.8'
 version_branch = '-u'
 __version__ = f'{version_number}{version_branch}'
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1be11831..2f7f9103 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
 
 # Patch Notes
 
+* 1.4.1.8u
+  * HUD: New dungeon indicators based on common abbreviations 
+  * OWG+HMG: EG is allowed to be armed
+  * Drop Shuffle: Fixed an issue with minor drops counting for the wrong dungeon
+  * Enemizer: Trinexx ice breath should be properly disabled if Trinexx is located outside of Turtle Rock
+  * Enemizer: Enemy bans
 * 1.4.1.7u
   * Some bugs around Triforce Pieces smoothed out
   * Enemizer: No exception for mimics/eyegores in vanilla rooms if enemy logic is turned to off
diff --git a/Rom.py b/Rom.py
index eb05877a..fba37983 100644
--- a/Rom.py
+++ b/Rom.py
@@ -42,7 +42,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '66890fefe34bb5878422322c5f952aa5'
+RANDOMIZERBASEHASH = '67b9ede4928dac94a650e9e9396ef44a'
 
 
 class JsonRom(object):
diff --git a/data/base2current.bps b/data/base2current.bps
index 62b711089c6e6f47e13d200cc91e8fc53398e650..2c405d81b1fbf77c1277b1196a8966a11e127452 100644
GIT binary patch
delta 613
zcmV-r0-F8$l?U^c2e1MI1bc{tcasJKf&pc-i336h0dcd;3ilEZ+qbBz9b}A+ii5W5
zh=~ld(j9vN0VT6e9|Q#paJ8uF>Y6!H;gyz?T_hnHp|_~82kPqT>gs?ABHp&B8X_>5
zr=XQ0%#)WSi2*y4AtmS)PPC|afRQ4`v#9EHfQf>wpj?27x3eB5Q3D7{xTxy5jUrov
zcPY1bDFJ~w0Z_O3VgXzM0kfA@WC2wcO@TlMeuWOdU<ZECAljk;;2N+Pzv-93WC17|
zEwmtVw2)b;0*@vKevTpszd#3mk01wrkHVJ<WdSM<NPr=Lg#h|!X!O?kAOn{|WdSoU
zWq^h73y+GG254yXTKSJcfR#J>Yr-(vpAm|e3WA|%Vt@K10MI1bvqplA1t7DRq-6mn
z1wLG#lUJ9|WdVvHE{c@^@DhLtyOSA-r2y~;;xKypsR3(~R*REuRFKC+mw9FZD*-u|
zrDg$00YaDVW&te$e3u+&0V5T}w)7N$TsqQ*Ya-FOsL2D+3P`6ZmsDo~HUWp1i)R5f
z0eP3fX8|$`a894;@DEC=nB94o{$~Mh9N4$3U?B3hB3<^KFac|&4ao@5E3I+^&>@$5
zAD4(|0f02exTu?}i=4rYCIaFx`fC70AVk1KP)^`Zqfld?vq@-`ffcucnZh8ckGX&o
zw}i36AgMo>JZS+s0(?f7cxeG49|=<xfRX(F|Nla}CQ}uFivfVM0DytzyMlr4tKS1K
zx43BmKUfV~NSdBc0hPi`0hPN&mjuEAT?Zp^wZ@LOa<^#00g4C+D1^x~Y{Qb(ivb5v

delta 620
zcmV-y0+apol?VEj2e1MI1et?oe3J$Pf&p!_i336h0eQ2`3ilEZ<F}}*9b}A+ii5W5
zh=~-l(j9vN0WGsm9|Q#pc(thN>Y6!H;gz0~T_hnHskf-G2kPqT>gs?ABIdTJ8X_>5
zr=XQ0)RUJai2*~CAtmS)R<x*ifRQ4`v#9EHfQf>wpj?27zq1}DQ3D84xTxy5jUr=%
zcPY1bDFJ~w0a&;BVgXzM0lSx0WC2wcb$~zzeuWOdU<ZECAljk;;2N+PzwwvBWC184
zHMEcR<%xjM1t5B~kXfk$k0u9xjv@!YKnH%0AP0Vry_W-J0V)nyfFXc|0QzWX^w#+x
z3zs`(0W&XkfQ9f2kD8SRXlV3W`Hw<?l{@)s!Z6yOA&Qp@f}v<)fBGZ<&?MTkMuLq6
zAiI~HWdSAyPF$apXP3xj0g50#ij@HH5`YQ2lPQU%0PqLmFnao_0c(?Hi<5m+kjGS)
za%KT50ZEshW&ub6QkUmu0WAT9mlbCLBNfcH^b~+xI?{$~BH6g8$pg>|NT)fMO=kf%
z0gso2X8|<<ftR{x0Wu2!PoL@V4@#<--GP_)X8~>;;J2$_Ao{l=UG|+Y0c)iV$q3LZ
zt#Sj<A(smvmw{*jfHcpzsGF;coWYGI0^%_GYXC$bM8HH)PT)?XU}K-NS!k7k6}N(!
z!XT-axquV5gt5XPsYjPJX#qL{3`du7X#pW08B-O2k^KMv|3bSqQx$-V0f4grfPv+^
zf`RU<-(xSgv1tK6SPg1Onx0PqmBLH`mAh4!{lNiU2NQ9%#*VjQw_(BoiU<f65qvUv
GSC3EQ(hI==