Merge branch 'OverworldShuffleDev' into OverworldShuffle

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.0.8
+- All Bonk prize GFX are no longer using the Power Star placeholder GFX
+- Fixed issue with dislaying Key GFX during tablet animations
+- Fixed issue with DPad input being disabled in Pause Menu if an item GFX is on screen
+
 ## 0.3.0.7
 - \~Merged in DR v1.2.0.16~
 - Major overhaul of how item GFX are drawn on screen

OverworldShuffle.py

@@ -7,7 +7,7 @@ from OWEdges import OWTileRegions, OWEdgeGroups, OWEdgeGroupsTerrain, OWExitType
 from OverworldGlitchRules import create_owg_connections
 from Utils import bidict
 
-version_number = '0.3.0.7'
+version_number = '0.3.0.8'
 # branch indicator is intentionally different across branches
 version_branch = ''
 

Rom.py

@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '3c651a38ea79504029c71b382c9c17da'
+RANDOMIZERBASEHASH = '333e288ccb654220c0b492f4bf030e0c'
 
 
 class JsonRom(object):
@@ -1647,7 +1647,8 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
 
     # powder patch: remove the need to leave the screen after powder, since it causes problems for potion shop at race game
     # temporarally we are just nopping out this check we will conver this to a rom fix soon.
-    rom.write_bytes(0x02F539, [0xEA, 0xEA, 0xEA, 0xEA, 0xEA] if world.powder_patch_required[player] else [0xAD, 0xBF, 0x0A, 0xF0, 0x4F])
+    if world.powder_patch_required[player]:
+        rom.write_bytes(0x02F539, [0xEA, 0xEA, 0xEA, 0xEA, 0xEA])
 
     # sprite patches
     rom.write_byte(snes_to_pc(0x0DB7D1), 0x03) # patch apple sprites to not permadeatch like enemies

source/item/FillUtil.py

@@ -835,9 +835,10 @@ pot_items = {
     PotItem.OneRupee: 'Rupee (1)',
     PotItem.FiveRupees: 'Rupees (5)',
     PotItem.Heart: 'Small Heart',
-    PotItem.BigMagic: 'Big Magic',  # fast fill
+    PotItem.BigMagic: 'Big Magic',
     PotItem.SmallMagic: 'Small Magic',
-    PotItem.Chicken: 'Chicken'   # fast fill
+    PotItem.Chicken: 'Chicken',
+    PotItem.Fairy: 'Fairy'
 }
 
 valid_pot_items = {y: x for x, y in pot_items.items()}