ASM changes + various name/logic updates

ArchipelagoMW · Aug 8, 2024 · 4dca458 · 4dca458
1 parent 0172f7c
commit 4dca458
Show file tree

Hide file tree

Showing 8 changed files with 251 additions and 126 deletions.
diff --git a/worlds/mlss/Data.py b/worlds/mlss/Data.py
@@ -1,6 +1,9 @@
 flying = [
     0x14,
     0x1D,
+    0x32,
+    0x33,
+    0x40,
     0x4C
 ]
 
@@ -151,7 +154,7 @@
     0x50458C,
     0x5045AC,
     0x50468C,
-    0x5046CC,
+    # 0x5046CC, 6 enemy formation
     0x5046EC,
     0x50470C
 ]

diff --git a/worlds/mlss/Locations.py b/worlds/mlss/Locations.py
@@ -93,8 +93,8 @@ class MLSSLocation(Location):
     LocationData("Hoohoo Mountain Below Summit Block 1", 0x39D873, 0),
     LocationData("Hoohoo Mountain Below Summit Block 2", 0x39D87B, 0),
     LocationData("Hoohoo Mountain Below Summit Block 3", 0x39D883, 0),
-    LocationData("Hoohoo Mountain After Hoohooros Block 1", 0x39D890, 0),
-    LocationData("Hoohoo Mountain After Hoohooros Block 2", 0x39D8A0, 0),
+    LocationData("Hoohoo Mountain Past Hoohooros Block 1", 0x39D890, 0),
+    LocationData("Hoohoo Mountain Past Hoohooros Block 2", 0x39D8A0, 0),
     LocationData("Hoohoo Mountain Hoohooros Room Block 1", 0x39D8AD, 0),
     LocationData("Hoohoo Mountain Hoohooros Room Block 2", 0x39D8B5, 0),
     LocationData("Hoohoo Mountain Before Hoohooros Block", 0x39D8D2, 0),
@@ -104,7 +104,7 @@ class MLSSLocation(Location):
     LocationData("Hoohoo Mountain Room 1 Block 2", 0x39D924, 0),
     LocationData("Hoohoo Mountain Room 1 Block 3", 0x39D92C, 0),
     LocationData("Hoohoo Mountain Base Room 1 Block", 0x39D939, 0),
-    LocationData("Hoohoo Village Right Side Block", 0x39D957, 0),
+    LocationData("Hoohoo Village Eastside Block", 0x39D957, 0),
     LocationData("Hoohoo Village Bridge Room Block 1", 0x39D96F, 0),
     LocationData("Hoohoo Village Bridge Room Block 2", 0x39D97F, 0),
     LocationData("Hoohoo Village Bridge Room Block 3", 0x39D98F, 0),
@@ -119,8 +119,8 @@ class MLSSLocation(Location):
     LocationData("Hoohoo Mountain Base Boostatue Room Digspot 2", 0x39D9E1, 0),
     LocationData("Hoohoo Mountain Base Grassy Area Block 1", 0x39D9FE, 0),
     LocationData("Hoohoo Mountain Base Grassy Area Block 2", 0x39D9F6, 0),
-    LocationData("Hoohoo Mountain Base After Minecart Minigame Block 1", 0x39DA35, 0),
-    LocationData("Hoohoo Mountain Base After Minecart Minigame Block 2", 0x39DA2D, 0),
+    LocationData("Hoohoo Mountain Base Past Minecart Minigame Block 1", 0x39DA35, 0),
+    LocationData("Hoohoo Mountain Base Past Minecart Minigame Block 2", 0x39DA2D, 0),
     LocationData("Cave Connecting Stardust Fields and Hoohoo Village Block 1", 0x39DA77, 0),
     LocationData("Cave Connecting Stardust Fields and Hoohoo Village Block 2", 0x39DA7F, 0),
     LocationData("Hoohoo Village South Cave Block", 0x39DACD, 0),
@@ -143,14 +143,14 @@ class MLSSLocation(Location):
     LocationData("Shop Starting Flag 3", 0x3C05F4, 3),
     LocationData("Hoohoo Mountain Summit Digspot", 0x39D85E, 0),
     LocationData("Hoohoo Mountain Below Summit Digspot", 0x39D86B, 0),
-    LocationData("Hoohoo Mountain After Hoohooros Digspot", 0x39D898, 0),
+    LocationData("Hoohoo Mountain Past Hoohooros Digspot", 0x39D898, 0),
     LocationData("Hoohoo Mountain Hoohooros Room Digspot 1", 0x39D8BD, 0),
     LocationData("Hoohoo Mountain Hoohooros Room Digspot 2", 0x39D8C5, 0),
     LocationData("Hoohoo Mountain Before Hoohooros Digspot", 0x39D8E2, 0),
     LocationData("Hoohoo Mountain Room 2 Digspot 1", 0x39D907, 0),
     LocationData("Hoohoo Mountain Room 2 Digspot 2", 0x39D90F, 0),
     LocationData("Hoohoo Mountain Base Room 1 Digspot", 0x39D941, 0),
