Pokemon R/B: Version 3 final touches (ArchipelagoMW#1542)

* Pokémon R/B: Dexsanity balls * Pokémon R/B: Early Parcel improvement * Pokémon R/B: Early Parcel dexsanity stuff only when dexsanity
t3hf1gm3nt · Mar 14, 2023 · 4b7033f · 4b7033f
1 parent 37499b4
commit 4b7033f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py
@@ -287,8 +287,12 @@ def intervene(move):
             else:
                 break
 
-        if self.multiworld.old_man[self.player].value == 1:
+        if self.multiworld.old_man[self.player] == "early_parcel":
             self.multiworld.local_early_items[self.player]["Oak's Parcel"] = 1
+            if self.multiworld.dexsanity[self.player]:
+                for location in [self.multiworld.get_location(f"Pokedex - {mon}", self.player)
+                                 for mon in poke_data.pokemon_data.keys()]:
+                    add_item_rule(location, lambda item: item.name != "Oak's Parcel" or item.player != self.player)
 
         if not self.multiworld.badgesanity[self.player].value:
             self.multiworld.non_local_items[self.player].value -= self.item_name_groups["Badges"]

diff --git a/worlds/pokemon_rb/locations.py b/worlds/pokemon_rb/locations.py
@@ -753,8 +753,9 @@ def __init__(self, flag):
     LocationData("Celadon Game Corner", "Hidden Item at End of Horizontal Machine Row (Coin Case)", "20 Coins", rom_addresses["Hidden_Item_Game_Corner_10"], Hidden(63), inclusion=hidden_items),
     LocationData("Celadon Game Corner", "Hidden Item in Front of Horizontal Machine Row (Coin Case)", "100 Coins", rom_addresses["Hidden_Item_Game_Corner_11"], Hidden(64), inclusion=hidden_items),
 
-    *[LocationData("Pokedex", mon, None, rom_addresses["Dexsanity_Items"] + i, DexSanityFlag(i),
-                   type="Item", inclusion=dexsanity) for (mon, i) in zip(pokemon_data.keys(), range(0, 152))],
+    *[LocationData("Pokedex", mon, ball, rom_addresses["Dexsanity_Items"] + i, DexSanityFlag(i), type="Item",
+                   inclusion=dexsanity) for (mon, i, ball) in zip(pokemon_data.keys(), range(0, 152),
+                                                                  ["Poke Ball", "Great Ball", "Ultra Ball"]* 51)],
 
     LocationData("Indigo Plateau", "Become Champion", "Become Champion", event=True),
     LocationData("Pokemon Tower 7F", "Fuji Saved", "Fuji Saved", event=True),