Pokémon R/B: logic and location name fixes (ArchipelagoMW#1752)

Corrects incorrect name listed for location in rules.py leading to logic rules failing to apply. Swaps location names for incorrectly-named trainersanity checks in Viridian Gym
MadiMadsen · Apr 23, 2023 · 62a265c · 62a265c
1 parent 67c3076
commit 62a265c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py
@@ -40,7 +40,7 @@ class PokemonRedBlueWorld(World):
     game = "Pokemon Red and Blue"
     option_definitions = pokemon_rb_options
 
-    data_version = 7
+    data_version = 8
     required_client_version = (0, 3, 9)
 
     topology_present = False

diff --git a/worlds/pokemon_rb/locations.py b/worlds/pokemon_rb/locations.py
@@ -708,8 +708,8 @@ def __init__(self, flag):
     LocationData("Viridian Gym", "Cooltrainer M 2", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0_ITEM"], EventFlag(446), inclusion=trainersanity),
     LocationData("Viridian Gym", "Blackbelt 2", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1_ITEM"], EventFlag(445), inclusion=trainersanity),
     LocationData("Viridian Gym", "Tamer 2", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2_ITEM"], EventFlag(440), inclusion=trainersanity),
-    LocationData("Viridian Gym", "Cooltrainer M 3", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5_ITEM"], EventFlag(437), inclusion=trainersanity),
-    LocationData("Viridian Gym", "Blackbelt 3", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4_ITEM"], EventFlag(438), inclusion=trainersanity),
+    LocationData("Viridian Gym", "Blackbelt 3", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5_ITEM"], EventFlag(437), inclusion=trainersanity),
+    LocationData("Viridian Gym", "Cooltrainer M 3", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4_ITEM"], EventFlag(438), inclusion=trainersanity),
     LocationData("Victory Road 1F", "Cooltrainer F", None, rom_addresses["Trainersanity_EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0_ITEM"], EventFlag(15), inclusion=trainersanity),
     LocationData("Victory Road 1F", "Cooltrainer M", None, rom_addresses["Trainersanity_EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1_ITEM"], EventFlag(14), inclusion=trainersanity),
     LocationData("Victory Road 2F", "Blackbelt", None, rom_addresses["Trainersanity_EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0_ITEM"], EventFlag(162), inclusion=trainersanity),

diff --git a/worlds/pokemon_rb/rules.py b/worlds/pokemon_rb/rules.py
@@ -146,7 +146,7 @@ def prize_rule(i):
         "Silph Co 11F - Rocket 2 (Card Key)": lambda state: state.has("Card Key", player),
         "Silph Co 9F - Rocket 2 (Card Key)": lambda state: state.has("Card Key", player),
         "Silph Co 3F - Scientist (Card Key)": lambda state: state.has("Card Key", player),
-        "Route 10 North - Pokemaniac": lambda state: state.pokemon_rb_can_surf(player),
+        "Route 10 - Pokemaniac": lambda state: state.pokemon_rb_can_surf(player),
         "Rocket Hideout B1F - Rocket 5 (Lift Key)": lambda state: state.has("Lift Key", player),
         "Rocket Hideout B4F - Rocket 2 (Lift Key)": lambda state: state.has("Lift Key", player),
         "Rocket Hideout B4F - Rocket 3 (Lift Key)": lambda state: state.has("Lift Key", player),