[Pokemon] Fixes and updates (#1108)

* [Pokemon] Logic fixes

* [Pokemon] Fix seed name length

* [Pokemon] Location name changes

* [Pokemon] Hidden Item Nurse Bed logic fix

* Badges Needed description update

* Ensure player name does not exceed 16 bytes

* Player name check fix

* Remove unique items in start_inventory from item pool

* Vending Machine Drinks will not be created as filler

* Skip trainer text

* Badges needed for viridian gym text

* Add slot data for trackers

* free fly map in slot data and old_man = vanilla allows more free fly maps

* Re-add mistakenly removed slot data item

* Add tracker link to setup doc

* Doc fix

* Fix base patch

* Change pre_fill to generate_basic so items are pre-filled before item links

* Rename some hidden locations

* missing file from commit and revert one errant location name change

worlds/pokemon_rb/rules.py

@@ -73,12 +73,12 @@ def set_rules(world, player):
         "Anywhere - Good Rod Pokemon - 1": lambda state: state.has("Good Rod", player),
         "Anywhere - Good Rod Pokemon - 2": lambda state: state.has("Good Rod", player),
         "Anywhere - Old Rod Pokemon": lambda state: state.has("Old Rod", player),
-        "Celadon Prize Corner - Pokemon Prize - 1":  lambda state: state.has("Coin Case", player),
-        "Celadon Prize Corner - Pokemon Prize - 2":  lambda state: state.has("Coin Case", player),
-        "Celadon Prize Corner - Pokemon Prize - 3":  lambda state: state.has("Coin Case", player),
-        "Celadon Prize Corner - Pokemon Prize - 4":  lambda state: state.has("Coin Case", player),
-        "Celadon Prize Corner - Pokemon Prize - 5":  lambda state: state.has("Coin Case", player),
-        "Celadon Prize Corner - Pokemon Prize - 6":  lambda state: state.has("Coin Case", player),
+        "Celadon Prize Corner - Pokemon Prize - 1": lambda state: state.has("Coin Case", player),
+        "Celadon Prize Corner - Pokemon Prize - 2": lambda state: state.has("Coin Case", player),
+        "Celadon Prize Corner - Pokemon Prize - 3": lambda state: state.has("Coin Case", player),
+        "Celadon Prize Corner - Pokemon Prize - 4": lambda state: state.has("Coin Case", player),
+        "Celadon Prize Corner - Pokemon Prize - 5": lambda state: state.has("Coin Case", player),
+        "Celadon Prize Corner - Pokemon Prize - 6": lambda state: state.has("Coin Case", player),
         "Cinnabar Island - Old Amber Pokemon": lambda state: state.has("Old Amber", player),
         "Cinnabar Island - Helix Fossil Pokemon": lambda state: state.has("Helix Fossil", player),
         "Cinnabar Island - Dome Fossil Pokemon": lambda state: state.has("Dome Fossil", player),
@@ -96,10 +96,10 @@ def set_rules(world, player):
             player),
         "Route 25 - Hidden Item Fence Outside Bill's House": lambda state: state.pokemon_rb_can_get_hidden_items(
             player),
-        "Route 9 - Hidden Item Rock By Grass": lambda state: state.pokemon_rb_can_get_hidden_items(player),
+        "Route 9 - Hidden Item Bush By Grass": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "S.S. Anne 1F - Hidden Item Kitchen Trash": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "S.S. Anne B1F - Hidden Item Under Pillow": lambda state: state.pokemon_rb_can_get_hidden_items(player),
-        "Route 10 - Hidden Item Behind Rock Tunnel Entrance Tree": lambda
+        "Route 10 - Hidden Item Behind Rock Tunnel Entrance Cuttable Tree": lambda
             state: state.pokemon_rb_can_get_hidden_items(player),
         "Route 10 - Hidden Item Rock": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Rocket Hideout B1F - Hidden Item Pot Plant": lambda state: state.pokemon_rb_can_get_hidden_items(player),
