Fix for capacity shop and hobo splash interaction

.github/workflows/ci.yml

@@ -2,7 +2,13 @@
 name: Build
 
 # fire on
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+      - DoorDev
+  pull_request:
+    branches:
+      - DoorDev
 
 # stuff to do
 jobs:

Main.py

@@ -19,16 +19,18 @@ from Doors import create_doors
 from DoorShuffle import link_doors
 from RoomData import create_rooms
 from Rules import set_rules
-from Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive, dungeon_regions
+from Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive
 from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items, balance_multiworld_progression
 from ItemList import generate_itempool, difficulties, fill_prizes
-from Utils import output_path, parse_player_names, print_wiki_doors_by_region, print_wiki_doors_by_room
+from Utils import output_path, parse_player_names
+
+__version__ = '0.0.20.1u'
 
-__version__ = '0.0.20dev'
 
 class EnemizerError(RuntimeError):
     pass
 
+
 def main(args, seed=None, fish=None):
     if args.outputpath:
         os.makedirs(args.outputpath, exist_ok=True)

Rom.py

@@ -22,7 +22,7 @@ from EntranceShuffle import door_addresses, exit_ids
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '5e01caffabb4509a0987ef2f2f0bcd56'
+RANDOMIZERBASEHASH = '35153af01c45841b5a3f4d9c341a7887'
 
 
 class JsonRom(object):

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

asm/overrides.asm

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