From d606a84c35a5e5af6bd2c8e881c0afde2a20ad10 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 12 May 2023 21:31:24 -0500 Subject: [PATCH] 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 | 15 ++++++++++++++- Rom.py | 2 +- Text.py | 2 +- asm/owrando.asm | 4 +--- data/base2current.bps | Bin 107092 -> 107085 bytes 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ItemList.py b/ItemList.py index 437e422e..a2dd7552 100644 --- a/ItemList.py +++ b/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)]) diff --git a/Rom.py b/Rom.py index dc955bda..29d0d0c1 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '333e288ccb654220c0b492f4bf030e0c' +RANDOMIZERBASEHASH = '31a41e7a988597917f12db7107886607' class JsonRom(object): diff --git a/Text.py b/Text.py index bf4f22cb..e3614056 100644 --- a/Text.py +++ b/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]) diff --git a/asm/owrando.asm b/asm/owrando.asm index 166aa1e0..d74718dd 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -968,9 +968,7 @@ OWNewDestination: OWLoadSpecialArea: { LDA.l Overworld_LoadSpecialOverworld_RoomId,X : STA.b $A0 - CMP.w #$0182 : BNE + - JSL ZoraSplashGfxFix - + JSL Overworld_LoadSpecialOverworld ; sets M and X flags + JSL Overworld_LoadSpecialOverworld ; sets M and X flags TYX LDY.b #$00 CPX.b #$01 : BNE + ; check if going to water transition diff --git a/data/base2current.bps b/data/base2current.bps index e6fe5db2ed9421aaa85e2d587be04fdfc66f977c..7c4263d9c2eef6aae47ffd0d16ddf328b0e5257d 100644 GIT binary patch delta 3805 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