From 9f877d8811b3b5f3a7d4da49145fb305a55e41b7 Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 14 May 2021 16:47:47 -0600 Subject: [PATCH] Some bugs fixes --- Main.py | 2 +- RELEASENOTES.md | 4 ++++ Rom.py | 4 ++-- asm/dr_lobby.asm | 4 ++-- data/base2current.bps | Bin 132985 -> 132984 bytes 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Main.py b/Main.py index 6fa74ede..c1f01cc2 100644 --- a/Main.py +++ b/Main.py @@ -27,7 +27,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops from Utils import output_path, parse_player_names -__version__ = '0.4.0.1-u' +__version__ = '0.4.0.2-u' class EnemizerError(RuntimeError): diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 36481d89..4873d28c 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -6,6 +6,10 @@ Thanks to qadan, cheuer, & compiling # Bug Fixes and Notes. +* 0.4.0.2 + * Fixed a bug where Defeat Ganon is not possible + * Fixed the item counter total + * Fixed the bunny state when starting out in Sanc in a dark world dungeon * 0.4.0.1 * Moved stonewall pre-opening to not happen in experimental * Updated baserom diff --git a/Rom.py b/Rom.py index fead9137..6da01207 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '0c27ed494039b6da016678b8741939ed' +RANDOMIZERBASEHASH = '5c5111bcb73b033ddf72be5b8ea08a8e' class JsonRom(object): @@ -782,7 +782,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): | (0x4 if world.retro[player] else 0)) rom.write_byte(0x140001, multiClientFlags) - #write_int16(rom, 0x187010, credits_total) # dynamic credits + write_int16(rom, 0x187010, credits_total) # dynamic credits if credits_total != 216: # collection rate address: cr_address = 0x2391BE diff --git a/asm/dr_lobby.asm b/asm/dr_lobby.asm index cf3ed694..2c1b9c87 100644 --- a/asm/dr_lobby.asm +++ b/asm/dr_lobby.asm @@ -1,7 +1,7 @@ CheckDarkWorldSanc: STA $A0 : STA $048E ; what we wrote over - LDA.l InvertedMode : BNE + - LDA.l SancDarkWorldFlag : BEQ + + LDA.l InvertedMode : AND #$00FF : BNE + + LDA.l SancDarkWorldFlag : AND #$00FF : BEQ + SEP #$30 LDA $A0 : CMP #$12 : BNE ++ LDA.l $7EF357 : BNE ++ ; moon pearl? diff --git a/data/base2current.bps b/data/base2current.bps index 8de8042ade4765f2a8f1d0ddd709c41b167b1286..8a0d34e2b68d60947b14ed1e98fab8af3dacd692 100644 GIT binary patch delta 103 zcmV-t0GR*zjtKaU2(UE)1QX8eF|#=V)T#`X$so|!fYg>1Vxpas8mw^x1{i{~j;xGC z6`6Wqg`ka&1fzf0jjsUzCzBBhfYFmL@fHm&E{=u5FfW}l1A>