diff --git a/worlds/pokemon_rb/basepatch_blue.bsdiff4 b/worlds/pokemon_rb/basepatch_blue.bsdiff4 index e7d1ff96..b7bdda7f 100644 Binary files a/worlds/pokemon_rb/basepatch_blue.bsdiff4 and b/worlds/pokemon_rb/basepatch_blue.bsdiff4 differ diff --git a/worlds/pokemon_rb/basepatch_red.bsdiff4 b/worlds/pokemon_rb/basepatch_red.bsdiff4 index 9e95d5e3..51440789 100644 Binary files a/worlds/pokemon_rb/basepatch_red.bsdiff4 and b/worlds/pokemon_rb/basepatch_red.bsdiff4 differ diff --git a/worlds/pokemon_rb/options.py b/worlds/pokemon_rb/options.py index 4176e94f..794977d3 100644 --- a/worlds/pokemon_rb/options.py +++ b/worlds/pokemon_rb/options.py @@ -297,8 +297,8 @@ class DexSanity(SpecialRange): range_start = 0 range_end = 100 special_range_names = { - "false": 0, - "true": 100 + "disabled": 0, + "full": 100 } diff --git a/worlds/pokemon_rb/rom.py b/worlds/pokemon_rb/rom.py index ef63e6b5..0757d334 100644 --- a/worlds/pokemon_rb/rom.py +++ b/worlds/pokemon_rb/rom.py @@ -353,9 +353,9 @@ def generate_output(self, output_directory: str): if self.multiworld.old_man[self.player] == "open_viridian_city": data[rom_addresses['Option_Old_Man']] = 0x11 data[rom_addresses['Option_Old_Man_Lying']] = 0x15 - data[rom_addresses['Option_Route3_Guard_A']] = self.multiworld.route_3_condition[self.player].value + data[rom_addresses['Option_Route3_Guard_B']] = self.multiworld.route_3_condition[self.player].value if self.multiworld.route_3_condition[self.player] == "open": - data[rom_addresses['Option_Route3_Guard_B']] = 0x11 + data[rom_addresses['Option_Route3_Guard_A']] = 0x11 if not self.multiworld.robbed_house_officer[self.player]: data[rom_addresses['Option_Trashed_House_Guard_A']] = 0x15 data[rom_addresses['Option_Trashed_House_Guard_B']] = 0x11