diff --git a/data/layouts/MossdeepCity/map.bin b/data/layouts/MossdeepCity/map.bin
index 33b38eac6..89bcecc9b 100644
Binary files a/data/layouts/MossdeepCity/map.bin and b/data/layouts/MossdeepCity/map.bin differ
diff --git a/data/layouts/Route106/map.bin b/data/layouts/Route106/map.bin
index 3f9522931..bc0f48371 100644
Binary files a/data/layouts/Route106/map.bin and b/data/layouts/Route106/map.bin differ
diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json
index 2141fe2dd..993605b8c 100644
--- a/data/maps/MossdeepCity/map.json
+++ b/data/maps/MossdeepCity/map.json
@@ -538,6 +538,45 @@
             "trainer_type": "0",
             "x": 64,
             "y": 39
+        },
+        {
+            "elevation": 3,
+            "flag": "FLAG_SYS_WEATHER_CTRL",
+            "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+            "movement_range_x": 0,
+            "movement_range_y": 0,
+            "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+            "script": "Route106_TrainerTrio_Tyler",
+            "trainer_sight_or_berry_tree_id": "0",
+            "trainer_type": "0",
+            "x": 8,
+            "y": 22
+        },
+        {
+            "elevation": 3,
+            "flag": "FLAG_SYS_WEATHER_CTRL",
+            "graphics_id": "EVENT_OBJ_GFX_LASS",
+            "movement_range_x": 0,
+            "movement_range_y": 0,
+            "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+            "script": "Route106_TrainerTrio_Tessa",
+            "trainer_sight_or_berry_tree_id": "0",
+            "trainer_type": "0",
+            "x": 6,
+            "y": 24
+        },
+        {
+            "elevation": 3,
+            "flag": "FLAG_SYS_WEATHER_CTRL",
+            "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
+            "movement_range_x": 0,
+            "movement_range_y": 0,
+            "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+            "script": "Route106_TrainerTrio_Theo",
+            "trainer_sight_or_berry_tree_id": "0",
+            "trainer_type": "0",
+            "x": 11,
+            "y": 23
         }
     ],
     "region_map_section": "MAPSEC_MOSSDEEP_CITY",
diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json
index ba61efff1..7df034bfb 100644
--- a/data/maps/Route106/map.json
+++ b/data/maps/Route106/map.json
@@ -121,45 +121,6 @@
             "trainer_type": "0",
             "x": 29,
             "y": 14
-        },
-        {
-            "elevation": 3,
-            "flag": "0",
-            "graphics_id": "EVENT_OBJ_GFX_LASS",
-            "movement_range_x": 0,
-            "movement_range_y": 0,
-            "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
-            "script": "Route106_TrainerTrio_Tessa",
-            "trainer_sight_or_berry_tree_id": "0",
-            "trainer_type": "0",
-            "x": 63,
-            "y": 14
-        },
-        {
-            "elevation": 3,
-            "flag": "0",
-            "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
-            "movement_range_x": 0,
-            "movement_range_y": 0,
-            "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
-            "script": "Route106_TrainerTrio_Theo",
-            "trainer_sight_or_berry_tree_id": "0",
-            "trainer_type": "0",
-            "x": 68,
-            "y": 14
-        },
-        {
-            "elevation": 3,
-            "flag": "0",
-            "graphics_id": "EVENT_OBJ_GFX_CAMPER",
-            "movement_range_x": 0,
-            "movement_range_y": 0,
-            "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-            "script": "Route106_TrainerTrio_Tyler",
-            "trainer_sight_or_berry_tree_id": "0",
-            "trainer_type": "0",
-            "x": 65,
-            "y": 13
         }
     ],
     "region_map_section": "MAPSEC_ROUTE_106",
diff --git a/data/tilesets/secondary/mossdeep/metatile_attributes.bin b/data/tilesets/secondary/mossdeep/metatile_attributes.bin
index 7ba4797ac..1d3bb7976 100644
Binary files a/data/tilesets/secondary/mossdeep/metatile_attributes.bin and b/data/tilesets/secondary/mossdeep/metatile_attributes.bin differ
diff --git a/data/tilesets/secondary/mossdeep/metatiles.bin b/data/tilesets/secondary/mossdeep/metatiles.bin
index 66eb18607..6c411cf69 100644
Binary files a/data/tilesets/secondary/mossdeep/metatiles.bin and b/data/tilesets/secondary/mossdeep/metatiles.bin differ
diff --git a/data/tilesets/secondary/mossdeep/tiles.png b/data/tilesets/secondary/mossdeep/tiles.png
index 0fc56221d..7b01aad29 100644
Binary files a/data/tilesets/secondary/mossdeep/tiles.png and b/data/tilesets/secondary/mossdeep/tiles.png differ
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index 15c3a06eb..b79fe1e60 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -12604,11 +12604,11 @@ static const struct TrainerMonNoItemDefaultMoves sParty_TrainerTrio_Theo_Badge8[
     {
         .iv = 50,
         .lvl = 45,
-        .species = SPECIES_SNORLAX,
+        .species = SPECIES_LAPRAS,
     },
     {
         .iv = 50,
         .lvl = 45,
-        .species = SPECIES_LAPRAS,
+        .species = SPECIES_SNORLAX,
     }
 };