French weather.ts corrections (#923)

* French weather.ts corrections

* French weather.ts corrections

.github/workflows/deploy.yml

@@ -41,4 +41,6 @@ jobs:
           files: |
             https://pokerogue.net/
             https://pokerogue.net/index.html
-            https://pokerogue.net/manifest.json
+            https://pokerogue.net/manifest.json
+            https://pokerogue.net/manifest.webmanifest
+            https://pokerogue.net/service-worker.js

.gitignore

@@ -33,5 +33,6 @@ public/images/pokemon/icons/input/output/*
 public/images/character/*/
 src/data/battle-anim-raw-data*.ts
 src/data/battle-anim-data.ts
+src/overrides.ts
 
 coverage

README.md

@@ -19,7 +19,7 @@ If you have the motivation and experience with Typescript/Javascript (or are wil
 ### ❔ FAQ 
 
 **How do I test a new _______?**
-- In the `battle-scene.ts` file there are overrides for most values you'll need to change for testing
+- In the `src/overrides.ts` file there are overrides for most values you'll need to change for testing
 
 
 ## 🪧 To Do
@@ -44,6 +44,8 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s
     - Arata Iiyoshi
     - Atsuhiro Ishizuna
   - Pokémon Black/White 2
+  - Firel (Custom Metropolis and Laboratory biome music)
+  - Lmz (Custom Jungle biome music)
   - edifette (Title screen music)
 
 ### 🎵 Sound Effects

index.css

@@ -150,6 +150,10 @@ body {
   display: none;
 }
 
+#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']) #apad #apadStats {
+  display: none;
+}
+
 #apad .apadRectBtnContainer + .apadSqBtnContainer {
   top: calc(var(--controls-size) * -1.9);
   left: calc(var(--controls-size) * -0.9);

index.html

@@ -2,6 +2,7 @@
 <html lang="en">
 
 <head>
+	<meta charset="UTF-8" />
 	<title>PokéRogue</title>
 	<meta name="description" content="A Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, and reaching Pokémon stats you never thought possible." />
 	<meta name="theme-color" content="#da3838" />
@@ -11,7 +12,7 @@
 	<meta property="og:image" content="https://pokerogue.net/logo512.png" />
 	<link rel="apple-touch-icon" href="./logo512.png" />
 	<link rel="shortcut icon" type="image/png" href="./logo512.png" />
-	<meta charset="UTF-8" />
+	<link rel="canonical" href="https://pokerogue.net" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
 	<style type="text/css">
 		@font-face {
@@ -74,6 +75,9 @@
 				<div id="apadCycleVariant" class="apadSqBtn apadBtn" data-key="CYCLE_VARIANT">
 					<text class="apadLabel apadLabelSmall">V</text>
 				</div>
+				<div id="apadStats" class="apadRectBtn apadBtn" data-key="STATS">
+					<text class="apadLabel apadLabelSmall">C</text>
+				</div>
 				<div id="apadMenu" class="apadRectBtn apadBtn" data-key="MENU">
 					<text class="apadLabel apadLabelSmall">Menu</text>
 				</div>

package-lock.json

@@ -1,16 +1,17 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.0.1",
+	"version": "1.0.4",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.0.1",
+			"version": "1.0.4",
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",
 				"crypto-js": "^4.2.0",
 				"i18next": "^23.11.1",
+				"i18next-browser-languagedetector": "^7.2.1",
 				"json-stable-stringify": "^1.1.0",
 				"phaser": "^3.70.0",
 				"phaser3-rex-plugins": "^1.1.84"
@@ -2772,6 +2773,14 @@
 				"@babel/runtime": "^7.23.2"
 			}
 		},
