Pokémon R/B: Fix move intervention (ArchipelagoMW#2687)

Jouramie · Feb 28, 2024 · cedb116 · cedb116
1 parent 6855b64
commit cedb116
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py
@@ -353,7 +353,9 @@ def pre_fill(self) -> None:
                 location.show_in_spoiler = False
 
         def intervene(move, test_state):
-            if self.multiworld.randomize_wild_pokemon[self.player]:
+            move_bit = pow(2, poke_data.hm_moves.index(move) + 2)
+            viable_mons = [mon for mon in self.local_poke_data if self.local_poke_data[mon]["tms"][6] & move_bit]
+            if self.multiworld.randomize_wild_pokemon[self.player] and viable_mons:
                 accessible_slots = [loc for loc in self.multiworld.get_reachable_locations(test_state, self.player) if
                                     loc.type == "Wild Encounter"]
 
@@ -363,8 +365,6 @@ def number_of_zones(mon):
                         zones.add(loc.name.split(" - ")[0])
                     return len(zones)
 
-                move_bit = pow(2, poke_data.hm_moves.index(move) + 2)
-                viable_mons = [mon for mon in self.local_poke_data if self.local_poke_data[mon]["tms"][6] & move_bit]
                 placed_mons = [slot.item.name for slot in accessible_slots]
 
                 if self.multiworld.area_1_to_1_mapping[self.player]: