Merge remote-tracking branch 'origin/terastalization-wip' into terastalization-wip

Waterpicker · Waterpicker · commit dd3a5b4de9c1 · 2025-06-29T05:55:00.000-05:00
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0223_remoraid.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0223_remoraid.json
@@ -7,7 +7,7 @@
             "id": "remoraid-1",
             "pokemon": "remoraid",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0224_octillery.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0224_octillery.json
@@ -7,7 +7,7 @@
             "id": "octillery-1",
             "pokemon": "octillery",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0226_mantine.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0226_mantine.json
@@ -7,7 +7,7 @@
             "id": "mantine-1",
             "pokemon": "mantine",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0349_feebas.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0349_feebas.json
@@ -7,7 +7,7 @@
             "id": "feebas-1",
             "pokemon": "feebas",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0350_milotic.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0350_milotic.json
@@ -7,7 +7,7 @@
             "id": "milotic-1",
             "pokemon": "milotic",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0363_spheal.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0363_spheal.json
@@ -7,7 +7,7 @@
             "id": "spheal-1",
             "pokemon": "spheal",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0364_sealeo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0364_sealeo.json
@@ -7,7 +7,7 @@
             "id": "sealeo-1",
             "pokemon": "sealeo",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0365_walrein.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0365_walrein.json
@@ -7,7 +7,7 @@
             "id": "walrein-1",
             "pokemon": "walrein",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clampearl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clampearl.json
@@ -7,7 +7,7 @@
             "id": "clamperl-1",
             "pokemon": "clamperl",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "seafloor",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0456_finneon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0456_finneon.json
@@ -7,7 +7,7 @@
             "id": "finneon-1",
             "pokemon": "finneon",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "seafloor",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0457_lumineon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0457_lumineon.json
@@ -7,7 +7,7 @@
             "id": "lumineon-1",
             "pokemon": "lumineon",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "seafloor",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0458_mantyke.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0458_mantyke.json
@@ -7,7 +7,7 @@
             "id": "mantyke-1",
             "pokemon": "mantyke",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0602_tynamo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0602_tynamo.json
@@ -8,7 +8,7 @@
             "pokemon": "tynamo",
             "presets": [
                 "river",
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0603_eelektrik.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0603_eelektrik.json
@@ -8,7 +8,7 @@
             "pokemon": "eelektrik",
             "presets": [
                 "river",
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0604_eelektross.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0604_eelektross.json
@@ -8,7 +8,7 @@
             "pokemon": "eelektross",
             "presets": [
                 "river",
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0686_inkay.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0686_inkay.json
@@ -7,7 +7,7 @@
             "id": "inkay-1",
             "pokemon": "inkay",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0687_malamar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0687_malamar.json
@@ -7,7 +7,7 @@
             "id": "malamar-1",
             "pokemon": "malamar",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0692_clauncher.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0692_clauncher.json
@@ -7,7 +7,7 @@
             "id": "clauncher-1",
             "pokemon": "clauncher",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0693_clawitzer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0693_clawitzer.json
@@ -7,7 +7,7 @@
             "id": "clawitzer-1",
             "pokemon": "clawitzer",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0747_mareanie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0747_mareanie.json
@@ -7,7 +7,7 @@
             "id": "mareanie-1",
             "pokemon": "mareanie",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0748_toxapex.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0748_toxapex.json
@@ -7,7 +7,7 @@
             "id": "toxapex-1",
             "pokemon": "toxapex",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0779_bruxish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0779_bruxish.json
@@ -7,7 +7,7 @@
             "id": "bruxish-1",
             "pokemon": "bruxish",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0852_clobbopus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0852_clobbopus.json
@@ -7,7 +7,7 @@
             "id": "clobbopus-1",
             "pokemon": "clobbopus",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0853_grapploct.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0853_grapploct.json
@@ -7,7 +7,7 @@
             "id": "grapploct-1",
             "pokemon": "grapploct",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0871_pincurchin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0871_pincurchin.json
@@ -7,7 +7,7 @@
             "id": "pincurchin-1",
             "pokemon": "pincurchin",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0963_finizen.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0963_finizen.json
@@ -7,7 +7,7 @@
             "id": "finizen-1",
             "pokemon": "finizen",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0964_palafin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0964_palafin.json
@@ -7,7 +7,7 @@
             "id": "palafin-1",
             "pokemon": "palafin",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0976_veluza.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0976_veluza.json
@@ -7,7 +7,7 @@
             "id": "veluza-1",
             "pokemon": "veluza",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0977_dondozo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0977_dondozo.json
@@ -7,7 +7,7 @@
             "id": "dondozo-1",
             "pokemon": "dondozo",
             "presets": [
-                "underwater"
+                "water"
             ],
             "type": "pokemon",
             "context": "submerged",