+		"node_modules/i18next-browser-languagedetector": {
+			"version": "7.2.1",
+			"resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-7.2.1.tgz",
+			"integrity": "sha512-h/pM34bcH6tbz8WgGXcmWauNpQupCGr25XPp9cZwZInR9XHSjIFDYp1SIok7zSPsTOMxdvuLyu86V+g2Kycnfw==",
+			"dependencies": {
+				"@babel/runtime": "^7.23.2"
+			}
+		},
 		"node_modules/i18next-http-backend": {
 			"version": "2.5.0",
 			"resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.5.0.tgz",

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.0.3",
+	"version": "1.0.4",
 	"type": "module",
 	"scripts": {
 		"start": "vite",
@@ -31,6 +31,7 @@
 		"@material/material-color-utilities": "^0.2.7",
 		"crypto-js": "^4.2.0",
 		"i18next": "^23.11.1",
+		"i18next-browser-languagedetector": "^7.2.1",
 		"json-stable-stringify": "^1.1.0",
 		"phaser": "^3.70.0",
 		"phaser3-rex-plugins": "^1.1.84"

public/battle-anims/lick.json

@@ -1978,7 +1978,7 @@
         },
         {
           "frameIndex": 0,
-          "resourceName": "PRAS- Sketch and Lick",
+          "resourceName": "PRAS- Sketch + Lick",
           "bgX": 0,
           "bgY": 0,
           "opacity": 0,

public/exp-sprites.json

@@ -4539,20 +4539,44 @@
     "1000",
     "1001",
     "1004",
+    "1007-apex",
+    "1007-apex",
+    "1007-apex",
+    "1007-apex",
+    "1008-ultimate",
+    "127-mega",
+    "142-mega",
+    "150-mega",
+    "150-mega",
     "181-mega",
     "212-mega",
     "282-mega_2",
     "282-mega_2",
     "282-mega_3",
     "282-mega_3",
+    "3-mega_2",
+    "3-mega_2",
+    "3-mega_3",
+    "3-mega_3",
     "303-mega",
+    "306-mega",
+    "308-mega",
+    "310-mega",
     "334-mega",
     "334-mega_2",
     "334-mega_2",
+    "373-mega",
     "376-mega",
+    "380-mega",
+    "381-mega",
+    "382-primal",
+    "383-primal",
     "384-mega",
     "384-mega_2",
     "384-mega_2",
+    "4052",
+    "4077",
+    "4078",
     "4263",
     "4264",
     "428-mega",
@@ -4562,14 +4586,58 @@
     "475-mega_2",
     "475-mega_3",
     "475-mega_3",
+    "6215",
+    "653",
+    "654",
     "6549",
+    "655",
     "6570",
     "6571",
+    "664",
+    "665",
+    "666-archipelago",
+    "666-continental",
+    "666-elegant",
+    "666-fancy_2",
+    "666-fancy_2",
+    "666-fancy_3",
+    "666-fancy_3",
+    "666-garden",
+    "666-high",
+    "666-icy",
+    "666-jungle",
+    "666-marine",
+    "666-meadow_2",
+    "666-meadow_2",
+    "666-meadow_3",
+    "666-meadow_3",
+    "666-modern",
+    "666-monsoon",
+    "666-ocean",
+    "666-poke",
+    "666-poke",
+    "666-poke",
+    "666-polar",
+    "666-river",
+    "666-river_2",
+    "666-river_2",
+    "666-sandstorm",
+    "666-savanna",
+    "666-sun",
+    "666-tundra",
     "6705",
     "6706_2",
     "6706_2",
     "6706_3",
     "6706_3",
+    "690",
+    "691",
+    "696",
+    "696_3",
+    "696_3",
+    "697",
+    "697_3",
+    "697_3",
     "700",
     "704",
     "705_2",
@@ -4581,20 +4649,74 @@
     "709",
     "710",
     "711",
+    "716-active",
+    "716-neutral",
+    "717_2",
+    "717_2",
+    "717_3",
+    "717_3",
     "720-unbound",
     "720",
+    "728",
+    "729",
+    "730",
+    "730_2",
+    "730_2",
+    "747",
+    "748",
+    "753",
+    "754",
     "755",
     "756",
+    "761",
+    "762",
+    "763",
+    "767",
+    "768",
+    "771",
+    "771_2",
+    "771_2",
+    "771_3",
+    "771_3",
     "789",
+    "790",
+    "791",
     "791_1",
     "791_1",
+    "792",
+    "793_2",
+    "793_2",
+    "793_3",
+    "793_3",
+    "800-dawn",
+    "800-dusk",
+    "800-ultra",
+    "800",
     "802",
+    "808",
+    "809",
+    "821_2",
+    "821_2",
+    "821_3",
+    "821_3",
+    "822",
+    "823",
+    "829",
+    "830",
+    "835",
+    "836_2",
+    "836_2",
+    "836_3",
+    "836_3",
+    "850",
+    "851",
     "856",
     "857_2",
     "857_2",
     "857_3",
     "857_3",
     "858",
+    "863",
     "872",
     "873",
     "877-hangry",
@@ -4607,6 +4729,17 @@
     "890_3",
     "890_3",
     "900",
+    "901",
+    "903",
+    "909",
+    "910_2",
+    "910_2",
+    "910_3",
+    "910_3",
+    "911_2",
+    "911_2",
+    "911_3",
+    "911_3",
     "919",
     "920",
     "924",
@@ -4620,32 +4753,103 @@
     "925-three_2",
     "925-three_3",
     "925-three_3",
+    "932_2",
+    "932_2",
+    "932_3",
+    "932_3",
+    "933_2",
+    "933_2",
+    "933_3",
+    "933_3",
+    "934",
+    "935",
+    "935_3",
+    "935_3",
+    "936_1",
+    "936_1",
+    "936_2",
+    "936_2",
+    "936_3",
+    "936_3",
+    "937_1",
+    "937_1",
+    "937_2",
+    "937_2",
+    "937_3",
+    "937_3",
     "94-mega_1",
     "94-mega_1",
     "94-mega_2",
     "94-mega_2",
     "94-mega_3",
     "94-mega_3",
+    "948",
+    "949",
     "962",
     "967",
+    "968",
+    "969",
+    "970_2",
+    "970_2",
+    "970_3",
+    "970_3",
     "973",
+    "978-curly_2",
+    "978-curly_2",
+    "978-curly_3",
+    "978-curly_3",
+    "978-droopy_2",
+    "978-droopy_2",
+    "978-droopy_3",
+    "978-droopy_3",
+    "978-stretchy_2",
+    "978-stretchy_2",
+    "978-stretchy_3",
+    "978-stretchy_3",
     "987",
     "988",
     "988_3",
     "988_3",
+    "994",
+    "994_3",
+    "994_3",
     "999",
     "999_1",
     "999_1",
     "1000b",
     "1001b",
     "1004b",
+    "1007b-apex",
+    "1007b-apex",
+    "1007b-apex",
+    "1007b-apex",
+    "1008b-ultimate",
+    "127b-mega",
+    "142b-mega",
+    "150b-mega",
+    "150b-mega",
     "181b-mega",
     "212b-mega",
     "282b-mega",
+    "3b-mega_2",
+    "3b-mega_2",
+    "3b-mega_3",
+    "3b-mega_3",
     "303b-mega",
+    "306b-mega",
+    "308b-mega",
+    "310b-mega",
     "334b-mega",
+    "373b-mega",
     "376b-mega",
+    "380b-mega",
+    "381b-mega",
+    "382b-primal",
+    "383b-primal",
     "384b-mega",
+    "4052b",
+    "4077b",
+    "4078b",
     "4263b",
     "4264b",
     "428b-mega",
@@ -4655,14 +4859,104 @@
     "475b-mega_2",
     "475b-mega_3",
     "475b-mega_3",
+    "6215b",
+    "653b",
+    "654b",
     "6549b",
+    "655b",
     "6570b",
     "6571b",
+    "664b",
+    "665b",
+    "665_2b",
+    "665_2b",
+    "666b-archipelago_2",
+    "666b-archipelago_2",
+    "666b-archipelago_3",
+    "666b-archipelago_3",
+    "666b-continental_2",
+    "666b-continental_2",
+    "666b-continental_3",
+    "666b-continental_3",
+    "666b-elegant_2",
+    "666b-elegant_2",
+    "666b-elegant_3",
+    "666b-elegant_3",
+    "666b-fancy_2",
+    "666b-fancy_2",
+    "666b-fancy_3",
+    "666b-fancy_3",
+    "666b-garden_2",
+    "666b-garden_2",
+    "666b-garden_3",
+    "666b-garden_3",
+    "666b-high",
+    "666b-high",
+    "666b-high",
+    "666b-high",
+    "666b-icy",
+    "666b-icy",
+    "666b-icy",
+    "666b-icy",
+    "666b-jungle_2",
+    "666b-jungle_2",
+    "666b-jungle_3",
+    "666b-jungle_3",
+    "666b-marine_2",
+    "666b-marine_2",
+    "666b-marine_3",
+    "666b-marine_3",
+    "666b-meadow_2",
+    "666b-meadow_2",
+    "666b-meadow_3",
+    "666b-meadow_3",
+    "666b-modern_2",
+    "666b-modern_2",
+    "666b-modern_3",
+    "666b-modern_3",
+    "666b-monsoon_2",
+    "666b-monsoon_2",
+    "666b-monsoon_3",
+    "666b-monsoon_3",
+    "666b-ocean_2",
+    "666b-ocean_2",
+    "666b-ocean_3",
+    "666b-ocean_3",
+    "666b-poke",
+    "666b-poke",
+    "666b-poke",
+    "666b-poke",
+    "666b-polar_2",
+    "666b-polar_2",
+    "666b-polar_3",
+    "666b-polar_3",
+    "666b-river_2",
+    "666b-river_2",
+    "666b-river_3",
+    "666b-river_3",
+    "666b-sandstorm_2",
+    "666b-sandstorm_2",
+    "666b-sandstorm_3",
+    "666b-sandstorm_3",
+    "666b-savanna_2",
+    "666b-savanna_2",
+    "666b-savanna_3",
+    "666b-savanna_3",
+    "666b-sun_2",
+    "666b-sun_2",
+    "666b-sun_3",
+    "666b-sun_3",
+    "666b-tundra_2",
+    "666b-tundra_2",
+    "666b-tundra_3",
+    "666b-tundra_3",
     "6705b",
     "6706_2b",
     "6706_2b",
     "6706_3b",
     "6706_3b",
+    "690b",
+    "691b",
     "700b",
     "704b",
     "705b",
@@ -4673,11 +4967,28 @@
     "711b",
     "720b-unbound",
     "720b",
+    "747_2b",
+    "747_2b",
+    "747_3b",
+    "747_3b",
+    "748b",
     "755b",
     "756b",
+    "771b",
     "789b",
+    "790b",
     "791b",
+    "792b",
+    "793b",
+    "800b-dawn",
+    "800b-dusk",
+    "800b-ultra",
+    "800b",
     "802b",
+    "829b",
+    "830b",
+    "850b",
+    "851b",
     "856b",
     "857_2b",
     "857_2b",
@@ -4706,7 +5017,30 @@
     "925b-three_2",
     "925b-three_3",
     "925b-three_3",
+    "932b",
+    "933b",
+    "934b",
+    "935_1b",
+    "935_1b",
+    "935_2b",
+    "935_2b",
+    "935_3b",
+    "935_3b",
+    "936_1b",
+    "936_1b",
+    "936_2b",
+    "936_2b",
+    "936_3b",
+    "936_3b",
+    "937_1b",
+    "937_1b",
+    "937_2b",
+    "937_2b",
+    "937_3b",
+    "937_3b",
     "94b-mega",
+    "948b",
+    "949b",
     "962b",
     "962_3b",
     "962_3b",
@@ -4714,5 +5048,6 @@
     "973b",
     "987b",
     "988b",
+    "994b",
     "999b"
 ]

public/images/pbinfo_stat_numbers.json

@@ -0,0 +1,293 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_numbers.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 117,
+				"h": 8
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "+1",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "+2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 9,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "+3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "+4",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 27,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "+5",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "+6",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 45,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-1",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 63,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 72,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-4",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-5",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 90,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-6",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 99,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "0",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 108,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:794aa4af3291db5abd8a2667626c1998:1a6706ad557b92f9bf099c23e02af4a6:6537c634087637bb27e8a1edb1ee2e35$"
+	}
+}

