Fix for capacity shop and hobo splash interaction

2020-03-25 15:52:57 -06:00
parent 0b13db754d
commit e5a1c59f85
6 changed files with 23 additions and 7 deletions
--- a/asm/drhooks.asm
+++ b/asm/drhooks.asm
@@ -78,6 +78,9 @@ jsl MirrorCheckOverride2
 org $20825c
 jsl MirrorCheckOverride2

+org $02b82a
+jsl FixShopCode
+

 ; These two, if enabled together, have implications for vanilla BK doors in IP/Hera/Mire
 ; IPBJ is common enough to consider not doing this. Mire is not a concern for vanilla - maybe glitched modes
--- a/asm/overrides.asm
+++ b/asm/overrides.asm
@@ -50,4 +50,9 @@ MirrorCheckOverride:
    + lda DRScroll : rtl

 MirrorCheckOverride2:
-    lda $7ef353 : and #$02 : rtl
+    lda $7ef353 : and #$02 : rtl
+
+FixShopCode:
+    cpx #$300 : !bge +
+        sta $7ef000, x
+    + rtl