From f840ed3a9416eed6e1ace1cf617021974e96bee8 Mon Sep 17 00:00:00 2001 From: Alchav <59858495+Alchav@users.noreply.github.com> Date: Thu, 23 Nov 2023 13:17:09 -0500 Subject: [PATCH] =?UTF-8?q?Pok=C3=A9mon=20R/B:=20Fix=20trainer=20regions?= =?UTF-8?q?=20(#2474)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix Mt Moon B2F trainer regions * Fix Trainer Party regions --- worlds/pokemon_rb/locations.py | 91 +++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 39 deletions(-) diff --git a/worlds/pokemon_rb/locations.py b/worlds/pokemon_rb/locations.py index 4f1b55a0..3fff3b88 100644 --- a/worlds/pokemon_rb/locations.py +++ b/worlds/pokemon_rb/locations.py @@ -502,8 +502,8 @@ location_data = [ LocationData("Mt Moon 1F", "Lass 2", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_1_TRAINER_2_ITEM"], EventFlag(134), inclusion=trainersanity), LocationData("Mt Moon 1F", "Youngster", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_1_TRAINER_1_ITEM"], EventFlag(135), inclusion=trainersanity), LocationData("Mt Moon 1F", "Hiker", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_1_TRAINER_0_ITEM"], EventFlag(136), inclusion=trainersanity), - LocationData("Mt Moon B2F-NE", "Rocket 1", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_1_ITEM"], EventFlag(127), inclusion=trainersanity), - LocationData("Mt Moon B2F-C", "Rocket 2", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_2_ITEM"], EventFlag(126), inclusion=trainersanity), + LocationData("Mt Moon B2F-C", "Rocket 1", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_1_ITEM"], EventFlag(127), inclusion=trainersanity), + LocationData("Mt Moon B2F-NE", "Rocket 2", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_2_ITEM"], EventFlag(126), inclusion=trainersanity), LocationData("Mt Moon B2F", "Rocket 3", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_3_ITEM"], EventFlag(125), inclusion=trainersanity), LocationData("Mt Moon B2F", "Rocket 4", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_0_ITEM"], EventFlag(128), inclusion=trainersanity), LocationData("Viridian Forest", "Bug Catcher 1", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0_ITEM"], EventFlag(139), inclusion=trainersanity), @@ -2310,43 +2310,50 @@ trainer_data = { 'Cerulean Gym': [{'level': 19, 'party': ['Goldeen'], 'party_address': 'Trainer_Party_Cerulean_Gym_JrTrainerF_A'}, {'level': 16, 'party': ['Horsea', 'Shellder'], 'party_address': 'Trainer_Party_Cerulean_Gym_Swimmer_A'}, - {'level': [18, 21], 'party': ['Staryu', 'Starmie'], 'party_address': 'Trainer_Party_Misty_A'},], 'Route 10-N': [ ### - {'level': 20, 'party': ['Pikachu', 'Clefairy'], 'party_address': 'Trainer_Party_Route_10_JrTrainerF_A'}, + {'level': [18, 21], 'party': ['Staryu', 'Starmie'], 'party_address': 'Trainer_Party_Misty_A'},], + 'Route 10-N': [{'level': 20, 'party': ['Pikachu', 'Clefairy'], 'party_address': 'Trainer_Party_Route_10_JrTrainerF_A'}], + 'Route 10-C': [ + {'level': 30, 'party': ['Rhyhorn', 'Lickitung'], 'party_address': 'Trainer_Party_Route_10_Pokemaniac_A'}], + 'Route 10-S': [ {'level': 21, 'party': ['Pidgey', 'Pidgeotto'], 'party_address': 'Trainer_Party_Route_10_JrTrainerF_B'}, - {'level': 30, 'party': ['Rhyhorn', 'Lickitung'], 'party_address': 'Trainer_Party_Route_10_Pokemaniac_A'}, {'level': 20, 'party': ['Cubone', 'Slowpoke'], 'party_address': 'Trainer_Party_Route_10_Pokemaniac_B'}, {'level': 21, 'party': ['Geodude', 'Onix'], 'party_address': 'Trainer_Party_Route_10_Hiker_A'}, {'level': 19, 'party': ['Onix', 'Graveler'], 'party_address': 'Trainer_Party_Route_10_Hiker_B'}], - 'Rock Tunnel B1F-E': [{'level': 21, 'party': ['Jigglypuff', 'Pidgey', 'Meowth'], ### + 'Rock Tunnel B1F-W': [{'level': 21, 'party': ['Jigglypuff', 'Pidgey', 'Meowth'], 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_JrTrainerF_A'}, - {'level': 22, 'party': ['Oddish', 'Bulbasaur'], - 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_JrTrainerF_B'}, {'level': 20, 'party': ['Slowpoke', 'Slowpoke', 'Slowpoke'], 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Pokemaniac_A'}, - {'level': 22, 'party': ['Charmander', 'Cubone'], - 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Pokemaniac_B'}, - {'level': 25, 'party': ['Slowpoke'], - 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Pokemaniac_C'}, {'level': 21, 'party': ['Geodude', 'Geodude', 'Graveler'], - 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_A'}, - {'level': 25, 'party': ['Geodude'], 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_B'}, - {'level': 20, 'party': ['Machop', 'Onix'], - 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_D'}], 'Route 13': [ + 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_A'},], + 'Rock Tunnel B1F-E': [ + {'level': 22, 'party': ['Oddish', 'Bulbasaur'], + 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_JrTrainerF_B'}, + {'level': 22, 'party': ['Charmander', 'Cubone'], + 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Pokemaniac_B'}, + {'level': 25, 'party': ['Slowpoke'], + 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Pokemaniac_C'}, + {'level': 25, 'party': ['Geodude'], 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_B'}, + {'level': 20, 'party': ['Machop', 'Onix'], + 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_D'}], + 'Route 13-E': [ + {'level': 28, 'party': ['Goldeen', 'Poliwag', 'Horsea'], + 'party_address': 'Trainer_Party_Route_13_JrTrainerF_D'}, + {'level': 29, 'party': ['Pidgey', 'Pidgeotto'], 'party_address': 'Trainer_Party_Route_13_BirdKeeper_A'}, {'level': 24, 'party': ['Pidgey', 'Meowth', 'Rattata', 'Pikachu', 'Meowth'], 'party_address': 'Trainer_Party_Route_13_JrTrainerF_A'}, + ], + 'Route 13': [ {'level': 30, 'party': ['Poliwag', 'Poliwag'], 'party_address': 'Trainer_Party_Route_13_JrTrainerF_B'}, {'level': 27, 'party': ['Pidgey', 'Meowth', 'Pidgey', 'Pidgeotto'], 'party_address': 'Trainer_Party_Route_13_JrTrainerF_C'}, - {'level': 28, 'party': ['Goldeen', 'Poliwag', 'Horsea'], - 'party_address': 'Trainer_Party_Route_13_JrTrainerF_D'}, {'level': 28, 'party': ['Koffing', 'Koffing', 'Koffing'], 'party_address': 'Trainer_Party_Route_13_Biker_A'}, {'level': 27, 'party': ['Rattata', 'Pikachu', 'Rattata'], 'party_address': 'Trainer_Party_Route_13_Beauty_A'}, {'level': 29, 'party': ['Clefairy', 'Meowth'], 'party_address': 'Trainer_Party_Route_13_Beauty_B'}, - {'level': 29, 'party': ['Pidgey', 'Pidgeotto'], 'party_address': 'Trainer_Party_Route_13_BirdKeeper_A'}, {'level': 25, 'party': ['Spearow', 'Pidgey', 'Pidgey', 'Spearow', 'Spearow'], 'party_address': 'Trainer_Party_Route_13_BirdKeeper_B'}, {'level': 26, 'party': ['Pidgey', 'Pidgeotto', 'Spearow', 'Fearow'], 'party_address': 'Trainer_Party_Route_13_BirdKeeper_C'}], + 'Route 20-E': [ {'level': 31, 'party': ['Shellder', 'Cloyster'], 'party_address': 'Trainer_Party_Route_20_Swimmer_A'}, {'level': 28, 'party': ['Horsea', 'Horsea', 'Seadra', 'Horsea'], @@ -2354,9 +2361,9 @@ trainer_data = { 'party_address': 'Trainer_Party_Route_20_Swimmer_C'}, {'level': 30, 'party': ['Seadra', 'Horsea', 'Seadra'], - 'party_address': 'Trainer_Party_Route_20_Beauty_E'}], + 'party_address': 'Trainer_Party_Route_20_Beauty_E'}, + {'level': 35, 'party': ['Seaking'], 'party_address': 'Trainer_Party_Route_20_Beauty_A'},], 'Route 20-W': [ - {'level': 35, 'party': ['Seaking'], 'party_address': 'Trainer_Party_Route_20_Beauty_A'}, {'level': 31, 'party': ['Goldeen', 'Seaking'], 'party_address': 'Trainer_Party_Route_20_JrTrainerF_A'}, {'level': 30, 'party': ['Tentacool', 'Horsea', 'Seel'], 'party_address': 'Trainer_Party_Route_20_JrTrainerF_C'}, @@ -2374,16 +2381,19 @@ trainer_data = { {'level': 20, 'party': ['Meowth', 'Oddish', 'Pidgey'], 'party_address': 'Trainer_Party_Rock_Tunnel_1F_JrTrainerF_B'}, {'level': 19, 'party': ['Pidgey', 'Rattata', 'Rattata', 'Bellsprout'], - 'party_address': 'Trainer_Party_Rock_Tunnel_1F_JrTrainerF_C'}, - {'level': 23, 'party': ['Cubone', 'Slowpoke'], 'party_address': 'Trainer_Party_Rock_Tunnel_1F_Pokemaniac_A'}, + 'party_address': 'Trainer_Party_Rock_Tunnel_1F_JrTrainerF_C'}], + 'Rock Tunnel 1F-NE': [ + {'level': 23, 'party': ['Cubone', 'Slowpoke'], 'party_address': 'Trainer_Party_Rock_Tunnel_1F_Pokemaniac_A'}], + 'Rock Tunnel 1F-NW': [ {'level': 19, 'party': ['Geodude', 'Machop', 'Geodude', 'Geodude'], 'party_address': 'Trainer_Party_Rock_Tunnel_1F_Hiker_A'}, {'level': 20, 'party': ['Onix', 'Onix', 'Geodude'], 'party_address': 'Trainer_Party_Rock_Tunnel_1F_Hiker_B'}, {'level': 21, 'party': ['Geodude', 'Graveler'], 'party_address': 'Trainer_Party_Rock_Tunnel_1F_Hiker_C'}], + 'Route 15-N': [ + {'level': 33, 'party': ['Clefairy'], 'party_address': 'Trainer_Party_Route_15_JrTrainerF_C'}], 'Route 15': [ {'level': 28, 'party': ['Gloom', 'Oddish', 'Oddish'], 'party_address': 'Trainer_Party_Route_15_JrTrainerF_A'}, {'level': 29, 'party': ['Pikachu', 'Raichu'], 'party_address': 'Trainer_Party_Route_15_JrTrainerF_B'}, - {'level': 33, 'party': ['Clefairy'], 'party_address': 'Trainer_Party_Route_15_JrTrainerF_C'}, {'level': 29, 'party': ['Bellsprout', 'Oddish', 'Tangela'], 'party_address': 'Trainer_Party_Route_15_JrTrainerF_D'}, {'level': 25, 'party': ['Koffing', 'Koffing', 'Weezing', 'Koffing', 'Grimer'], @@ -2394,15 +2404,16 @@ trainer_data = { {'level': 26, 'party': ['Pidgeotto', 'Farfetchd', 'Doduo', 'Pidgey'], 'party_address': 'Trainer_Party_Route_15_BirdKeeper_A'}, {'level': 28, 'party': ['Dodrio', 'Doduo', 'Doduo'], 'party_address': 'Trainer_Party_Route_15_BirdKeeper_B'}], - 'Victory Road 2F-C': [{'level': 40, 'party': ['Charmeleon', 'Lapras', 'Lickitung'], ### - 'party_address': 'Trainer_Party_Victory_Road_2F_Pokemaniac_A'}, - {'level': 41, 'party': ['Drowzee', 'Hypno', 'Kadabra', 'Kadabra'], - 'party_address': 'Trainer_Party_Victory_Road_2F_Juggler_A'}, - {'level': 48, 'party': ['Mr Mime'], 'party_address': 'Trainer_Party_Victory_Road_2F_Juggler_C'}, - {'level': 44, 'party': ['Persian', 'Golduck'], - 'party_address': 'Trainer_Party_Victory_Road_2F_Tamer_A'}, - {'level': 43, 'party': ['Machoke', 'Machop', 'Machoke'], - 'party_address': 'Trainer_Party_Victory_Road_2F_Blackbelt_A'}], 'Mt Moon B2F': [ + 'Victory Road 2F-NW': [{'level': 40, 'party': ['Charmeleon', 'Lapras', 'Lickitung'], + 'party_address': 'Trainer_Party_Victory_Road_2F_Pokemaniac_A'}], + 'Victory Road 2F-C': [ + {'level': 41, 'party': ['Drowzee', 'Hypno', 'Kadabra', 'Kadabra'], + 'party_address': 'Trainer_Party_Victory_Road_2F_Juggler_A'}, + {'level': 48, 'party': ['Mr Mime'], 'party_address': 'Trainer_Party_Victory_Road_2F_Juggler_C'}, + {'level': 44, 'party': ['Persian', 'Golduck'], + 'party_address': 'Trainer_Party_Victory_Road_2F_Tamer_A'}, + {'level': 43, 'party': ['Machoke', 'Machop', 'Machoke'], + 'party_address': 'Trainer_Party_Victory_Road_2F_Blackbelt_A'}], 'Mt Moon B2F': [ {'level': 12, 'party': ['Grimer', 'Voltorb', 'Koffing'], 'party_address': 'Trainer_Party_Mt_Moon_B2F_SuperNerd_A'}, {'level': 13, 'party': ['Rattata', 'Zubat'], 'party_address': 'Trainer_Party_Mt_Moon_B2F_Rocket_A'}, @@ -2585,7 +2596,7 @@ trainer_data = { ['Pidgeotto', 'Abra', 'Rattata', 'Charmander']], 'party_address': ['Trainer_Party_Cerulean_City_Green1_A', 'Trainer_Party_Cerulean_City_Green1_B', 'Trainer_Party_Cerulean_City_Green1_C']}, {'level': 17, 'party': ['Machop', 'Drowzee'], - 'party_address': 'Trainer_Party_Cerulean_City_Rocket_A'}], 'Pokemon Mansion 1F': [ + 'party_address': 'Trainer_Party_Cerulean_City_Rocket_A'}], 'Pokemon Mansion 1F-SE': [ {'level': 29, 'party': ['Electrode', 'Weezing'], 'party_address': 'Trainer_Party_Mansion_1F_Scientist_A'}], 'Silph Co 2F-SW': [{'level': 26, 'party': ['Grimer', 'Weezing', 'Koffing', 'Weezing'], 'party_address': 'Trainer_Party_Silph_Co_2F_Scientist_A'}], @@ -2595,7 +2606,7 @@ trainer_data = { {'level': 25, 'party': ['Golbat', 'Zubat', 'Zubat', 'Raticate', 'Zubat'], 'party_address': 'Trainer_Party_Silph_Co_2F_Rocket_B'}], 'Silph Co 3F-W': [ {'level': 29, 'party': ['Electrode', 'Weezing'], 'party_address': 'Trainer_Party_Silph_Co_3F_Scientist_A'}], - 'Silph Co 3F': [ {'level': 28, 'party': ['Raticate', 'Hypno', 'Raticate'], + 'Silph Co 3F': [{'level': 28, 'party': ['Raticate', 'Hypno', 'Raticate'], 'party_address': 'Trainer_Party_Silph_Co_3F_Rocket_A'}], 'Silph Co 4F-N': [{'level': 33, 'party': ['Electrode'], 'party_address': 'Trainer_Party_Silph_Co_4F_Scientist_A'}], 'Silph Co 4F': [{'level': 29, 'party': ['Machop', 'Drowzee'], @@ -2670,15 +2681,17 @@ trainer_data = { {'level': 26, 'party': ['Koffing', 'Drowzee'], 'party_address': 'Trainer_Party_Pokemon_Tower_7F_Rocket_B'}, {'level': 23, 'party': ['Zubat', 'Rattata', 'Raticate', 'Zubat'], - 'party_address': 'Trainer_Party_Pokemon_Tower_7F_Rocket_C'}], 'Victory Road 3F': [ - {'level': 43, 'party': ['Exeggutor', 'Cloyster', 'Arcanine'], + 'party_address': 'Trainer_Party_Pokemon_Tower_7F_Rocket_C'}], + 'Victory Road 3F': [{'level': 43, 'party': ['Exeggutor', 'Cloyster', 'Arcanine'], 'party_address': 'Trainer_Party_Victory_Road_3F_CooltrainerM_A'}, + {'level': 43, 'party': ['Parasect', 'Dewgong', 'Chansey'], + 'party_address': 'Trainer_Party_Victory_Road_3F_CooltrainerF_B'}], + 'Victory Road 3F-S': [ {'level': 43, 'party': ['Kingler', 'Tentacruel', 'Blastoise'], 'party_address': 'Trainer_Party_Victory_Road_3F_CooltrainerM_B'}, {'level': 43, 'party': ['Bellsprout', 'Weepinbell', 'Victreebel'], 'party_address': 'Trainer_Party_Victory_Road_3F_CooltrainerF_A'}, - {'level': 43, 'party': ['Parasect', 'Dewgong', 'Chansey'], - 'party_address': 'Trainer_Party_Victory_Road_3F_CooltrainerF_B'}], 'Victory Road 1F': [ +], 'Victory Road 1F': [ {'level': 42, 'party': ['Ivysaur', 'Wartortle', 'Charmeleon', 'Charizard'], 'party_address': 'Trainer_Party_Victory_Road_1F_CooltrainerM_A'}, {'level': 44, 'party': ['Persian', 'Ninetales'],