Merge branch 'mlss' of https://github.com/jamesbrq/ArchipelagoMainMLSS …

…into mlss

README.md

@@ -66,7 +66,6 @@ Currently, the following games are supported:
 * A Short Hike
 * Yoshi's Island
 * Mario & Luigi: Superstar Saga
-* 
 For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/).
 Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled
 windows binaries.

worlds/mlss/Client.py

@@ -149,7 +149,7 @@ async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
                 if location in ctx.server_locations:
                     locs_to_send.add(location)
 
-            # Loop for recieving items. Item is written as an ID into 0x3057.
+            # Loop for receiving items. Item is written as an ID into 0x3057.
             # ASM reads the ID in a loop and give the player the item before resetting the RAM address to 0x0.
             # If RAM address isn't 0x0 yet break out and try again later to give the rest of the items
             for i in range(len(ctx.items_received) - received_index):

worlds/mlss/Data.py

@@ -5702,4 +5702,4 @@
 [0x3CCA02, 0xF7, 0x02, 0],
 [0x3CCA00, 0xFF, 0x07, 0],
 [0x3D14C6, 0xFF, 0x07, 0],
-[0x3D1506, 0xFF, 0x07, 1]]
+[0x3D1506, 0xFF, 0x07, 1]]

worlds/mlss/Options.py

@@ -4,7 +4,7 @@
 
 class BowsersCastleSkip(Toggle):
     """
-    Skip straight from the entrance hall to bowletta in Bowser's Castle.
+    Skip straight from the entrance hall to Bowletta in Bowser's Castle.
     All Bowser's Castle locations will be removed from the location pool.
     """
 

worlds/mlss/__init__.py

@@ -45,7 +45,7 @@ class RomFile(settings.UserFilePath):
 class MLSSWorld(World):
     """
     Adventure with Mario and Luigi together in the Beanbean Kingdom
-    to stop the evil cackletta and retrieve the Beanstar.
+    to stop the evil Cackletta and retrieve the Beanstar.
     """
 
     game = "Mario & Luigi Superstar Saga"

worlds/mlss/docs/en_Mario & Luigi Superstar Saga.md

@@ -17,7 +17,7 @@ Other Features such as Turbo through textboxes (Hold L/R+A) and Pipe Warping fro
 
 Enemies and Bosses can be randomized, and their stats can be scaled to feel more like the vanilla game's stats.
 
-Other aspects of the game can be randomized as well such as music, sounds, battle backgrounds, Mario and Luigis Colors, and more.
+Other aspects of the game can be randomized as well such as music, sounds, battle backgrounds, Mario and Luigi's Colors, and more.
 
 ## What is the goal of Mario & Luigi: Superstar Saga when randomized?
 
@@ -63,4 +63,4 @@ Items in a shop from another player's world will display the player name and ite
 
 ## When the player receives an item, what happens?
 
-Items will be placed directly into the players inventory after a few seconds. Sometimes for certain events and cutscenes to be properly triggered right after you recieved an item, you may have to leave and re-enter the room to properly load everything required for the respective event or cutscene.
+Items will be placed directly into the players inventory after a few seconds. Sometimes for certain events and cutscenes to be properly triggered right after you received an item, you may have to leave and re-enter the room to properly load everything required for the respective event or cutscene.