Merge branch 'beta' into prabbydMirrorArmor

.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[src/*.{js,ts}]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

CREDITS.md

@@ -343,34 +343,39 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 
 # 💻 Development
 
-## Server Owner/Administrator
+## Server Developers
 - pancakes aka patapancakes
 
-## Senior Developers
+## Current and former Development Team members
-- Walker
+- bennybroseph
-- NightKev
+- Brain Frog
-- Moka
-- Temp aka Tempo-anon
-- Madmadness65
-
-## Developers
 - CodeTappert
+- Dakurei
 - flx-sta
-- innerthunder
 - frutescens
+- Greenlamp
+- ImperialSympathizer
+- innerthunder
+- KimJeongSun
+- Madmadness65
+- Moka
+- Navori
+- NightKev
 - Opaquer
+- OrangeRed
+- Sam aka Flashfyre (initial developer, started PokéRogue)
+- sirzento
 - SN34KZ
 - Swain aka torranx
-
+- Temp aka Tempo-anon
-## Junior Developers
+- Walker
-- KimJeongSun
+- Xavion
-- ImperialSympathizer
 
 ## Bug/Issue Managers
-- Snailman
 - Daleks
 - Lily
 - PigeonBar
+- Snailman
 
 ## Other Code Contributors
 - Admiral-Billy
@@ -378,10 +383,7 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - arColm
 - Arxalc
 - AsdarDevelops
-- bennybroseph
-- Brain Frog
 - Corrade
-- Dakurei
 - DustinLin
 - ElizaAlex
 - EmberCM
@@ -391,7 +393,6 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - francktrouillez
 - FredeX
 - geeilhan
-- Greenlamp
 - happinyz
 - hayuna
 - InfernoVulpix
@@ -411,7 +412,6 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - Neverblade
 - NxKarim
 - okimin
-- OrangeRed
 - PigeonBar
 - PrabbyDD
 - prateau
@@ -421,10 +421,8 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - RedstonewolfX
 - ReneGV
 - rnicar245
-- Sam aka Flashfyre (initial developer, started PokéRogue)
 - schmidtc1
 - shayebeadling
-- sirzento
 - snoozbuster
 - sodaMelon
 - td76099

docs/enemy-ai.md

@@ -80,8 +80,8 @@ As part of the move selection process, the enemy Pokémon must compute a **targe
 A move's UBS and TBS are computed with the respective functions in the `Move` class:
 
 ```ts
-getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer;
+getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number;
-getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer;
+getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number;
 ```
 
 Logically, these functions are very similar – they add up their respective benefit scores from each of the move's attributes (as determined by `attr.getUserBenefitScore`, and `attr.getTargetBenefitScore`, respectively) and return the total benefit score. However, there are two key functional differences in how the UBS and TBS of a move are handled:

eslint.config.js

@@ -46,6 +46,7 @@ export default [
             "computed-property-spacing": ["error", "never" ], // Enforces consistent spacing inside computed property brackets
             "space-infix-ops": ["error", { "int32Hint": false }], // Enforces spacing around infix operators
             "no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1, "maxBOF": 0 }], // Disallows multiple empty lines
+            "@typescript-eslint/consistent-type-imports": "error", // Enforces type-only imports wherever possible
         }
     }
 ]

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.4.0",
+	"version": "1.5.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.4.0",
+			"version": "1.5.2",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.4.0",
+	"version": "1.5.2",
 	"type": "module",
 	"scripts": {
 		"start": "vite",
@@ -20,7 +20,10 @@
 		"depcruise": "depcruise src",
 		"depcruise:graph": "depcruise src --output-type dot | node dependency-graph.js > dependency-graph.svg",
 		"create-test": "node ./create-test-boilerplate.js",
-		"postinstall": "npx lefthook install && npx lefthook run post-merge"
+		"postinstall": "npx lefthook install && npx lefthook run post-merge",
+		"update-version:patch": "npm version patch --force --no-git-tag-version",
+		"update-version:minor": "npm version minor --force --no-git-tag-version",
+		"update-locales:remote": "git submodule update --progress --init --recursive --force --remote"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.3.0",
@@ -61,11 +64,5 @@
 	},
 	"engines": {
 		"node": ">=20.0.0"
-	},
-	"imports": {
-		"#enums/*": "./enums/*",
-		"#app": "./src/main.js",
-		"#app/*": "./src/*",
-		"#test/*": "./src/test/*"
 	}
 }

public/images/pokemon/variant/3-gigantamax.json

@@ -4,6 +4,8 @@
 		"ffee52": "37d6de",
 		"debd29": "078a8f",
 		"833100": "002112",
+		"830009": "23033b",
+		"189d87": "c2247b",
 		"ff7b73": "712f8f",
 		"de4141": "3f1375",
 		"ffbdbd": "a266b0",
@@ -11,6 +13,7 @@
 		"107b6a": "9e1976",
 		"105241": "4f2800",
 		"83de7b": "a37707",
+		"2e5529": "38001c",
 		"5a9c39": "705207",
 		"20b49c": "de3592",
 		"fdfdfd": "fdfdfd",
@@ -21,14 +24,17 @@
 		"ffee52": "f75ea8",
 		"debd29": "a30a66",
 		"833100": "0b2e01",
+		"830009": "154205",
+		"189d87": "f17f05",
 		"ff7b73": "9db042",
 		"de4141": "3c8227",
 		"ffbdbd": "e7e385",
 		"101010": "101010",
 		"107b6a": "d44300",
-		"105241": "030129",
+		"105241": "381601",
-		"83de7b": "433d99",
+		"83de7b": "80ced9",
-		"5a9c39": "19164f",
+		"2e5519": "011c38",
+		"5a9c39": "446b94",
 		"20b49c": "fa8405",
 		"fdfdfd": "fdfdfd",
 		"5ad5c5": "faa405"

public/images/pokemon/variant/3.json

@@ -1,6 +1,7 @@
 {
 	"1": {
 		"843100": "033b22",
+		"830009": "23033b",
 		"ff7b73": "712f8f",
 		"ffbdbd": "a266b0",
 		"debd29": "078a8f",
@@ -13,11 +14,13 @@
 		"5a9c3a": "b34952",
 		"84de7b": "ff745e",
 		"5ad6c5": "f062a4",
+		"2e5519": "38001c",
 		"21b59c": "de3592",
 		"ffffff": "ffffff"
 	},
 	"2": {
 		"843100": "420514",
+		"830009": "154205",
 		"ff7b73": "9db042",
 		"ffbdbd": "e7e385",
 		"debd29": "a30a66",
@@ -30,6 +33,7 @@
 		"5a9c3a": "446b94",
 		"84de7b": "80ced9",
 		"5ad6c5": "faa405",
+		"2e5519": "011c38",
 		"21b59c": "fa8405",
 		"ffffff": "ffffff"
 	}

public/images/pokemon/variant/658-ash.json

@@ -4,6 +4,7 @@
 		"3f4447": "466698",
 		"de3431": "3fca9f",
 		"f8f8f8": "a1e9f0",
+		"f4f4f4": "d7eff4",
 		"7b282e": "0e3e81",
 		"6b1d1d": "206d74",
 		"4ebdd9": "41a7b0",
@@ -11,7 +12,7 @@
 		"bfbfbf": "8cc7d4",
 		"ffb2bf": "b7e9ff",
 		"bf4c60": "4386df",
-		"fff0a6": "271f4c",
+		"fff0a6": "208698",
 		"3e7acc": "6b4592",
 		"18335c": "170738",
 		"f2798d": "8dcfff",
@@ -25,6 +26,7 @@
 		"3f4447": "466698",
 		"de3431": "9ceec6",
 		"f8f8f8": "89d2b8",
+		"f4f4f4": "d7eff4",
 		"7b282e": "152a5c",
 		"6b1d1d": "356e8d",
 		"4ebdd9": "2f6e74",

public/images/pokemon/variant/_masterlist.json

@@ -835,7 +835,7 @@
 	"6713": [0, 1, 1],
 	"8901": [1, 1, 1],
 	"female": {
-		"3": [0, 2, 1],
+		"3": [0, 1, 1],
 		"19": [0, 1, 1],
 		"20": [0, 1, 1],
 		"25": [0, 1, 1],
@@ -869,6 +869,7 @@
 		"198": [0, 1, 1],
 		"203": [0, 1, 1],
 		"207": [0, 1, 1],
+		"212": [1, 1, 1],
 		"215": [0, 1, 1],
 		"217": [1, 1, 1],
 		"229": [0, 1, 1],
@@ -1778,6 +1779,7 @@
 			"198": [0, 1, 1],
 			"203": [0, 1, 1],
 			"207": [0, 1, 1],
+			"212": [1, 1, 1],
 			"215": [0, 1, 1],
 			"217": [1, 1, 1],
 			"229": [0, 1, 1],

public/images/pokemon/variant/back/3-gigantamax.json

@@ -1,6 +1,7 @@
 {
 	"1": {
 		"833100": "180136",
+		"830009": "23033b",
 		"bd6a31": "012729",
 		"ffee52": "37d6de",
 		"debd29": "078a8f",
@@ -8,15 +9,18 @@
 		"de4141": "3f1375",
 		"ff7b73": "712f8f",
 		"ffbdbd": "a266b0",
-		"5a9c39": "705207",
+		"e8a3a3": "91579e",
-		"105241": "4f2800",
+		"5a9c39": "b34952",
-		"83de7b": "a37707",
+		"105241": "190038",
+		"2e5519": "38001c",
+		"83de7b": "ff745e",
 		"107b6a": "b80479",
 		"20b49c": "de3592",
 		"fdfdfd": "fdfdfd"
 	},
 	"2": {
 		"833100": "0b2e01",
+		"830009": "154205",
 		"bd6a31": "420514",
 		"ffee52": "f75ea8",
 		"debd29": "a30a66",
@@ -24,9 +28,11 @@
 		"de4141": "3c8227",
 		"ff7b73": "9db042",
 		"ffbdbd": "e7e385",
-		"5a9c39": "19164f",
+		"e8a3a3": "ced76f",
-		"105241": "030129",
+		"5a9c39": "446b94",
-		"83de7b": "433d99",
+		"105241": "381601",
+		"2e5519": "011c38",
+		"83de7b": "80ced9",
 		"107b6a": "d15d04",
 		"20b49c": "fa8405",
 		"fdfdfd": "fdfdfd"

public/images/pokemon/variant/back/3.json

@@ -1,6 +1,7 @@
 {
 	"1": {
 		"843100": "033b22",
+		"830009": "23033b",
 		"ffbdbd": "a266b0",
 		"ff7b73": "712f8f",
 		"debd29": "078a8f",
@@ -11,6 +12,7 @@
 		"105242": "190038",
 		"107b6b": "c21f7e",
 		"5a9c3a": "b34952",
+		"2e5519": "38001c",
 		"5ad6c5": "f062a4",
 		"21b59c": "de3592",
 		"84de7b": "ff745e",
@@ -18,6 +20,7 @@
 	},
 	"2": {
 		"843100": "420514",
+		"830009": "154205",
 		"ffbdbd": "e7e385",
 		"ff7b73": "9db042",
 		"debd29": "a30a66",
@@ -25,7 +28,8 @@
 		"de4242": "3c8227",
 		"101010": "101010",
 		"ffef52": "f75ea8",
-		"105242": "001a33",
+		"105242": "381601",
+		"2e5519": "011c38",
 		"107b6b": "d15d04",
 		"5a9c3a": "446b94",
 		"5ad6c5": "faa405",

public/images/pokemon/variant/back/987.json

@@ -9,7 +9,7 @@
 		"de62a4": "ffc668",
 		"4a83a4": "387fa7",
 		"314a62": "244260",
-		"70bbb4": "f8d371",
+		"548e88": "2d60bb",
 		"a4295a": "cc762f"
 	},
 	"1": {
@@ -22,7 +22,7 @@
 		"de62a4": "ffdf90",
 		"4a83a4": "a1c8db",
 		"314a62": "7396b4",
-		"70bbb4": "70bbb4",
+		"548e88": "a9c0c6",
 		"a4295a": "e28c27"
 	},
 	"2": {
@@ -35,7 +35,7 @@
 		"de62a4": "e25038",
 		"4a83a4": "e6aa47",
 		"314a62": "b56f2a",
-		"70bbb4": "f8d371",
+		"548e88": "e0b544",
 		"a4295a": "a62a21"
 	}
 }

public/images/pokemon/variant/back/female/212.json

@@ -0,0 +1,41 @@
+{
+	"0": {
+		"632929": "215a2d",
+		"f76b6b": "8cce73",
+		"a52929": "2f794e",
+		"101010": "101010",
+		"d63a3a": "4a9c53",
+		"9494a5": "9494a5",
+		"ffffff": "ffffff",
+		"b5b5ce": "b5b5ce",
+		"3a3a4a": "3a3a4a",
+		"9c6b21": "9c6b21",
+		"dec510": "dec510"
+	},
+	"1": {
+		"632929": "2f2962",
+		"f76b6b": "639cf7",
+		"a52929": "29429c",
+		"101010": "101010",
+		"d63a3a": "4263ef",
+		"9494a5": "6262a4",
+		"ffffff": "ffffff",
+		"b5b5ce": "b5b5ce",
+		"3a3a4a": "3c3c50",
+		"9c6b21": "131387",
+		"dec510": "10bdde"
+	},
+	"2": {
+		"632929": "645117",
+		"f76b6b": "c59f29",
+		"a52929": "b88619",
+		"101010": "101010",
+		"d63a3a": "ffca2a",
+		"9494a5": "3c4543",
+		"ffffff": "ffffff",
+		"b5b5ce": "b5b5ce",
+		"3a3a4a": "282d2c",
+		"9c6b21": "9c6b21",
+		"dec510": "dec510"
+	}
+}

public/images/pokemon/variant/back/female/3.json

@@ -1,6 +1,7 @@
 {
 	"1": {
 		"843100": "033b22",
+		"830009": "23033b",
 		"ffbdbd": "a266b0",
 		"ffef52": "37d6de",
 		"debd29": "078a8f",
@@ -10,6 +11,7 @@
 		"101010": "101010",
 		"105242": "190038",
 		"107b6b": "9e1976",
+		"2e5519": "38001c",
 		"5a9c3a": "b34952",
 		"5ad6c5": "f062a4",
 		"21b59c": "de3592",
@@ -18,6 +20,7 @@
 	},
 	"2": {
 		"843100": "420514",
+		"830009": "154205",
 		"ffbdbd": "e7e385",
 		"ffef52": "f75ea8",
 		"debd29": "a30a66",
@@ -27,6 +30,7 @@
 		"101010": "101010",
 		"105242": "381601",
 		"107b6b": "d15d04",
+		"2e5519": "011c38",
 		"5a9c3a": "446b94",
 		"5ad6c5": "faa405",
 		"21b59c": "fa8405",

public/images/pokemon/variant/exp/658-ash.json

@@ -4,6 +4,7 @@
 		"3f4447": "466698",
 		"de3431": "3fca9f",
 		"f8f8f8": "a1e9f0",
+		"f4f4f4": "d7effa",
 		"7b282e": "0e3e81",
 		"6b1d1d": "206d74",
 		"4ebdd9": "41a7b0",
@@ -25,6 +26,7 @@
 		"3f4447": "466698",
 		"de3431": "9ceec6",
 		"f8f8f8": "89d2b8",
+		"f4f4f4": "d7effa",
 		"7b282e": "152a5c",
 		"6b1d1d": "356e8d",
 		"4ebdd9": "2f6e74",

public/images/pokemon/variant/exp/back/987.json

@@ -8,7 +8,7 @@
 		"0f0f0f": "0f0f0f",
 		"314a62": "244260",
 		"621841": "71370f",
-		"70bbb4": "f8d371",
+		"548e88": "2d60bb",
 		"de62a4": "ffc668",
 		"a4295a": "cc762f"
 	},
@@ -21,7 +21,7 @@
 		"0f0f0f": "0f0f0f",
 		"314a62": "7396b4",
 		"621841": "7b3c08",
-		"70bbb4": "70bbb4",
+		"548e88": "a9c0c6",
 		"de62a4": "ffdf90",
 		"a4295a": "e28c27"
 	},
@@ -34,7 +34,7 @@
 		"0f0f0f": "0f0f0f",
 		"314a62": "b56f2a",
 		"621841": "5a0a05",
-		"70bbb4": "f8d371",
+		"548e88": "e0b544",
 		"de62a4": "e25038",
 		"a4295a": "a62a21"
 	}

public/images/pokemon/variant/female/212.json

@@ -0,0 +1,41 @@
+{
+	"0": {
+		"632929": "215a2d",
+		"f76b6b": "8cce73",
+		"101010": "101010",
+		"3a3a4a": "3a3a4a",
+		"ffffff": "ffffff",
+		"d63a3a": "4a9c53",
+		"b5b5ce": "b5b5ce",
+		"9494a5": "9494a5",
+		"a52929": "2f794e",
+		"dec510": "dec510",
+		"9c6b21": "9c6b21"
+	},
+	"1": {
+		"632929": "2f2962",
+		"f76b6b": "639cf7",
+		"101010": "101010",
+		"3a3a4a": "3c3c50",
+		"ffffff": "ffffff",
+		"d63a3a": "4263ef",
+		"b5b5ce": "b5b5ce",
+		"9494a5": "6262a4",
+		"a52929": "29429c",
+		"dec510": "10bdde",
+		"9c6b21": "131387"
+	},
+	"2": {
+		"632929": "645117",
+		"f76b6b": "c59f29",
+		"101010": "101010",
+		"3a3a4a": "282d2c",
+		"ffffff": "ffffff",
+		"d63a3a": "ffca2a",
+		"b5b5ce": "b5b5ce",
+		"9494a5": "3c4543",
+		"a52929": "b88619",
+		"dec510": "dec510",
+		"9c6b21": "9c6b21"
+	}
+}

public/images/pokemon/variant/female/3.json

@@ -1,19 +1,41 @@
 {
+	"1": {
+		"843100": "033b22",
+		"830009": "23033b",
+		"ffbdbd": "a266b0",
+		"ffef52": "37d6de",
+		"debd29": "078a8f",
+		"ff7b73": "712f8f",
+		"bd6b31": "168a69",
+		"de4242": "3f1375",
+		"101010": "101010",
+		"105242": "190038",
+		"107b6b": "9e1976",
+		"2e5519": "38001c",
+		"5a9c3a": "b34952",
+		"5ad6c5": "f062a4",
+		"21b59c": "de3592",
+		"84de7b": "ff745e",
+		"ffffff": "ffffff"
+	},
 	"2": {
 		"843100": "420514",
-		"ff7b73": "9db042",
+		"830009": "154205",
 		"ffbdbd": "e7e385",
 		"ffef52": "f75ea8",
 		"debd29": "a30a66",
+		"ff7b73": "9db042",
 		"bd6b31": "852a41",
 		"de4242": "3c8227",
 		"101010": "101010",
 		"105242": "381601",
-		"107b6b": "d44300",
+		"107b6b": "d15d04",
+		"2e5519": "011c38",
 		"5a9c3a": "446b94",
-		"84de7b": "80ced9",
 		"5ad6c5": "faa405",
 		"21b59c": "fa8405",
-		"ffffff": "ffffff"
+		"84de7b": "80ced9",
+		"ffffff": "ffffff",
+		"2f561a": "011b34"
 	}
 }

public/images/trainer/aether_grunt_f.json

@@ -4,8 +4,8 @@
 			"image": "aether_grunt_f.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 69,
+				"w": 70,
-				"h": 69
+				"h": 70
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 39,
-						"h": 80
+						"h": 70
 					},
 					"spriteSourceSize": {
-						"x": 23,
+						"x": 0,
-						"y": 10,
+						"y": 0,
-						"w": 35,
+						"w": 39,
-						"h": 69
+						"h": 70
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 35,
+						"w": 39,
-						"h": 69
+						"h": 70
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0c9e77856d3b434e719021572bcb93de:f9c45dc5d67009b134dd1bbc5593f6ec:a694f8828aff21c718e5161e2fd63ade$"
+		"smartupdate": "$TexturePacker:SmartUpdate:0a678d2035c82d3741f2de29e01d42d3:374042fde99a4ff05c5e90cedbc5bd1f:a694f8828aff21c718e5161e2fd63ade$"
 	}
 }

public/images/trainer/aether_grunt_m.json

@@ -4,8 +4,8 @@
 			"image": "aether_grunt_m.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 65,
+				"w": 69,
-				"h": 65
+				"h": 69
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 45,
-						"h": 80
+						"h": 69
 					},
 					"spriteSourceSize": {
-						"x": 16,
+						"x": 0,
-						"y": 14,
+						"y": 0,
-						"w": 47,
+						"w": 45,
-						"h": 65
+						"h": 69
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 47,
+						"w": 45,
-						"h": 65
+						"h": 69
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:963887cf29549ad3c123b8055cb4d701:68004c4a6e04c93bd21c26a6f8921f0c:d2241fc11d0fc31b26ecbedae6da74f4$"
+		"smartupdate": "$TexturePacker:SmartUpdate:f7ad29bea8c4a179c08958890cadb04b:741fc1b2e43d2da720c249c6f81910bc:d2241fc11d0fc31b26ecbedae6da74f4$"
 	}
 }

public/images/trainer/aqua_grunt_f.json

@@ -4,8 +4,8 @@
 			"image": "aqua_grunt_f.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 71,
+				"w": 73,
-				"h": 71
+				"h": 73
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 34,
-						"h": 80
+						"h": 73
 					},
 					"spriteSourceSize": {
-						"x": 22,
+						"x": 0,
-						"y": 8,
+						"y": 0,
-						"w": 36,
+						"w": 34,
-						"h": 71
+						"h": 73
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 36,
+						"w": 34,
-						"h": 71
+						"h": 73
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6db25cb5753163d19bca8e2db45849ae:7d8f51509862bfdf8a78bf42dd0005cd:af0aa9494be37941522487032b556989$"
+		"smartupdate": "$TexturePacker:SmartUpdate:99d76e35df4b09fc9d312218d8fa8cc7:8ad846929ea03b5fb70fd16144e5e2fa:af0aa9494be37941522487032b556989$"
 	}
 }

public/images/trainer/aqua_grunt_m.json

@@ -4,8 +4,8 @@
 			"image": "aqua_grunt_m.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 73,
+				"w": 74,
-				"h": 73
+				"h": 74
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 38,
-						"h": 80
+						"h": 74
 					},
 					"spriteSourceSize": {
-						"x": 17,
+						"x": 0,
-						"y": 6,
+						"y": 0,
-						"w": 46,
+						"w": 38,
-						"h": 73
+						"h": 74
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 46,
+						"w": 38,
-						"h": 73
+						"h": 74
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:efd07ff3ed1e610150a4b8ca18974343:d9b85b9eb11182e9e4669e2bd8b08694:72b7b50231708a9486d5f315824e4df1$"
+		"smartupdate": "$TexturePacker:SmartUpdate:ea2cdca90584089079af92307948ecdc:331e1f5314abbfcf58331ab0b9fd1c40:72b7b50231708a9486d5f315824e4df1$"
 	}
 }

public/images/trainer/archie.json

@@ -4,8 +4,8 @@
 			"image": "archie.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 80,
+				"w": 79,
-				"h": 80
+				"h": 79
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 58,
-						"h": 80
+						"h": 79
 					},
 					"spriteSourceSize": {
-						"x": 21,
+						"x": 0,
 						"y": 0,
-						"w": 42,
+						"w": 58,
-						"h": 80
+						"h": 79
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 42,
+						"w": 58,
-						"h": 80
+						"h": 79
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bfa7fdd7b6ac9be68dc9dc562fb8339f:06f87a279450b21b19294ba956b69c26:4b7980be4e3ac1d20c9eaf970913ec63$"
+		"smartupdate": "$TexturePacker:SmartUpdate:1edc051db037c1742819ac8674ebe4be:bfaa715c0faf707c1b20ab8259d42a35:4b7980be4e3ac1d20c9eaf970913ec63$"
 	}
 }

public/images/trainer/atticus.json

@@ -4,8 +4,8 @@
 			"image": "atticus.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 46,
+				"w": 55,
-				"h": 46
+				"h": 55
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 55,
-						"h": 80
+						"h": 49
 					},
 					"spriteSourceSize": {
-						"x": 21,
+						"x": 0,
-						"y": 33,
+						"y": 0,
-						"w": 43,
+						"w": 55,
-						"h": 46
+						"h": 49
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 43,
+						"w": 55,
-						"h": 46
+						"h": 49
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6dcd7c3d3982793cbca0d6fcd1f9260e:19c44634629fadd9d039d23dc71ec987:d26ede35f15aa571d5a7a2dd2fb868e1$"
+		"smartupdate": "$TexturePacker:SmartUpdate:2c1a2ecebeac4770c51422bede6add57:5c82bf231c27d62e440081f186eb1da9:d26ede35f15aa571d5a7a2dd2fb868e1$"
 	}
 }

public/images/trainer/courtney.json

@@ -4,8 +4,8 @@
 			"image": "courtney.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 52,
+				"w": 72,
-				"h": 80
+				"h": 72
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 52,
+						"w": 44,
-						"h": 80
+						"h": 72
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 52,
+						"w": 44,
-						"h": 80
+						"h": 72
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 52,
+						"w": 44,
-						"h": 80
+						"h": 72
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
+		"smartupdate": "$TexturePacker:SmartUpdate:c39b0f300dc09114fba490e6ab68b2b5:a24a6dbdd0e3f4d4b7a567673b73316a:b0c7d3a5747d1c7edafa00c8e6d1257e$"
 	}
 }

public/images/trainer/eri.json

@@ -4,8 +4,8 @@
 			"image": "eri.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 74,
+				"w": 78,
-				"h": 74
+				"h": 78
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 52,
-						"h": 80
+						"h": 78
 					},
 					"spriteSourceSize": {
-						"x": 15,
+						"x": 0,
-						"y": 5,
+						"y": 0,
-						"w": 45,
+						"w": 52,
-						"h": 74
+						"h": 78
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 45,
+						"w": 52,
-						"h": 74
+						"h": 78
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:59594ac27e74ec85e2949d12ff680dc2:d65b6b00858ac47b26ef8393a8fa6795:d7f4cd3ff755f8074c14d3006b0c8301$"
+		"smartupdate": "$TexturePacker:SmartUpdate:d413fdffea2ec50087a67019a6ce4063:66a18e7a21ca3a1953778dbc09074ab6:d7f4cd3ff755f8074c14d3006b0c8301$"
 	}
 }

public/images/trainer/faba.json

@@ -4,8 +4,8 @@
 			"image": "faba.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 74,
+				"w": 76,
-				"h": 74
+				"h": 76
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 29,
-						"h": 80
+						"h": 76
 					},
 					"spriteSourceSize": {
-						"x": 25,
+						"x": 0,
-						"y": 5,
+						"y": 0,
-						"w": 31,
+						"w": 29,
-						"h": 74
+						"h": 76
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 31,
+						"w": 29,
-						"h": 74
+						"h": 76
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:47622708d99a504998950bd9c389a504:fe1c51be191dd9fafb5b6f309c08ae1a:8d64db18930325b8b513740c1d83ce4c$"
+		"smartupdate": "$TexturePacker:SmartUpdate:bbfce6e1ed69401694ce8c2537dd1fea:a2c9351e4ba08d44cafa66ecdf509866:8d64db18930325b8b513740c1d83ce4c$"
 	}
 }

public/images/trainer/flare_grunt_f.json

@@ -4,8 +4,8 @@
 			"image": "flare_grunt_f.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 80,
+				"w": 85,
-				"h": 80
+				"h": 85
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 23,
-						"h": 80
+						"h": 85
 					},
 					"spriteSourceSize": {
-						"x": 31,
+						"x": 0,
 						"y": 0,
 						"w": 23,
-						"h": 80
+						"h": 85
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
 						"w": 23,
-						"h": 80
+						"h": 85
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c30bf82452209a923f4becf13d275a9a:a6355b09f92c9c0388d0b919010f587f:0638dbf213f8a974eb5af76eb1e5ddeb$"
+		"smartupdate": "$TexturePacker:SmartUpdate:88d242a8c3b9859307ecdd290c30ce7d:acd04d60ab09f18e86e4e5727132dac2:0638dbf213f8a974eb5af76eb1e5ddeb$"
 	}
 }

public/images/trainer/flare_grunt_m.json

@@ -14,12 +14,12 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 31,
-						"h": 80
+						"h": 77
 					},
 					"spriteSourceSize": {
-						"x": 24,
+						"x": 0,
-						"y": 2,
+						"y": 0,
 						"w": 31,
 						"h": 77
 					},
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a26606e70778f88a1a7053b2f2420dde:84abf0d0f6bc90c6a60f660567b2d641:adc35a4070bac9fe828c2605a3b15744$"
+		"smartupdate": "$TexturePacker:SmartUpdate:8683e52bbd1a42992f4d7ab8aa65a2a1:e8279cd322279bc5f8e2bb5797e6f818:adc35a4070bac9fe828c2605a3b15744$"
 	}
 }

public/images/trainer/giacomo.json

@@ -4,8 +4,8 @@
 			"image": "giacomo.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 75,
+				"w": 71,
-				"h": 75
+				"h": 71
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 37,
-						"h": 80
+						"h": 71
 					},
 					"spriteSourceSize": {
-						"x": 23,
+						"x": 0,
-						"y": 4,
+						"y": 0,
 						"w": 37,
-						"h": 75
+						"h": 71
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
 						"w": 37,
-						"h": 75
+						"h": 71
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8c4e7da48e5667abc6d364330268c092:0fa43e58d8a746d3b86cb2dd763719f4:8603cc19e888c8c8de62177f4011577c$"
+		"smartupdate": "$TexturePacker:SmartUpdate:8d4b9bca01f3729556cd02a8795c3e89:cb2840cbbd1e5a614bfa6bcb23db5b62:8603cc19e888c8c8de62177f4011577c$"
 	}
 }

public/images/trainer/guzma.json

@@ -4,8 +4,8 @@
 			"image": "guzma.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 58,
+				"w": 64,
-				"h": 58
+				"h": 64
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 34,
-						"h": 80
+						"h": 64
 					},
 					"spriteSourceSize": {
-						"x": 21,
+						"x": 0,
-						"y": 20,
+						"y": 0,
-						"w": 37,
+						"w": 34,
-						"h": 58
+						"h": 64
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 37,
+						"w": 34,
-						"h": 58
+						"h": 64
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c3b08a562a2882d1ca8b5e031e245da9:72a8305e547f091d15abccd2b142e401:3b302c7f9eb6ea81b65bcaeead4a95a9$"
+		"smartupdate": "$TexturePacker:SmartUpdate:90cfe8ae514c30ddf48840678b251141:87a93d268c61327ad913bba3b052686b:3b302c7f9eb6ea81b65bcaeead4a95a9$"
 	}
 }

public/images/trainer/hala.json

@@ -4,8 +4,8 @@
 			"image": "hala.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 78,
+				"w": 82,
-				"h": 78
+				"h": 82
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 59,
+						"w": 58,
-						"h": 78
+						"h": 82
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 59,
+						"w": 58,
-						"h": 78
+						"h": 82
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 59,
+						"w": 58,
-						"h": 78
+						"h": 82
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b6547cc9975d92a02b99fd63122d740b:0a72e0ac4fcbfe4329a7dcdad284ab36:7c2af56b9a9851f2e2eaeaf0cdca9370$"
+		"smartupdate": "$TexturePacker:SmartUpdate:57dc13db648785ad4694bf67c40fa21d:ee2bc7184f4f48ab8ba3c10c89bfc8f0:7c2af56b9a9851f2e2eaeaf0cdca9370$"
 	}
 }

public/images/trainer/hau.json

@@ -4,8 +4,8 @@
 			"image": "hau.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 70,
+				"w": 71,
-				"h": 70
+				"h": 71
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 24,
-						"h": 80
+						"h": 71
 					},
 					"spriteSourceSize": {
-						"x": 27,
+						"x": 0,
-						"y": 9,
+						"y": 0,
-						"w": 29,
+						"w": 24,
-						"h": 70
+						"h": 71
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 29,
+						"w": 24,
-						"h": 70
+						"h": 71
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:688d6d27e686efec45b144ba4544f248:676457a4e9dfbcad0510f6e7bfa73514:d4c7e8b349477c2295b49b0e99b91bb3$"
+		"smartupdate": "$TexturePacker:SmartUpdate:0d500afd9a36f32a23b5a316dcf397d9:aa5d3e58d6df67b90e484ec7f345a4cf:d4c7e8b349477c2295b49b0e99b91bb3$"
 	}
 }

public/images/trainer/korrina.json

@@ -4,8 +4,8 @@
 			"image": "korrina.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 75,
+				"w": 83,
-				"h": 75
+				"h": 83
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 80,
+						"w": 57,
-						"h": 80
+						"h": 83
 					},
 					"spriteSourceSize": {
-						"x": 10,
+						"x": 0,
-						"y": 4,
+						"y": 0,
-						"w": 56,
+						"w": 57,
-						"h": 75
+						"h": 83
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 56,
+						"w": 57,
-						"h": 75
+						"h": 83
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:43a6564beec2569a58110232e9752b64:0decef066ae75dc7f3bd0c811f9a92d1:ed5be09cd8b82ed6439ff8617ffa74c0$"
+		"smartupdate": "$TexturePacker:SmartUpdate:1dc28e18e99698fbfd8a110a1dc737f2:79d24176afd3059dc69ce785ce672bbb:ed5be09cd8b82ed6439ff8617ffa74c0$"
 	}
 }