public/images/pokemon/676-dandy.json

@@ -4,30 +4,30 @@
 			"image": "676-dandy.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 71,
+				"w": 65,
-				"h": 71
+				"h": 65
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 56,
+						"w": 96,
-						"h": 71
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 22,
-						"y": 0,
+						"y": 15,
-						"w": 56,
+						"w": 50,
-						"h": 71
+						"h": 65
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 56,
+						"w": 50,
-						"h": 71
+						"h": 65
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:29165e5c573c8a4235076355ce5d29d5:17a1912fd81d23ce8a7209e27ad3e9ed:b5a287256e260744fe6660dc2ceefd11$"
+		"smartupdate": "$TexturePacker:SmartUpdate:c09947cc1f66b7a7bf844a7caaa3bd76:20ba7e14cce8a9ee80955d94d19ae46f:b5a287256e260744fe6660dc2ceefd11$"
 	}
 }

public/images/pokemon/676-debutante.json

@@ -4,30 +4,30 @@
 			"image": "676-debutante.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 67,
+				"w": 61,
-				"h": 67
+				"h": 61
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 56,
+						"w": 96,
-						"h": 67
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 20,
-						"y": 0,
+						"y": 19,
-						"w": 56,
+						"w": 50,
-						"h": 67
+						"h": 61
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 56,
+						"w": 50,
-						"h": 67
+						"h": 61
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:689efba1d73755e99f598016fd321c3c:07d06d321fff31976e1b993edb972e4f:bf2f862a1c8881133f9f3ffbf44602fa$"
+		"smartupdate": "$TexturePacker:SmartUpdate:107780a0e7447bf89ae4998e24021f8b:7623c7ab8d7b6bc5f755e8a1f81ea257:bf2f862a1c8881133f9f3ffbf44602fa$"
 	}
 }

