From 92f75f3e030feed8d29ff2f96e7cf40c06a2d25b Mon Sep 17 00:00:00 2001
From: PoryGone <98504756+PoryGone@users.noreply.github.com>
Date: Thu, 8 Dec 2022 04:47:39 -0500
Subject: [PATCH] SA2B: Add missing Whistle location (#1306)

---
 worlds/sa2b/Locations.py          | 1 +
 worlds/sa2b/Names/LocationName.py | 1 +
 worlds/sa2b/Regions.py            | 1 +
 worlds/sa2b/Rules.py              | 4 ++++
 worlds/sa2b/__init__.py           | 2 +-
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/worlds/sa2b/Locations.py b/worlds/sa2b/Locations.py
index 0ce14877..f5831cd7 100644
--- a/worlds/sa2b/Locations.py
+++ b/worlds/sa2b/Locations.py
@@ -467,6 +467,7 @@ hidden_whistle_location_table = {
 
     LocationName.city_escape_hidden_4: 0xFF0760,
     LocationName.green_forest_hidden_4: 0xFF0764,
+    LocationName.mission_street_hidden_4: 0xFF0766,
 
     LocationName.city_escape_hidden_5: 0xFF0780,
 }
diff --git a/worlds/sa2b/Names/LocationName.py b/worlds/sa2b/Names/LocationName.py
index 0bb0dc65..34826a1c 100644
--- a/worlds/sa2b/Names/LocationName.py
+++ b/worlds/sa2b/Names/LocationName.py
@@ -118,6 +118,7 @@ mission_street_pipe_3   = "Mission Street - Pipe 3"
 mission_street_hidden_1 = "Mission Street - Hidden 1"
 mission_street_hidden_2 = "Mission Street - Hidden 2"
 mission_street_hidden_3 = "Mission Street - Hidden 3"
+mission_street_hidden_4 = "Mission Street - Hidden 4"
 mission_street_beetle   = "Mission Street - Gold Beetle"
 mission_street_upgrade  = "Mission Street - Upgrade"
 route_101_1             = "Route 101 - 1"
diff --git a/worlds/sa2b/Regions.py b/worlds/sa2b/Regions.py
index 42688153..8d3ceb91 100644
--- a/worlds/sa2b/Regions.py
+++ b/worlds/sa2b/Regions.py
@@ -269,6 +269,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.mission_street_hidden_1,
         LocationName.mission_street_hidden_2,
         LocationName.mission_street_hidden_3,
+        LocationName.mission_street_hidden_4,
         LocationName.mission_street_beetle,
         LocationName.mission_street_upgrade,
     ]
diff --git a/worlds/sa2b/Rules.py b/worlds/sa2b/Rules.py
index 7b27b73a..a0590ba2 100644
--- a/worlds/sa2b/Rules.py
+++ b/worlds/sa2b/Rules.py
@@ -604,6 +604,8 @@ def set_mission_upgrade_rules_standard(world: MultiWorld, player: int):
     if world.whistlesanity[player].value == 2 or world.whistlesanity[player].value == 3:
         add_rule(world.get_location(LocationName.mission_street_hidden_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(world.get_location(LocationName.mission_street_hidden_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
         add_rule(world.get_location(LocationName.death_chamber_hidden_1, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
@@ -1044,6 +1046,8 @@ def set_mission_upgrade_rules_hard(world: MultiWorld, player: int):
     if world.whistlesanity[player].value == 2 or world.whistlesanity[player].value == 3:
         add_rule(world.get_location(LocationName.mission_street_hidden_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(world.get_location(LocationName.mission_street_hidden_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
         add_rule(world.get_location(LocationName.death_chamber_hidden_1, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
diff --git a/worlds/sa2b/__init__.py b/worlds/sa2b/__init__.py
index 4e7443c2..95e85ee3 100644
--- a/worlds/sa2b/__init__.py
+++ b/worlds/sa2b/__init__.py
@@ -52,7 +52,7 @@ class SA2BWorld(World):
     game: str = "Sonic Adventure 2 Battle"
     option_definitions = sa2b_options
     topology_present = False
-    data_version = 3
+    data_version = 4
 
     item_name_groups = item_groups
     item_name_to_id = {name: data.code for name, data in item_table.items()}