ROM Updates

- Fix Bonk count capping at 99 in credits
- Fix Hera boss music still plays after boss defeated
- Fixed Murahdahla in Rainstate

ItemList.py

@@ -1270,7 +1270,20 @@ def make_custom_item_pool(world, player, progressive, shuffle, difficulty, timer
     itemtotal = itemtotal + customitemarray["generickeys"]
 
     customitems = [
-      "Bow", "Silver Arrows", "Blue Boomerang", "Red Boomerang", "Hookshot", "Mushroom", "Magic Powder", "Fire Rod", "Ice Rod", "Bombos", "Ether", "Quake", "Lamp", "Hammer", "Shovel", "Ocarina", "Bug Catching Net", "Book of Mudora", "Cane of Somaria", "Cane of Byrna", "Cape", "Pegasus Boots", "Power Glove", "Titans Mitts", "Progressive Glove", "Flippers", "Piece of Heart", "Boss Heart Container", "Sanctuary Heart Container", "Master Sword", "Tempered Sword", "Golden Sword", "Blue Shield", "Red Shield", "Mirror Shield", "Progressive Shield", "Blue Mail", "Red Mail", "Progressive Armor", "Magic Upgrade (1/2)", "Magic Upgrade (1/4)", "Bomb Upgrade (+5)", "Bomb Upgrade (+10)", "Arrow Upgrade (+5)", "Arrow Upgrade (+10)", "Single Arrow", "Arrows (10)", "Single Bomb", "Bombs (3)", "Rupee (1)", "Rupees (5)", "Rupees (20)", "Rupees (50)", "Rupees (100)", "Rupees (300)", "Rupoor", "Blue Clock", "Green Clock", "Red Clock", "Progressive Bow", "Bombs (10)", "Triforce Piece", "Triforce"
+      "Bow", "Silver Arrows", "Blue Boomerang", "Red Boomerang", "Hookshot", "Mushroom", "Magic Powder",
+      "Fire Rod", "Ice Rod", "Bombos", "Ether", "Quake",
+      "Lamp", "Hammer", "Shovel", "Ocarina", "Bug Catching Net", "Book of Mudora",
+      "Cane of Somaria", "Cane of Byrna", "Cape",
+      "Pegasus Boots", "Power Glove", "Titans Mitts", "Progressive Glove", "Flippers",
+      "Piece of Heart", "Boss Heart Container", "Sanctuary Heart Container",
+      "Master Sword", "Tempered Sword", "Golden Sword",
+      "Blue Shield", "Red Shield", "Mirror Shield", "Progressive Shield",
+      "Blue Mail", "Red Mail", "Progressive Armor", "Magic Upgrade (1/2)", "Magic Upgrade (1/4)",
+      "Bomb Upgrade (+5)", "Bomb Upgrade (+10)", "Arrow Upgrade (+5)", "Arrow Upgrade (+10)",
+      "Single Arrow", "Arrows (10)", "Single Bomb", "Bombs (3)", "Bombs (10)",
+      "Rupee (1)", "Rupees (5)", "Rupees (20)", "Rupees (50)", "Rupees (100)", "Rupees (300)", "Rupoor",
+      "Blue Clock", "Green Clock", "Red Clock",
+      "Progressive Bow", "Triforce Piece", "Triforce"
     ]
     for customitem in customitems:
         pool.extend([customitem] * customitemarray[get_custom_array_key(customitem)])

Rom.py

@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '333e288ccb654220c0b492f4bf030e0c'
+RANDOMIZERBASEHASH = '31a41e7a988597917f12db7107886607'
 
 
 class JsonRom(object):

Text.py

@@ -2020,6 +2020,6 @@ class TextTable(object):
         text['ganon_phase_3_no_silvers_alt'] = CompressedTextMapper.convert("You can't best me without silver arrows!")
         text['ganon_phase_3_no_silvers'] = CompressedTextMapper.convert("You can't best me without silver arrows!")
         text['ganon_phase_3_silvers'] = CompressedTextMapper.convert("Oh no! Silver! My one true weakness!")
-        text['murahdahla'] = CompressedTextMapper.convert("Hello @. I\nam Murahdahla, brother of\nSahasrahla and Aginah. Behold the power of\ninvisibility.\n{PAUSE3}\n… … …\nWait! you can see me? I knew I should have\nhidden in  a hollow tree.")
+        text['murahdahla'] = CompressedTextMapper.convert("Hello @. I\nam Murahdahla, brother of\nSahasrahla and Aginah. Behold the power of\ninvisibility.\n{PAUSE3}\n… … …\nWait! You can see me? I knew I should have\nhidden in a hollow tree.")
         text['end_pad_data'] = bytearray([0xfb])
         text['terminator'] = bytearray([0xFF, 0xFF])

asm/owrando.asm

@@ -968,9 +968,7 @@ OWNewDestination:
 OWLoadSpecialArea:
 {
     LDA.l Overworld_LoadSpecialOverworld_RoomId,X : STA.b $A0
-    CMP.w #$0182 : BNE +
+    JSL Overworld_LoadSpecialOverworld ; sets M and X flags
-        JSL ZoraSplashGfxFix
-    + JSL Overworld_LoadSpecialOverworld ; sets M and X flags
     TYX
     LDY.b #$00
     CPX.b #$01 : BNE + ; check if going to water transition