public/images/pokemon/676-diamond.json

@@ -4,30 +4,30 @@
 			"image": "676-diamond.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 74,
+				"w": 68,
-				"h": 74
+				"h": 68
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 53,
+						"w": 96,
-						"h": 74
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 24,
-						"y": 0,
+						"y": 12,
-						"w": 53,
+						"w": 47,
-						"h": 74
+						"h": 68
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 53,
+						"w": 47,
-						"h": 74
+						"h": 68
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b33f3de937219e7763316531398d7bbd:c7e104da9393ec52b9e6d37f92fc20d9:88c467fc09249b0d2f579d44eacd528d$"
+		"smartupdate": "$TexturePacker:SmartUpdate:90477dc67c3429f2f0430f0a868ed85c:bd69660307b7d945313b73a256c24d57:88c467fc09249b0d2f579d44eacd528d$"
 	}
 }

public/images/pokemon/676-heart.json

@@ -4,30 +4,30 @@
 			"image": "676-heart.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 72,
+				"w": 66,
-				"h": 72
+				"h": 66
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 54,
+						"w": 96,
-						"h": 72
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 24,
-						"y": 0,
+						"y": 14,
-						"w": 54,
+						"w": 48,
-						"h": 72
+						"h": 66
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 54,
+						"w": 48,
-						"h": 72
+						"h": 66
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:15e433a2269dd4043b1614811a1b8fbd:421a40542b16cdb2cc154c85e963b40d:e11d4dd16bff2ef69bc5ca683c44ca7c$"
+		"smartupdate": "$TexturePacker:SmartUpdate:a9b1c7a73abb563b1ecadad8b517794e:2273c7342204f52860d8e96670ddf46a:e11d4dd16bff2ef69bc5ca683c44ca7c$"
 	}
 }