-    LocationData("Hoohoo Village Right Side Digspot", 0x39D95F, 0),
+    LocationData("Hoohoo Village Eastside Digspot", 0x39D95F, 0),
     LocationData("Hoohoo Village Super Hammer Cave Digspot", 0x39DB02, 0),
     LocationData("Hoohoo Village Super Hammer Cave Block", 0x39DAEA, 0),
     LocationData("Hoohoo Village North Cave Room 2 Digspot", 0x39DAB5, 0),
@@ -267,7 +267,7 @@ class MLSSLocation(Location):
     LocationData("Chucklehuck Woods Cave Room 3 Coin Block", 0x39DDB4, 0),
     LocationData("Chucklehuck Woods Pipe 5 Room Coin Block", 0x39DDE6, 0),
     LocationData("Chucklehuck Woods Room 7 Coin Block", 0x39DE31, 0),
-    LocationData("Chucklehuck Woods After Chuckleroot Coin Block", 0x39DF14, 0),
+    LocationData("Chucklehuck Woods Past Chuckleroot Coin Block", 0x39DF14, 0),
     LocationData("Chucklehuck Woods Koopa Room Coin Block", 0x39DF53, 0),
     LocationData("Chucklehuck Woods Winkle Area Cave Coin Block", 0x39DF80, 0),
     LocationData("Sewers Prison Room Coin Block", 0x39E01E, 0),
@@ -286,7 +286,7 @@ class MLSSLocation(Location):
     LocationData("Hoohoo Mountain Base Past Ultra Hammer Rocks Block 1", 0x39DA42, 0),
     LocationData("Hoohoo Mountain Base Past Ultra Hammer Rocks Block 2", 0x39DA4A, 0),
     LocationData("Hoohoo Mountain Base Past Ultra Hammer Rocks Block 3", 0x39DA52, 0),
-    LocationData("Hoohoo Mountain Base Boostatue Room Digspot 3 (Rightside)", 0x39D9E9, 0),
+    LocationData("Hoohoo Mountain Base Boostatue Room Digspot 3 (Right Side)", 0x39D9E9, 0),
     LocationData("Hoohoo Mountain Base Mole Near Teehee Valley", 0x277A45, 1),
     LocationData("Teehee Valley Entrance To Hoohoo Mountain Digspot", 0x39E5B5, 0),
     LocationData("Teehee Valley Upper Maze Room 1 Block", 0x39E5E0, 0),
@@ -346,12 +346,12 @@ class MLSSLocation(Location):
     LocationData("Chucklehuck Woods Southwest of Chuckleroot Block", 0x39DEC2, 0),
     LocationData("Chucklehuck Woods Wiggler room Digspot 1", 0x39DECF, 0),
     LocationData("Chucklehuck Woods Wiggler room Digspot 2", 0x39DED7, 0),
-    LocationData("Chucklehuck Woods After Chuckleroot Block 1", 0x39DEE4, 0),
-    LocationData("Chucklehuck Woods After Chuckleroot Block 2", 0x39DEEC, 0),
-    LocationData("Chucklehuck Woods After Chuckleroot Block 3", 0x39DEF4, 0),
-    LocationData("Chucklehuck Woods After Chuckleroot Block 4", 0x39DEFC, 0),
-    LocationData("Chucklehuck Woods After Chuckleroot Block 5", 0x39DF04, 0),
-    LocationData("Chucklehuck Woods After Chuckleroot Block 6", 0x39DF0C, 0),
+    LocationData("Chucklehuck Woods Past Chuckleroot Block 1", 0x39DEE4, 0),
+    LocationData("Chucklehuck Woods Past Chuckleroot Block 2", 0x39DEEC, 0),
+    LocationData("Chucklehuck Woods Past Chuckleroot Block 3", 0x39DEF4, 0),
+    LocationData("Chucklehuck Woods Past Chuckleroot Block 4", 0x39DEFC, 0),
+    LocationData("Chucklehuck Woods Past Chuckleroot Block 5", 0x39DF04, 0),
+    LocationData("Chucklehuck Woods Past Chuckleroot Block 6", 0x39DF0C, 0),
     LocationData("Chucklehuck Woods Koopa Room Block 1", 0x39DF4B, 0),
     LocationData("Chucklehuck Woods Koopa Room Block 2", 0x39DF5B, 0),
     LocationData("Chucklehuck Woods Koopa Room Digspot", 0x39DF63, 0),
