From 1cd1bfea4dc0eda9976423bfe7dd5b9198e5050b Mon Sep 17 00:00:00 2001 From: PoryGone <98504756+PoryGone@users.noreply.github.com> Date: Wed, 16 Nov 2022 14:20:55 -0500 Subject: [PATCH] SMW: Prevent Killing Bowser on Yoshi Egg Hunt (#1241) * Make Bowser unkillable on Egg Hunt Changed a location name. --- worlds/smw/Names/LocationName.py | 2 +- worlds/smw/Rom.py | 5 ++++- worlds/smw/__init__.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/worlds/smw/Names/LocationName.py b/worlds/smw/Names/LocationName.py index 2b42cd21..cc01b05e 100644 --- a/worlds/smw/Names/LocationName.py +++ b/worlds/smw/Names/LocationName.py @@ -118,7 +118,7 @@ chocolate_island_5_dragon = "Chocolate Island 5 - Dragon Coins" chocolate_ghost_house_exit_1 = "Choco-Ghost House - Normal Exit" chocolate_secret_exit_1 = "Chocolate Secret - Normal Exit" chocolate_fortress = "Chocolate Fortress - Normal Exit" -chocolate_reznor = "Chocolate Fortress Defeat" +chocolate_reznor = "Chocolate Fortress - Boss" chocolate_castle = "#6 Wendy's Castle - Normal Exit" chocolate_koopaling = "#6 Wendy's Castle - Boss" diff --git a/worlds/smw/Rom.py b/worlds/smw/Rom.py index a2534aa6..b55e666c 100644 --- a/worlds/smw/Rom.py +++ b/worlds/smw/Rom.py @@ -824,7 +824,10 @@ def patch_rom(world, rom, player, active_level_dict): # Store all relevant option results in ROM rom.write_byte(0x01BFA0, world.goal[player].value) - rom.write_byte(0x01BFA1, world.bosses_required[player].value) + if world.goal[player].value == 0: + rom.write_byte(0x01BFA1, world.bosses_required[player].value) + else: + rom.write_byte(0x01BFA1, 0x7F) required_yoshi_eggs = max(math.floor( world.number_of_yoshi_eggs[player].value * (world.percentage_of_yoshi_eggs[player].value / 100.0)), 1) rom.write_byte(0x01BFA2, required_yoshi_eggs) diff --git a/worlds/smw/__init__.py b/worlds/smw/__init__.py index 89cc0a87..6accda9c 100644 --- a/worlds/smw/__init__.py +++ b/worlds/smw/__init__.py @@ -41,7 +41,7 @@ class SMWWorld(World): game: str = "Super Mario World" option_definitions = smw_options topology_present = False - data_version = 1 + data_version = 2 required_client_version = (0, 3, 5) item_name_to_id = {name: data.code for name, data in item_table.items()}