From f91d7922b4b021f23d5eabf7ca6ce292c0523611 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 10 Apr 2022 19:18:25 -0500
Subject: [PATCH] Fix from Aerinon for map/compass check for dungeon location
 in map checks

---
 Rom.py                |  12 +++++++++---
 data/base2current.bps | Bin 91979 -> 92009 bytes
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Rom.py b/Rom.py
index 8d65c23b..26e412a6 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '735bfeb907d34ad1e023ce8c9be8bf0f'
+RANDOMIZERBASEHASH = '0aa8a508e8d90e95aec2d92db6dccce5'
 
 
 class JsonRom(object):
@@ -1520,13 +1520,19 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
         compass_mode = 0x01  # show on pickup
     if (world.shuffle[player] != 'vanilla' and world.overworld_map[player] != 'default') or world.owMixed[player]:
         compass_mode |= 0x80  # turn on locating dungeons
+        if world.overworld_map[player] == 'compass':
+            compass_mode |= 0x20  # show icon if compass is collected, 0x00 for maps
+            if world.compassshuffle[player]:
+                compass_mode |= 0x40  # dungeon item that enables icon is wild
+        elif world.overworld_map[player] == 'map':
+            if world.mapshuffle[player]:
+                compass_mode |= 0x40  # dungeon item that enables icon is wild
+        
         if world.shuffle[player] != 'vanilla' and world.overworld_map[player] != 'default':
             x_map_position_generic = [0x3c0, 0xbc0, 0x7c0, 0x1c0, 0x5c0, 0xdc0, 0x7c0, 0xbc0, 0x9c0, 0x3c0]
             for idx, x_map in enumerate(x_map_position_generic):
                 rom.write_bytes(0x53df6+idx*2, int16_as_bytes(x_map))
                 rom.write_bytes(0x53e16+idx*2, int16_as_bytes(0xFC0))
-            if world.compassshuffle[player] and world.overworld_map[player] == 'compass':
-                compass_mode |= 0x40  # compasses are wild
         else:
             # disable HC/AT/GT icons
             # rom.write_bytes(0x53E8A, int16_as_bytes(0xFF00)) # GT
diff --git a/data/base2current.bps b/data/base2current.bps
index ef913a27732e2ad8b045f0655d74c3dbce08934d..d7bc3912fc29c4a4bed7b5f0573a4b73756ebc83 100644
GIT binary patch
delta 456
zcmV;(0XP23&IRet1+YZ{1P7n^V53O^0RhdkN&=Pv0a26T1K9zile+|%0c*2V1+D@C
zA+rMr$pHb4v&{*O0s%3TTMV!?{fMgSK!}|px0s+JBFUtd9Y>n$6;_go-H57OfR!Q?
zgrtBDw|bN~hmj&hh^p!wfRhWCvpfwH0Rj1wQ4T2qI+J@2Trx6~7=VdD@GO&t34kEb
z2O#;ukR5;>zm~oV@E6*@N5TrKzhv`%9~AU{`ae{{3YP;rllu-G0cMjK4=oaOm5FeG
zFmNn^fk;f9g@6W^N0V3&Di@PG290oriSEdxYz~8oegC0sh_eVCowJz_iv|e<Os6o0
zqi8X@vn>{~@(&$=0BfZX$rJ$a1R^<zs+Zvi0UT9kXNrLVmuE(%nFp`R^M3FMlYHcl
zaH)x@-bkNlHKn--t<M@sfQ`=@sVrQDsRx_3fgG1ve3p|F76*XU5P$}+%JY8E2(8Z=
zDG!a$8p1HGtOTD#mr@A<N&!Qcoe2RY0Xvt&2?0X^Ft-N^0k#4ZOe!6Ku?40DAcm8r
y1%-;jFkp{em(dIX84`Ygfq<vyjW~@j0g@%Mfi0IyxBLtNM_LFIuY@vuEz9RK3%Ioa

delta 401
zcmV;C0dD^3&IQZP1+YZ{1d*d|T%$<=0Rh3YN&=Pv0Y#JH1K9zWle+|%0bjFJ1+D@C
z6|(~f$pHa@v&{*O0s$qHTMV!<@rbJGK!}|px0s+JBFUtd9Y>n$6;_go(TJ*CfR!Q?
zgrtBDw|bN~hm&K39DtKEk+VMy6afM1lT;2V0V|V!4qPN7lNf;QK=2*Emc9z`7uvr#
z!V0RtWb=L>6!d=jKSja{mvcIk3=bUvNRuiLEfO%6iEw~0a4dm=NKBoDfCiT-lW7ks
z7n=$uk!XgA?#QHU4ugq(|DkM%vq2Amv#Jk^1_=x{oiK)@U`NEWJ{Gd_0_^~o{|Esb
zHBM)WfdQ9KMy8nuugdd&@CcK9<d1NviK*U5pHMZWxd^S#8cBeS&l;&LT!pCzo3?=*
zmqC|M2>~AgESGQz0ZIWYm%9l8B>`)f;Ryjl0T{O>3IVnP6f`OwfUyOp1t5l#r3HnG
v!Z2WuMVIdk0T~izfPsLg=Z!dxF9DJzvVkp^Gq)NI0Y_R0{A~L3UuqzEb)=s^