public/images/pokemon/676-kabuki.json

@@ -4,30 +4,30 @@
 			"image": "676-kabuki.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 70,
+				"w": 64,
-				"h": 70
+				"h": 64
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 58,
+						"w": 96,
-						"h": 70
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 22,
-						"y": 0,
+						"y": 16,
-						"w": 58,
+						"w": 52,
-						"h": 70
+						"h": 64
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 58,
+						"w": 52,
-						"h": 70
+						"h": 64
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:7f4056b1c055475f905d048c8d8d2969:08eecd31f557298e1570ec3490acffe2:c3cad56aa65d2ee971ceebc435a14ee6$"
+		"smartupdate": "$TexturePacker:SmartUpdate:d36abbc31bcd28664e28eb50f8e4719d:43c9d8bb344b7a1373b93f493badb47e:c3cad56aa65d2ee971ceebc435a14ee6$"
 	}
 }

public/images/pokemon/676-la-reine.json

@@ -4,30 +4,30 @@
 			"image": "676-la-reine.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 69,
+				"w": 63,
-				"h": 69
+				"h": 63
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 55,
+						"w": 96,
-						"h": 69
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 23,
-						"y": 0,
+						"y": 17,
-						"w": 55,
+						"w": 49,
-						"h": 69
+						"h": 63
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 55,
+						"w": 49,
-						"h": 69
+						"h": 63
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d209428aca72f49f1e9ee3e97f1c18ab:c56ae957d7acb10c7373b842af3a8786:b99821e87dffda3297dd25a224a9029f$"
+		"smartupdate": "$TexturePacker:SmartUpdate:81b2b5d853a3d2527630ca0b2fea6569:98097941483e509b7962c50b179d132f:b99821e87dffda3297dd25a224a9029f$"
 	}
 }

