From fa93bc5d1eb9a3e694f335ca24683ea044f2f563 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Sat, 9 Nov 2024 21:10:54 +0100
Subject: [PATCH] =?UTF-8?q?The=20Witness:=20Get=20rid=20of=20Menu=20region?=
 =?UTF-8?q?,=20prepare=20for=20other=20worlds=20to=20change=20theirs=20(hi?=
 =?UTF-8?q?nts)=C2=A0#3888?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worlds/witness/__init__.py                  | 2 ++
 worlds/witness/data/WitnessLogic.txt        | 2 --
 worlds/witness/data/WitnessLogicExpert.txt  | 2 --
 worlds/witness/data/WitnessLogicVanilla.txt | 2 --
 worlds/witness/data/WitnessLogicVariety.txt | 2 --
 worlds/witness/hints.py                     | 7 +++++--
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py
index c9848f2ffe47..a21a5bb3ca7e 100644
--- a/worlds/witness/__init__.py
+++ b/worlds/witness/__init__.py
@@ -50,6 +50,8 @@ class WitnessWorld(World):
     topology_present = False
     web = WitnessWebWorld()
 
+    origin_region_name = "Entry"
+
     options_dataclass = TheWitnessOptions
     options: TheWitnessOptions
 
diff --git a/worlds/witness/data/WitnessLogic.txt b/worlds/witness/data/WitnessLogic.txt
index fabd1428810b..8fadf68c3131 100644
--- a/worlds/witness/data/WitnessLogic.txt
+++ b/worlds/witness/data/WitnessLogic.txt
@@ -1,7 +1,5 @@
 ==Tutorial (Inside)==
 
-Menu (Menu) - Entry - True:
-
 Entry (Entry):
 
 Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064:
diff --git a/worlds/witness/data/WitnessLogicExpert.txt b/worlds/witness/data/WitnessLogicExpert.txt
index 200138dee1f7..c6d6efa96485 100644
--- a/worlds/witness/data/WitnessLogicExpert.txt
+++ b/worlds/witness/data/WitnessLogicExpert.txt
@@ -1,7 +1,5 @@
 ==Tutorial (Inside)==
 
-Menu (Menu) - Entry - True:
-
 Entry (Entry):
 
 Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064:
diff --git a/worlds/witness/data/WitnessLogicVanilla.txt b/worlds/witness/data/WitnessLogicVanilla.txt
index 67a42ba7e4d4..1186c470233e 100644
--- a/worlds/witness/data/WitnessLogicVanilla.txt
+++ b/worlds/witness/data/WitnessLogicVanilla.txt
@@ -1,7 +1,5 @@
 ==Tutorial (Inside)==
 
-Menu (Menu) - Entry - True:
-
 Entry (Entry):
 
 Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064:
diff --git a/worlds/witness/data/WitnessLogicVariety.txt b/worlds/witness/data/WitnessLogicVariety.txt
index a3c388dfb1e4..31263aa33790 100644
--- a/worlds/witness/data/WitnessLogicVariety.txt
+++ b/worlds/witness/data/WitnessLogicVariety.txt
@@ -1,7 +1,5 @@
 ==Tutorial (Inside)==
 
-Menu (Menu) - Entry - True:
-
 Entry (Entry):
 
 Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064:
diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py
index 99e8eea2eb89..dac7e3fb4d05 100644
--- a/worlds/witness/hints.py
+++ b/worlds/witness/hints.py
@@ -250,8 +250,11 @@ def word_direct_hint(world: "WitnessWorld", hint: WitnessLocationHint) -> Witnes
             elif group_type == "Group":
                 location_name = f"a \"{chosen_group}\" location in {player_name}'s world"
             elif group_type == "Region":
-                if chosen_group == "Menu":
-                    location_name = f"a location near the start of {player_name}'s game (\"Menu\" region)"
+                origin_region_name = world.multiworld.worlds[hint.location.player].origin_region_name
+                if chosen_group == origin_region_name:
+                    location_name = (
+                        f"a location in the origin region of {player_name}'s world (\"{origin_region_name}\" region)"
+                    )
                 else:
                     location_name = f"a location in {player_name}'s \"{chosen_group}\" region"