v1.6

Client.py

@@ -217,7 +217,7 @@ async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
                             self.checked_flags[byte_i] += [j]
                             locs_to_send.add(pointer)
 
-            if not ctx.finished_game and cackletta != 0:
+            if not ctx.finished_game and cackletta != 0 and current_room == 0x1C7:
                 await ctx.send_msgs([{
                     "cmd": "StatusUpdate",
                     "status": ClientStatus.CLIENT_GOAL

Items.py

@@ -59,13 +59,13 @@ class MLSSItem(Item):
     ItemData(77771041, "Fake Beanstar", ItemClassification.progression, 0x43),
     ItemData(77771042, "Red Pearl Bean", ItemClassification.progression, 0x45),
     ItemData(77771043, "Green Pearl Bean", ItemClassification.progression, 0x46),
-    ItemData(77771044, "Beanfruit 1", ItemClassification.progression_skip_balancing, 0x47),
-    ItemData(77771045, "Beanfruit 2", ItemClassification.progression_skip_balancing, 0x50),
-    ItemData(77771046, "Beanfruit 3", ItemClassification.progression_skip_balancing, 0x51),
-    ItemData(77771047, "Beanfruit 4", ItemClassification.progression_skip_balancing, 0x52),
-    ItemData(77771048, "Beanfruit 5", ItemClassification.progression_skip_balancing, 0x53),
-    ItemData(77771049, "Beanfruit 6", ItemClassification.progression_skip_balancing, 0x54),
-    ItemData(77771050, "Beanfruit 7", ItemClassification.progression_skip_balancing, 0x55),
+    ItemData(77771044, "Bean Fruit 1", ItemClassification.progression_skip_balancing, 0x47),
+    ItemData(77771045, "Bean Fruit 2", ItemClassification.progression_skip_balancing, 0x50),
+    ItemData(77771046, "Bean Fruit 3", ItemClassification.progression_skip_balancing, 0x51),
+    ItemData(77771047, "Bean Fruit 4", ItemClassification.progression_skip_balancing, 0x52),
+    ItemData(77771048, "Bean Fruit 5", ItemClassification.progression_skip_balancing, 0x53),
+    ItemData(77771049, "Bean Fruit 6", ItemClassification.progression_skip_balancing, 0x54),
+    ItemData(77771050, "Bean Fruit 7", ItemClassification.progression_skip_balancing, 0x55),
     ItemData(77771051, "Blue Neon Egg", ItemClassification.progression, 0x56),
     ItemData(77771052, "Red Neon Egg", ItemClassification.progression, 0x57),
     ItemData(77771053, "Green Neon Egg", ItemClassification.progression, 0x60),

Locations.py

@@ -213,7 +213,7 @@ class MLSSLocation(Location):
     LocationData("Beanbean Outskirts Bean Fruit 6", 0x228775, 1),
     LocationData("Beanbean Outskirts Bean Fruit 7", 0x1e9431, 2),
     LocationData("Hoohoo Village Mole Behind Turtle", 0x277ab2, 1),
-    LocationData("Beanbean Outskirts Thunder Hand Mole", 0x2779C8, 1),
+    LocationData("Beanbean Outskirts Thunderhand Mole", 0x2779C8, 1),
     LocationData("Hoohoo Mountain Peasley's Rose", 0x1E9430, 2),
     LocationData("Beanbean Outskirts Super Hammer Upgrade", 0x1E9404, 2),
     LocationData("Beanbean Outskirts Ultra Hammer Upgrade", 0x1e9405, 2),
@@ -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", 0x39d9e9, 0),
+    LocationData("Hoohoo Mountain Base Boostatue Room Digspot 3 (Rightside)", 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 Solo Luigi Maze Room 2 Digspot 1", 0x39e5c8, 0),
@@ -535,20 +535,20 @@ class MLSSLocation(Location):
 ]
 
 surfable: typing.List[LocationData] = [
-    LocationData("Ocean North Whirlpool Block 1", 0x39e0a5, 0),
-    LocationData("Ocean North Whirlpool Block 2", 0x39e0ad, 0),
-    LocationData("Ocean North Whirlpool Block 3", 0x39e0b5, 0),
-    LocationData("Ocean North Whirlpool Block 4", 0x39e0bd, 0),
-    LocationData("Ocean North Whirlpool Digspot 1", 0x39e0c5, 0),
-    LocationData("Ocean North Whirlpool Digspot 2", 0x39e0cd, 0),
+    LocationData("Oho Ocean North Whirlpool Block 1", 0x39e0a5, 0),
+    LocationData("Oho Ocean North Whirlpool Block 2", 0x39e0ad, 0),
+    LocationData("Oho Ocean North Whirlpool Block 3", 0x39e0b5, 0),
+    LocationData("Oho Ocean North Whirlpool Block 4", 0x39e0bd, 0),
+    LocationData("Oho Ocean North Whirlpool Digspot 1", 0x39e0c5, 0),
+    LocationData("Oho Ocean North Whirlpool Digspot 2", 0x39e0cd, 0),
     LocationData("Oho Ocean Fire Puzzle Room Digspot", 0x39e057, 0),
-    LocationData("Ocean South Whirlpool Digspot 1", 0x39e0da, 0),
-    LocationData("Ocean South Whirlpool Digspot 2", 0x39e0e2, 0),
-    LocationData("Ocean South Whirlpool Digspot 3", 0x39e0ea, 0),
-    LocationData("Ocean South Whirlpool Digspot 4", 0x39e0f2, 0),
-    LocationData("Ocean South Whirlpool Digspot 5", 0x39e0fa, 0),
-    LocationData("Ocean South Whirlpool Digspot 6", 0x39e102, 0),
-    LocationData("Ocean South Whirlpool Room 2 Digspot", 0x39e10f, 0),
+    LocationData("Oho Ocean South Whirlpool Digspot 1", 0x39e0da, 0),
+    LocationData("Oho Ocean South Whirlpool Digspot 2", 0x39e0e2, 0),
+    LocationData("Oho Ocean South Whirlpool Digspot 3", 0x39e0ea, 0),
+    LocationData("Oho Ocean South Whirlpool Digspot 4", 0x39e0f2, 0),
+    LocationData("Oho Ocean South Whirlpool Digspot 5", 0x39e0fa, 0),
+    LocationData("Oho Ocean South Whirlpool Digspot 6", 0x39e102, 0),
+    LocationData("Oho Ocean South Whirlpool Room 2 Digspot", 0x39e10f, 0),
     LocationData("Joke's End Pipe Digspot", 0x39e6c2, 0),
     LocationData("Joke's End Staircase Digspot", 0x39e6cf, 0),
     LocationData("Surf Minigame", 0x2753ea, 1),
@@ -621,10 +621,10 @@ class MLSSLocation(Location):
     LocationData("Teehee Valley Room 2 Digspot 1", 0x39e53b, 0),
     LocationData("Teehee Valley Room 2 Digspot 2", 0x39e543, 0),
     LocationData("Teehee Valley Room 2 Digspot 3", 0x39e54b, 0),
-    LocationData("Teehee Valley Past Ultra Hammers Block 1", 0x39e580, 0),
-    LocationData("Teehee Valley Past Ultra Hammers Block 2", 0x39e590, 0),
-    LocationData("Teehee Valley Past Ultra Hammers Digspot 1", 0x39e598, 0),
-    LocationData("Teehee Valley Past Ultra Hammers Digspot 3", 0x39e5a8, 0),
+    LocationData("Teehee Valley Past Ultra Hammer Rock Block 1", 0x39e580, 0),
+    LocationData("Teehee Valley Past Ultra Hammer Rock Block 2", 0x39e590, 0),
+    LocationData("Teehee Valley Past Ultra Hammer Rock Digspot 1", 0x39e598, 0),
+    LocationData("Teehee Valley Past Ultra Hammer Rock Digspot 3", 0x39e5a8, 0),
     LocationData("Teehee Valley Solo Luigi Maze Room 1 Block", 0x39e5e0, 0),
     LocationData("Teehee Valley Before Trunkle Digspot", 0x39e5f0, 0),
     LocationData("S.S. Chuckola Storage Room Block 1", 0x39e610, 0),
@@ -747,7 +747,7 @@ class MLSSLocation(Location):
 ]
 
 postJokes: typing.List[LocationData] = [
-    LocationData("Teehee Valley Past Ultra Hammers Digspot 2", 0x39e5a0, 0),
+    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),

Names/LocationName.py

@@ -178,19 +178,19 @@ class LocationName():
     OhoOceanSouthRoom2Digspot = "Oho Ocean South Room 2 Digspot"
     OhoOceanSpikeRoomDigspot1 = "Oho Ocean Spike Room Digspot 1"
     OhoOceanSpikeRoomDigspot2 = "Oho Ocean Spike Room Digspot 2"
-    OceanNorthWhirlpoolBlock1 = "Ocean North Whirlpool Block 1"
-    OceanNorthWhirlpoolBlock2 = "Ocean North Whirlpool Block 2"
-    OceanNorthWhirlpoolBlock3 = "Ocean North Whirlpool Block 3"
-    OceanNorthWhirlpoolBlock4 = "Ocean North Whirlpool Block 4"
-    OceanNorthWhirlpoolDigspot1 = "Ocean North Whirlpool Digspot 1"
-    OceanNorthWhirlpoolDigspot2 = "Ocean North Whirlpool Digspot 2"
-    OceanSouthWhirlpoolDigspot1 = "Ocean South Whirlpool Digspot 1"
-    OceanSouthWhirlpoolDigspot2 = "Ocean South Whirlpool Digspot 2"
-    OceanSouthWhirlpoolDigspot3 = "Ocean South Whirlpool Digspot 3"
-    OceanSouthWhirlpoolDigspot4 = "Ocean South Whirlpool Digspot 4"
-    OceanSouthWhirlpoolDigspot5 = "Ocean South Whirlpool Digspot 5"
-    OceanSouthWhirlpoolDigspot6 = "Ocean South Whirlpool Digspot 6"
-    OceanSouthWhirlpoolRoom2Digspot = "Ocean South Whirlpool Room 2 Digspot"
+    OceanNorthWhirlpoolBlock1 = "Oho Ocean North Whirlpool Block 1"
+    OceanNorthWhirlpoolBlock2 = "Oho Ocean North Whirlpool Block 2"
+    OceanNorthWhirlpoolBlock3 = "Oho Ocean North Whirlpool Block 3"
+    OceanNorthWhirlpoolBlock4 = "Oho Ocean North Whirlpool Block 4"
+    OceanNorthWhirlpoolDigspot1 = "Oho Ocean North Whirlpool Digspot 1"
+    OceanNorthWhirlpoolDigspot2 = "Oho Ocean North Whirlpool Digspot 2"
+    OceanSouthWhirlpoolDigspot1 = "Oho Ocean South Whirlpool Digspot 1"
+    OceanSouthWhirlpoolDigspot2 = "Oho Ocean South Whirlpool Digspot 2"
+    OceanSouthWhirlpoolDigspot3 = "Oho Ocean South Whirlpool Digspot 3"
+    OceanSouthWhirlpoolDigspot4 = "Oho Ocean South Whirlpool Digspot 4"
+    OceanSouthWhirlpoolDigspot5 = "Oho Ocean South Whirlpool Digspot 5"
+    OceanSouthWhirlpoolDigspot6 = "Oho Ocean South Whirlpool Digspot 6"
+    OceanSouthWhirlpoolRoom2Digspot = "Oho Ocean South Whirlpool Room 2 Digspot"
     WoohooHooniversityStarRoomBlock1 = "Woohoo Hooniversity Star Room Block 1"
     WoohooHooniversityStarRoomBlock2 = "Woohoo Hooniversity Star Room Block 2"
     WoohooHooniversityStarRoomBlock3 = "Woohoo Hooniversity Star Room Block 3"
@@ -290,11 +290,11 @@ class LocationName():
     TeeheeValleySoloMarioRoomDigspot2 = "Teehee Valley Solo Mario Room Digspot 2"
     TeeheeValleySoloMarioRoomDigspot3 = "Teehee Valley Solo Mario Room Digspot 3"
     TeeheeValleySoloMarioRoomDigspot4 = "Teehee Valley Solo Mario Room Digspot 4"
-    TeeheeValleyPastUltraHammersBlock1 = "Teehee Valley Past Ultra Hammers Block 1"
-    TeeheeValleyPastUltraHammersBlock2 = "Teehee Valley Past Ultra Hammers Block 2"
-    TeeheeValleyPastUltraHammersDigspot1 = "Teehee Valley Past Ultra Hammers Digspot 1"
-    TeeheeValleyPastUltraHammersDigspot2 = "Teehee Valley Past Ultra Hammers Digspot 2"
-    TeeheeValleyPastUltraHammersDigspot3 = "Teehee Valley Past Ultra Hammers Digspot 3"
+    TeeheeValleyPastUltraHammersBlock1 = "Teehee Valley Past Ultra Hammer Rock Block 1"
+    TeeheeValleyPastUltraHammersBlock2 = "Teehee Valley Past Ultra Hammer Rock Block 2"
+    TeeheeValleyPastUltraHammersDigspot1 = "Teehee Valley Past Ultra Hammer Rock Digspot 1"
+    TeeheeValleyPastUltraHammersDigspot2 = "Teehee Valley Past Ultra Hammer Rock Digspot 2 (Post-Birdo)"
+    TeeheeValleyPastUltraHammersDigspot3 = "Teehee Valley Past Ultra Hammer Rock Digspot 3"
     TeeheeValleyEntranceToHoohooMountainDigspot = "Teehee Valley Entrance To Hoohoo Mountain Digspot"
     TeeheeValleySoloLuigiMazeRoom2Digspot1 = "Teehee Valley Solo Luigi Maze Room 2 Digspot 1"
     TeeheeValleySoloLuigiMazeRoom2Digspot2 = "Teehee Valley Solo Luigi Maze Room 2 Digspot 2"
@@ -524,7 +524,7 @@ class LocationName():
     BowsersCastleLarryRoomBlock = "Bowser's Castle Larry Room Block"
     BowsersCastleLemmyRoomMole = "Bowser's Castle Lemmy Room Mole"
     SurfMinigame = "Surf Minigame"
-    BeanbeanOutskirtsThunderHandMole = "Beanbean Outskirts Thunder Hand Mole"
+    BeanbeanOutskirtsThunderHandMole = "Beanbean Outskirts Thunderhand Mole"
     BadgeShopMomPiranhaFlag1 = "Badge Shop Mom Piranha Flag 1"
     BadgeShopMomPiranhaFlag2 = "Badge Shop Mom Piranha Flag 2"
     BadgeShopMomPiranhaFlag3 = "Badge Shop Mom Piranha Flag 3"

Options.py

@@ -180,7 +180,7 @@ class XPMultiplier(Range):
 
     """
     display_name = "XP Multiplier"
-    range_start = 1
+    range_start = 0
     range_end = 4
     default = 1
 

Rom.py

@@ -225,7 +225,7 @@ def enemy_randomize(caller: APProcedurePatch, rom: bytes):
                     stream.seek(-3, 1)
                     stream.write(bytes([enemies_raw.pop()]))
                     stream.seek(1, 1)
-                    stream.write(bytes([0x4]))
+                    stream.write(bytes([0x6]))
                     stream.seek(1, 1)
                 else:
                     stream.seek(3, 1)

StateLogic.py

@@ -77,7 +77,7 @@ def winkle(state, player):
 
 
 def beanFruit(state, player):
-    return state.has("Beanfruit 1", player) and state.has("Beanfruit 2", player) and state.has("Beanfruit 3", player) and state.has("Beanfruit 4", player) and state.has("Beanfruit 5", player) and state.has("Beanfruit 6", player) and state.has("Beanfruit 7", player)
+    return state.has("Bean Fruit 1", player) and state.has("Bean Fruit 2", player) and state.has("Bean Fruit 3", player) and state.has("Bean Fruit 4", player) and state.has("Bean Fruit 5", player) and state.has("Bean Fruit 6", player) and state.has("Bean Fruit 7", player)
 
 
 def surfable(state, player):

data/sounds.txt

@@ -263,7 +263,6 @@
 1a0fb0
 1a0fa4
 1a0f98
-1a0f80
 1a0f74
 1a0f68
 1a0f5c