public/images/pokemon/676-matron.json

@@ -4,30 +4,30 @@
 			"image": "676-matron.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 68,
+				"w": 62,
-				"h": 68
+				"h": 62
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 52,
+						"w": 96,
-						"h": 68
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 23,
-						"y": 0,
+						"y": 18,
-						"w": 52,
+						"w": 46,
-						"h": 68
+						"h": 62
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 52,
+						"w": 46,
-						"h": 68
+						"h": 62
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:698fab0e5221743b912637e774bfaecd:72a9977db421d061829c639e3b50a617:020798583d07c479020bb0af34cf8bb6$"
+		"smartupdate": "$TexturePacker:SmartUpdate:50d9857668a013306b96adc3777a22b2:7d3708f1b5b6eeb8419815fc6734bf06:020798583d07c479020bb0af34cf8bb6$"
 	}
 }

public/images/pokemon/676-pharaoh.json

@@ -4,30 +4,30 @@
 			"image": "676-pharaoh.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 69,
+				"w": 63,
-				"h": 69
+				"h": 63
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 52,
+						"w": 96,
-						"h": 69
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 25,
-						"y": 0,
+						"y": 17,
-						"w": 52,
+						"w": 46,
-						"h": 69
+						"h": 63
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 52,
+						"w": 46,
-						"h": 69
+						"h": 63
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5c1df95bcf0d53d4f1b9f1bf77690598:623b4bc6698ef1a984b6bad42e68115b:904b7ab6f57249c96beea4b5f72deb53$"
+		"smartupdate": "$TexturePacker:SmartUpdate:69f1be06f9a7175f294267b08e7ba275:42e7e4068e30b78248d3629cffa5d2ec:904b7ab6f57249c96beea4b5f72deb53$"
 	}
 }

public/images/pokemon/676-star.json

@@ -4,30 +4,30 @@
 			"image": "676-star.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 72,
+				"w": 66,
-				"h": 72
+				"h": 66
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 56,
+						"w": 96,
-						"h": 72
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 24,
-						"y": 0,
+						"y": 14,
-						"w": 56,
+						"w": 50,
-						"h": 72
+						"h": 66
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 56,
+						"w": 50,
-						"h": 72
+						"h": 66
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:31c1ce60aa953fb647ff40c50ac54cf1:d7eefc05e299310d05d389e05997e449:dd7fedf66b493b0bbdef5d25e0041dd8$"
+		"smartupdate": "$TexturePacker:SmartUpdate:fde8824a7749541f5af1cc14e6281670:204c6eb602358a5c7c1389b42317ffce:dd7fedf66b493b0bbdef5d25e0041dd8$"
 	}
 }