@@ -107,14 +107,15 @@ def set_rules(world, player):
         "Rocket Hideout B4F - Hidden Item Behind Giovanni": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Pokemon Tower 5F - Hidden Item Near West Staircase": lambda state: state.pokemon_rb_can_get_hidden_items(
             player),
-        "Route 13 - Hidden Item Dead End Boulder": lambda state: state.pokemon_rb_can_get_hidden_items(player),
+        "Route 13 - Hidden Item Dead End Bush": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Route 13 - Hidden Item Dead End By Water Corner": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Pokemon Mansion B1F - Hidden Item Secret Key Room Corner": lambda state: state.pokemon_rb_can_get_hidden_items(
             player),
         "Safari Zone West - Hidden Item Secret House Statue": lambda state: state.pokemon_rb_can_get_hidden_items(
             player),
         "Silph Co 5F - Hidden Item Pot Plant": lambda state: state.pokemon_rb_can_get_hidden_items(player),
-        "Silph Co 9F - Hidden Item Nurse Bed": lambda state: state.pokemon_rb_can_get_hidden_items(player),
+        "Silph Co 9F - Hidden Item Nurse Bed (Card Key)": lambda state: state.pokemon_rb_can_get_hidden_items(
+            player) and state.has("Card Key", player),
         "Copycat's House - Hidden Item Desk": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Cerulean Cave 1F - Hidden Item Center Rocks": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Cerulean Cave B1F - Hidden Item Northeast Rocks": lambda state: state.pokemon_rb_can_get_hidden_items(player),
@@ -127,15 +128,15 @@ def set_rules(world, player):
         "Pokemon Mansion 3F - Hidden Item Behind Burglar": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Route 23 - Hidden Item Rocks Before Final Guard": lambda state: state.pokemon_rb_can_get_hidden_items(
             player),
-        "Route 23 - Hidden Item East Tree After Water": lambda state: state.pokemon_rb_can_get_hidden_items(
+        "Route 23 - Hidden Item East Bush After Water": lambda state: state.pokemon_rb_can_get_hidden_items(
             player),
         "Route 23 - Hidden Item On Island": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Victory Road 2F - Hidden Item Rock Before Moltres": lambda state: state.pokemon_rb_can_get_hidden_items(
             player),
         "Victory Road 2F - Hidden Item Rock In Final Room": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Viridian City - Hidden Item Cuttable Tree": lambda state: state.pokemon_rb_can_get_hidden_items(player),
-        "Route 11 - Hidden Item Isolated Tree Near Gate": lambda state: state.pokemon_rb_can_get_hidden_items(player),
-        "Route 12 - Hidden Item Tree Near Gate": lambda state: state.pokemon_rb_can_get_hidden_items(player),
+        "Route 11 - Hidden Item Isolated Bush Near Gate": lambda state: state.pokemon_rb_can_get_hidden_items(player),
+        "Route 12 - Hidden Item Bush Near Gate": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Route 17 - Hidden Item In Grass": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Route 17 - Hidden Item Near Northernmost Sign": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Route 17 - Hidden Item East Center": lambda state: state.pokemon_rb_can_get_hidden_items(player),
@@ -153,7 +154,7 @@ def set_rules(world, player):
         "Mt Moon B2F - Hidden Item Lone Rock": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Seafoam Islands B3F - Hidden Item Rock": lambda state: state.pokemon_rb_can_get_hidden_items(player),
         "Vermilion City - Hidden Item In Water Near Fan Club": lambda state: state.pokemon_rb_can_get_hidden_items(
-            player),
+            player) and state.pokemon_rb_can_surf(player),
         "Cerulean City - Hidden Item Gym Badge Guy's Backyard": lambda state: state.pokemon_rb_can_get_hidden_items(
             player),
         "Route 4 - Hidden Item Plateau East Of Mt Moon": lambda state: state.pokemon_rb_can_get_hidden_items(player),