From d3cde6c90157e1645cd8a19b9a634f3a21caf9a9 Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 9 Nov 2020 16:13:29 -0700 Subject: [PATCH] Messing around with HC/Sewer ID Compass code uses original addresses --- Rom.py | 13 ++++++++----- asm/overrides.asm | 2 +- data/base2current.bps | Bin 130841 -> 130847 bytes 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Rom.py b/Rom.py index 9270200a..f4fbeba4 100644 --- a/Rom.py +++ b/Rom.py @@ -24,7 +24,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'fb2886fc00a7736369ce6ba90b526bc9' +RANDOMIZERBASEHASH = '16fab813f3cbef58c66a47595a3858ee' class JsonRom(object): @@ -629,7 +629,7 @@ def patch_rom(world, rom, player, team, enemized): dr_flags |= DROptions.Rails - # fix hc big key problems + # fix hc big key problems (map and compass too) if world.doorShuffle[player] == 'crossed' or world.keydropshuffle[player]: rom.write_byte(0x151f1, 2) rom.write_byte(0x15270, 2) @@ -714,6 +714,8 @@ def patch_rom(world, rom, player, team, enemized): # bot: $7A is 1, 7B is 2, etc so 7D=4, 82=9 (zero unknown...) return 0x53+num, 0x79+num + # collection rate address: 238C37 + if world.keydropshuffle[player]: rom.write_byte(0x140000, 1) mid_top, mid_bot = credits_digit(4) @@ -1388,9 +1390,10 @@ def patch_rom(world, rom, player, team, enemized): rom.write_byte(0xFED31, 0x2A) # preopen bombable exit rom.write_byte(0xFEE41, 0x2A) # preopen bombable exit - for room in world.rooms: - if room.player == player and room.modified: - rom.write_bytes(room.address(), room.rom_data()) + if world.doorShuffle[player] != 'vanilla' or world.keydropshuffle[player]: + for room in world.rooms: + if room.player == player and room.modified: + rom.write_bytes(room.address(), room.rom_data()) write_strings(rom, world, player, team) diff --git a/asm/overrides.asm b/asm/overrides.asm index 00984494..02955978 100644 --- a/asm/overrides.asm +++ b/asm/overrides.asm @@ -11,7 +11,7 @@ LampCheckOverride: LDA $7EF3CA : BNE + .lightWorld - LDA $040C : CMP.b #$02 : BNE ++ ; check if we're in HC + LDA $040C : CMP.b #$04 : !BGE ++ ; check if we're in HC LDA LampConeSewers : BRA .done ++ LDA LampConeLightWorld : BRA .done diff --git a/data/base2current.bps b/data/base2current.bps index c53e557860881e053110e53fa3fea05d6659feea..2f26469040c50fccadca8826c04124e317eb80c0 100644 GIT binary patch delta 1546 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