public/images/pokemon/869-caramel-swirl.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "869-caramel-swirl.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 55,
+				"h": 55
+			},
+			"scale": 0.5,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 96,
+						"h": 96
+					},
+					"spriteSourceSize": {
+						"x": 28,
+						"y": 20,
+						"w": 39,
+						"h": 55
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 55
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:e565b3b962f894b4de5291159fced6f2:dec57ba4f1836b6834da2da4c98c442a:a9efacddd6da069c39eca521bf0c5c93$"
+	}
+}

public/images/pokemon/869-lemon-cream.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "869-lemon-cream.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 55,
+				"h": 55
+			},
+			"scale": 0.5,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 96,
+						"h": 96
+					},
+					"spriteSourceSize": {
+						"x": 28,
+						"y": 20,
+						"w": 39,
+						"h": 55
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 55
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:8a99ba9bf3bfb93bba7c6010553d9e0e:b231a3962960f61ce4d970d95bde3f3c:0284bb2fb44231f3756d5e41407b29dc$"
+	}
+}

public/images/pokemon/869-matcha-cream.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "869-matcha-cream.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 55,
+				"h": 55
+			},
+			"scale": 0.5,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 96,
+						"h": 96
+					},
+					"spriteSourceSize": {
+						"x": 28,
+						"y": 20,
+						"w": 39,
+						"h": 55
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 55
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:713d1a6f0fbac3236c31960e722f4425:29a82de035ed4f33426b4bb6943c4036:3607dee150b69bb8409f07bf4b436c27$"
+	}
+}

public/images/pokemon/869-mint-cream.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "869-mint-cream.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 55,
+				"h": 55
+			},
+			"scale": 0.5,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 96,
+						"h": 96
+					},
+					"spriteSourceSize": {
+						"x": 28,
+						"y": 20,
+						"w": 39,
+						"h": 55
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 55
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:5deaa7830e8cbf001dce6c800a9e3da2:4c9255c2ad6d33fc00a90e447fb8a344:5a3d349b5aaedd43ed9c9acbc0c8652a$"
+	}
+}

public/images/pokemon/869-rainbow-swirl.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "869-rainbow-swirl.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 55,
+				"h": 55
+			},
+			"scale": 0.5,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 96,
+						"h": 96
+					},
+					"spriteSourceSize": {
+						"x": 28,
+						"y": 20,
+						"w": 39,
+						"h": 55
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 55
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:1a4d1bc0283fdcf9704523ff9c304937:8122f937b67cb25a772bdb63688456b7:5efb62c1b2c8ccb825172755b6a5956b$"
+	}
+}

public/images/pokemon/869-ruby-cream.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "869-ruby-cream.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 55,
+				"h": 55
+			},
+			"scale": 0.5,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 96,
+						"h": 96
+					},
+					"spriteSourceSize": {
+						"x": 28,
+						"y": 20,
+						"w": 39,
+						"h": 55
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 55
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:e03bb56ed3208e982eb0bec819d53bf6:2c86ae79dcda2aeecdcf0c025c16d3c3:36b2afa6f1e593bd875572a5eaa54a8f$"
+	}
+}

public/images/pokemon/869-ruby-swirl.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "869-ruby-swirl.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 55,
+				"h": 55
+			},
+			"scale": 0.5,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 96,
+						"h": 96
+					},
+					"spriteSourceSize": {
+						"x": 28,
+						"y": 20,
+						"w": 39,
+						"h": 55
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 55
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:3c79af909f9735d7ece0527b789506f2:0b973ea05d9bc875560323eb9df5efe3:ea7e9be6cfcdb9bb39d201b2ab117eae$"
+	}
+}

public/images/pokemon/869-salted-cream.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "869-salted-cream.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 55,
+				"h": 55
+			},
+			"scale": 0.5,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 96,
+						"h": 96
+					},
+					"spriteSourceSize": {
+						"x": 28,
+						"y": 20,
+						"w": 39,
+						"h": 55
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 55
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:bb169ea1db5dad0a39dcd54df8356c06:608e3745adcb907d1f382e251ad807f4:6e5c7cbfd1699b5560a39643a258e386$"
+	}
+}