@@ -368,14 +368,14 @@ class MLSSLocation(Location):
 ]
 
 castleTown: typing.List[LocationData] = [
-    LocationData("Beanbean Castle Town Left Side House Block 1", 0x39D7A4, 0),
-    LocationData("Beanbean Castle Town Left Side House Block 2", 0x39D7AC, 0),
-    LocationData("Beanbean Castle Town Left Side House Block 3", 0x39D7B4, 0),
-    LocationData("Beanbean Castle Town Left Side House Block 4", 0x39D7BC, 0),
-    LocationData("Beanbean Castle Town Right Side House Block 1", 0x39D7D8, 0),
-    LocationData("Beanbean Castle Town Right Side House Block 2", 0x39D7E0, 0),
-    LocationData("Beanbean Castle Town Right Side House Block 3", 0x39D7E8, 0),
-    LocationData("Beanbean Castle Town Right Side House Block 4", 0x39D7F0, 0),
+    LocationData("Beanbean Castle Town West Side House Block 1", 0x39D7A4, 0),
+    LocationData("Beanbean Castle Town West Side House Block 2", 0x39D7AC, 0),
+    LocationData("Beanbean Castle Town West Side House Block 3", 0x39D7B4, 0),
+    LocationData("Beanbean Castle Town West Side House Block 4", 0x39D7BC, 0),
+    LocationData("Beanbean Castle Town East Side House Block 1", 0x39D7D8, 0),
+    LocationData("Beanbean Castle Town East Side House Block 2", 0x39D7E0, 0),
+    LocationData("Beanbean Castle Town East Side House Block 3", 0x39D7E8, 0),
+    LocationData("Beanbean Castle Town East Side House Block 4", 0x39D7F0, 0),
     LocationData("Beanbean Castle Peach's Extra Dress", 0x1E9433, 2),
     LocationData("Beanbean Castle Fake Beanstar", 0x1E9432, 2),
     LocationData("Beanbean Castle Town Beanlet 1", 0x251347, 1),
@@ -445,14 +445,14 @@ class MLSSLocation(Location):
 ]
 
 kidnappedFlag: typing.List[LocationData] = [
-    LocationData("Badge Shop Enter Fungitown Flag 1", 0x3C0640, 2),
-    LocationData("Badge Shop Enter Fungitown Flag 2", 0x3C0642, 2),
-    LocationData("Badge Shop Enter Fungitown Flag 3", 0x3C0644, 2),
-    LocationData("Pants Shop Enter Fungitown Flag 1", 0x3C0646, 2),
-    LocationData("Pants Shop Enter Fungitown Flag 2", 0x3C0648, 2),
-    LocationData("Pants Shop Enter Fungitown Flag 3", 0x3C064A, 2),
-    LocationData("Shop Enter Fungitown Flag 1", 0x3C0606, 3),
-    LocationData("Shop Enter Fungitown Flag 2", 0x3C0608, 3),
+    LocationData("Badge Shop Trunkle Flag 1", 0x3C0640, 2),
+    LocationData("Badge Shop Trunkle Flag 2", 0x3C0642, 2),
+    LocationData("Badge Shop Trunkle Flag 3", 0x3C0644, 2),
+    LocationData("Pants Shop Trunkle Flag 1", 0x3C0646, 2),
+    LocationData("Pants Shop Trunkle Flag 2", 0x3C0648, 2),
+    LocationData("Pants Shop Trunkle Flag 3", 0x3C064A, 2),
+    LocationData("Shop Trunkle Flag 1", 0x3C0606, 3),
+    LocationData("Shop Trunkle Flag 2", 0x3C0608, 3),
 ]
 
 beanstarFlag: typing.List[LocationData] = [
@@ -554,21 +554,21 @@ class MLSSLocation(Location):
 airport: typing.List[LocationData] = [
     LocationData("Airport Entrance Digspot", 0x39E2DC, 0),
     LocationData("Airport Lobby Digspot", 0x39E2E9, 0),
-    LocationData("Airport Leftside Digspot 1", 0x39E2F6, 0),
-    LocationData("Airport Leftside Digspot 2", 0x39E2FE, 0),
-    LocationData("Airport Leftside Digspot 3", 0x39E306, 0),
-    LocationData("Airport Leftside Digspot 4", 0x39E30E, 0),
-    LocationData("Airport Leftside Digspot 5", 0x39E316, 0),
+    LocationData("Airport Westside Digspot 1", 0x39E2F6, 0),
+    LocationData("Airport Westside Digspot 2", 0x39E2FE, 0),
+    LocationData("Airport Westside Digspot 3", 0x39E306, 0),
+    LocationData("Airport Westside Digspot 4", 0x39E30E, 0),
+    LocationData("Airport Westside Digspot 5", 0x39E316, 0),
     LocationData("Airport Center Digspot 1", 0x39E323, 0),
     LocationData("Airport Center Digspot 2", 0x39E32B, 0),
     LocationData("Airport Center Digspot 3", 0x39E333, 0),
     LocationData("Airport Center Digspot 4", 0x39E33B, 0),
     LocationData("Airport Center Digspot 5", 0x39E343, 0),
-    LocationData("Airport Rightside Digspot 1", 0x39E350, 0),
-    LocationData("Airport Rightside Digspot 2", 0x39E358, 0),
-    LocationData("Airport Rightside Digspot 3", 0x39E360, 0),
-    LocationData("Airport Rightside Digspot 4", 0x39E368, 0),
-    LocationData("Airport Rightside Digspot 5", 0x39E370, 0),
+    LocationData("Airport Eastside Digspot 1", 0x39E350, 0),
+    LocationData("Airport Eastside Digspot 2", 0x39E358, 0),
+    LocationData("Airport Eastside Digspot 3", 0x39E360, 0),
+    LocationData("Airport Eastside Digspot 4", 0x39E368, 0),
+    LocationData("Airport Eastside Digspot 5", 0x39E370, 0),
 ]
 
 gwarharEntrance: typing.List[LocationData] = [
@@ -667,7 +667,7 @@ class MLSSLocation(Location):
     LocationData("Bowser's Castle Iggy & Morton Hallway Block 1", 0x39E9EF, 0),
     LocationData("Bowser's Castle Iggy & Morton Hallway Block 2", 0x39E9F7, 0),
     LocationData("Bowser's Castle Iggy & Morton Hallway Digspot", 0x39E9FF, 0),
-    LocationData("Bowser's Castle After Morton Block", 0x39EA0C, 0),
+    LocationData("Bowser's Castle Past Morton Block", 0x39EA0C, 0),
     LocationData("Bowser's Castle Morton Room 1 Digspot", 0x39EA89, 0),
     LocationData("Bowser's Castle Lemmy Room 1 Block", 0x39EA9C, 0),
     LocationData("Bowser's Castle Lemmy Room 1 Digspot", 0x39EAA4, 0),
@@ -705,16 +705,16 @@ class MLSSLocation(Location):
     LocationData("Joke's End Second Floor West Room Block 4", 0x39E781, 0),
     LocationData("Joke's End Mole Reward 1", 0x27788E, 1),
     LocationData("Joke's End Mole Reward 2", 0x2778D2, 1),
-]
-
-jokesMain: typing.List[LocationData] = [
     LocationData("Joke's End Furnace Room 1 Block 1", 0x39E70F, 0),
     LocationData("Joke's End Furnace Room 1 Block 2", 0x39E717, 0),
     LocationData("Joke's End Furnace Room 1 Block 3", 0x39E71F, 0),
     LocationData("Joke's End Northeast of Boiler Room 1 Block", 0x39E732, 0),
-    LocationData("Joke's End Northeast of Boiler Room 3 Digspot", 0x39E73F, 0),
     LocationData("Joke's End Northeast of Boiler Room 2 Block", 0x39E74C, 0),
     LocationData("Joke's End Northeast of Boiler Room 2 Digspot", 0x39E754, 0),
+    LocationData("Joke's End Northeast of Boiler Room 3 Digspot", 0x39E73F, 0),
+]
+
+jokesMain: typing.List[LocationData] = [
     LocationData("Joke's End Second Floor East Room Digspot", 0x39E794, 0),
     LocationData("Joke's End Final Split up Room Digspot", 0x39E7A7, 0),
     LocationData("Joke's End South of Bridge Room Block", 0x39E7B4, 0),
@@ -740,10 +740,10 @@ class MLSSLocation(Location):
 
 postJokes: typing.List[LocationData] = [
     LocationData("Teehee Valley Past Ultra Hammer Rock Digspot 2 (Post-Birdo)", 0x39E5A0, 0),
-    LocationData("Teehee Valley Before Popple Digspot 1", 0x39E55B, 0),
-    LocationData("Teehee Valley Before Popple Digspot 2", 0x39E563, 0),
-    LocationData("Teehee Valley Before Popple Digspot 3", 0x39E56B, 0),
-    LocationData("Teehee Valley Before Popple Digspot 4", 0x39E573, 0),
+    LocationData("Teehee Valley Before Birdo Digspot 1", 0x39E55B, 0),
+    LocationData("Teehee Valley Before Birdo Digspot 2", 0x39E563, 0),
+    LocationData("Teehee Valley Before Birdo Digspot 3", 0x39E56B, 0),
+    LocationData("Teehee Valley Before Birdo Digspot 4", 0x39E573, 0),
 ]
 
 theater: typing.List[LocationData] = [