Merge branch 'smogon:master' into master

.editorconfig

@@ -1,6 +1,8 @@
-
 root = true
 
 [*]
 end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
 insert_final_newline = true
+

README.md

@@ -14,6 +14,7 @@ This project depends on
 - [pnpm](https://pnpm.js.org)
 - [node.js](https://nodejs.org) >= 13
 - [wine](https://www.winehq.org/) (optional)
+- cwebp
 
 ### Windows
 
@@ -22,7 +23,7 @@ Windows binaries of these dependencies can be found on the download pages of the
 ### Linux
 
 ```
-$ sudo apt install nodejs imagemagick advancecomp optipng pngquant wine
+$ sudo apt install nodejs imagemagick advancecomp optipng pngquant wine webp
 $ sudo npm install -g pnpm
 ```
 

Tupfile.lua

@@ -55,6 +55,19 @@ foreach_rule(
     "build/gen9-modelslike/%B.gif"
 )
 
+-- Gen 5 CAPs...
+
+foreach_rule(
+    "src/sprites/gen5/*.png",
+    {
+        -- TODO, add customizable compression for gif
+        -- ... or investigate using webp instead of both png/gif here
+        "magick convert %f %o",
+        "gifsicle -O3 -b %o"
+    },
+    "build/gen5-gif/%B.gif"
+)
+
 -- PS spritesheet
 
 rule(
@@ -106,6 +119,16 @@ rule(
     "build/ps/pokemonicons-pokeball-sheet.png"
 )
 
+-- Smogdex minisprites (webp)
+
+foreach_rule(
+    spriteglob({"src/minisprites/pokemon/gen6/*", "src/minisprites/items/*"}, {a = false}),
+    {
+        display="webp minisprite %f",
+        "cwebp -z 9 %f -o %o"
+    },
+    "build/smogon/minisprites/%B.webp"
+)
 
 -- Smogdex spritesheet
 
@@ -115,9 +138,10 @@ rule(
     {
         display="smogdex sheet",
         "node tools/smogdexspritesheet --image build/smogon/spritesheet.png --stylesheet build/smogon/spritesheet.css -- %f",
-        compresspng{config="SPRITESHEET", output="build/smogon/spritesheet.png"}
+        "cwebp -z 9 build/smogon/spritesheet.png -o build/smogon/spritesheet.webp",
+        "rm build/smogon/spritesheet.png"
     },
-    {"build/smogon/spritesheet.png", "build/smogon/spritesheet.css"}
+    {"build/smogon/spritesheet.webp", "build/smogon/spritesheet.css"}
 )
 
 -- Smogdex social images

data/items.json

@@ -27,6 +27,13 @@
         ],
         "sid": "i545"
     },
+    "i1777": {
+        "type": "item",
+        "names": [
+            "Adamant Crystal"
+        ],
+        "sid": "i1777"
+    },
     "i135": {
         "type": "item",
         "names": [
@@ -189,6 +196,13 @@
         ],
         "sid": "i1111"
     },
+    "i581": {
+        "type": "item",
+        "names": [
+            "Big Nugget"
+        ],
+        "sid": "i581"
+    },
     "i296": {
         "type": "item",
         "names": [
@@ -210,13 +224,6 @@
         ],
         "sid": "i241"
     },
-    "i281": {
-        "type": "item",
-        "names": [
-            "Black Sludge"
-        ],
-        "sid": "i281"
-    },
     "i240": {
         "type": "item",
         "names": [
@@ -224,6 +231,13 @@
         ],
         "sid": "i240"
     },
+    "i281": {
+        "type": "item",
+        "names": [
+            "Black Sludge"
+        ],
+        "sid": "i281"
+    },
     "i661": {
         "type": "item",
         "names": [
@@ -457,6 +471,13 @@
         ],
         "sid": "i198"
     },
+    "i2406": {
+        "type": "item",
+        "names": [
+            "Cornerstone Mask"
+        ],
+        "sid": "i2406"
+    },
     "i175": {
         "type": "item",
         "names": [
@@ -730,13 +751,6 @@
         ],
         "sid": "i779"
     },
-    "i34": {
-        "type": "item",
-        "names": [
-            "Energy Powder"
-        ],
-        "sid": "i34"
-    },
     "i208": {
         "type": "item",
         "names": [
@@ -765,6 +779,13 @@
         ],
         "sid": "i793"
     },
+    "i2401": {
+        "type": "item",
+        "names": [
+            "Fairy Feather"
+        ],
+        "sid": "i2401"
+    },
     "i715": {
         "type": "item",
         "names": [
@@ -1087,6 +1108,13 @@
         ],
         "sid": "i286"
     },
+    "i1779": {
+        "type": "item",
+        "names": [
+            "Griseous Core"
+        ],
+        "sid": "i1779"
+    },
     "i112": {
         "type": "item",
         "names": [
@@ -1143,6 +1171,13 @@
         ],
         "sid": "i14"
     },
+    "i2408": {
+        "type": "item",
+        "names": [
+            "Hearthflame Mask"
+        ],
+        "sid": "i2408"
+    },
     "i284": {
         "type": "item",
         "names": [
@@ -1503,6 +1538,13 @@
         ],
         "sid": "i494"
     },
+    "i1778": {
+        "type": "item",
+        "names": [
+            "Lustrous Globe"
+        ],
+        "sid": "i1778"
+    },
     "i136": {
         "type": "item",
         "names": [
@@ -1601,6 +1643,13 @@
         ],
         "sid": "i1"
     },
+    "i2404": {
+        "type": "item",
+        "names": [
+            "Masterpiece Teacup"
+        ],
+        "sid": "i2404"
+    },
     "i681": {
         "type": "item",
         "names": [
@@ -2602,6 +2651,13 @@
         ],
         "sid": "i309"
     },
+    "i1785": {
+        "type": "item",
+        "names": [
+            "Strange Ball"
+        ],
+        "sid": "i1785"
+    },
     "i1109": {
         "type": "item",
         "names": [
@@ -2630,6 +2686,13 @@
         ],
         "sid": "i1116"
     },
+    "i2402": {
+        "type": "item",
+        "names": [
+            "Syrupy Apple"
+        ],
+        "sid": "i2402"
+    },
     "i174": {
         "type": "item",
         "names": [
@@ -3435,6 +3498,13 @@
         ],
         "sid": "i923"
     },
+    "i2403": {
+        "type": "item",
+        "names": [
+            "Unremarkable Teacup"
+        ],
+        "sid": "i2403"
+    },
     "i252": {
         "type": "item",
         "names": [
@@ -3512,6 +3582,13 @@
         ],
         "sid": "i639"
     },
+    "i2407": {
+        "type": "item",
+        "names": [
+            "Wellspring Mask"
+        ],
+        "sid": "i2407"
+    },
     "i167": {
         "type": "item",
         "names": [

data/species.json

@@ -9967,6 +9967,14 @@
         "forme": "",
         "sid": "s28832"
     },
+    "s28833": {
+        "type": "specie",
+        "num": 901,
+        "formeNum": 1,
+        "base": "Ursaluna",
+        "forme": "Bloodmoon",
+        "sid": "s28833"
+    },
     "s28864": {
         "type": "specie",
         "num": 902,
@@ -10935,6 +10943,134 @@
         "forme": "",
         "sid": "s32320"
     },
+    "s32352": {
+        "type": "specie",
+        "num": 1011,
+        "formeNum": 0,
+        "base": "Dipplin",
+        "forme": "",
+        "sid": "s32352"
+    },
+    "s32384": {
+        "type": "specie",
+        "num": 1012,
+        "formeNum": 0,
+        "base": "Poltchageist",
+        "forme": "",
+        "sid": "s32384"
+    },
+    "s32385": {
+        "type": "specie",
+        "num": 1012,
+        "formeNum": 1,
+        "base": "Poltchageist",
+        "forme": "Artisan",
+        "sid": "s32385"
+    },
+    "s32416": {
+        "type": "specie",
+        "num": 1013,
+        "formeNum": 0,
+        "base": "Sinistcha",
+        "forme": "",
+        "sid": "s32416"
+    },
+    "s32417": {
+        "type": "specie",
+        "num": 1013,
+        "formeNum": 1,
+        "base": "Sinistcha",
+        "forme": "Masterpiece",
+        "sid": "s32417"
+    },
+    "s32448": {
+        "type": "specie",
+        "num": 1014,
+        "formeNum": 0,
+        "base": "Okidogi",
+        "forme": "",
+        "sid": "s32448"
+    },
+    "s32480": {
+        "type": "specie",
+        "num": 1015,
+        "formeNum": 0,
+        "base": "Munkidori",
+        "forme": "",
+        "sid": "s32480"
+    },
+    "s32512": {
+        "type": "specie",
+        "num": 1016,
+        "formeNum": 0,
+        "base": "Fezandipiti",
+        "forme": "",
+        "sid": "s32512"
+    },
+    "s32544": {
+        "type": "specie",
+        "num": 1017,
+        "formeNum": 0,
+        "base": "Ogerpon",
+        "forme": "",
+        "sid": "s32544"
+    },
+    "s32545": {
+        "type": "specie",
+        "num": 1017,
+        "formeNum": 1,
+        "base": "Ogerpon",
+        "forme": "Wellspring",
+        "sid": "s32545"
+    },
+    "s32546": {
+        "type": "specie",
+        "num": 1017,
+        "formeNum": 2,
+        "base": "Ogerpon",
+        "forme": "Hearthflame",
+        "sid": "s32546"
+    },
+    "s32547": {
+        "type": "specie",
+        "num": 1017,
+        "formeNum": 3,
+        "base": "Ogerpon",
+        "forme": "Cornerstone",
+        "sid": "s32547"
+    },
+    "s32548": {
+        "type": "specie",
+        "num": 1017,
+        "formeNum": 4,
+        "base": "Ogerpon",
+        "forme": "Teal-Tera",
+        "sid": "s32548"
+    },
+    "s32549": {
+        "type": "specie",
+        "num": 1017,
+        "formeNum": 5,
+        "base": "Ogerpon",
+        "forme": "Wellspring-Tera",
+        "sid": "s32549"
+    },
+    "s32550": {
+        "type": "specie",
+        "num": 1017,
+        "formeNum": 6,
+        "base": "Ogerpon",
+        "forme": "Hearthflame-Tera",
+        "sid": "s32550"
+    },
+    "s32551": {
+        "type": "specie",
+        "num": 1017,
+        "formeNum": 7,
+        "base": "Ogerpon",
+        "forme": "Cornerstone-Tera",
+        "sid": "s32551"
+    },
     "s0": {
         "type": "specie",
         "num": 0,
@@ -11503,6 +11639,30 @@
         "forme": "",
         "sid": "s536873088"
     },
+    "s536873120": {
+        "type": "specie",
+        "num": -69,
+        "formeNum": 0,
+        "base": "Ababo",
+        "forme": "",
+        "sid": "s536873120"
+    },
+    "s536873152": {
+        "type": "specie",
+        "num": -70,
+        "formeNum": 0,
+        "base": "Scattervein",
+        "forme": "",
+        "sid": "s536873152"
+    },
+    "s536873184": {
+        "type": "specie",
+        "num": -71,
+        "formeNum": 0,
+        "base": "Hemogoblin",
+        "forme": "",
+        "sid": "s536873184"
+    },
     "s537030912": {
         "type": "specie",
         "num": -5000,

pnpm-lock.yaml

@@ -29,13 +29,19 @@ importers:
 
   tools/deploy:
     specifiers:
+      '@types/tar-stream': ^2.2.2
+      base32-encode: ^2.0.0
       commander: ^5.1.0
       debug: ^4.1.1
       expect: ^26.4.1
       mocha: ^8.1.1
+      tar-stream: ^3.0.0
     dependencies:
+      '@types/tar-stream': 2.2.2
+      base32-encode: 2.0.0
       commander: 5.1.0
       debug: 4.1.1
+      tar-stream: 3.0.0
     devDependencies:
       expect: 26.4.1
       mocha: 8.1.1
@@ -169,6 +175,12 @@ packages:
     resolution: {integrity: sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==}
     dev: true
 
+  /@types/tar-stream/2.2.2:
+    resolution: {integrity: sha512-1AX+Yt3icFuU6kxwmPakaiGrJUwG44MpuiqPg4dSolRFk6jmvs4b3IbUol9wKDLIgU76gevn3EwE8y/DkSJCZQ==}
+    dependencies:
+      '@types/node': 18.15.8
+    dev: false
+
   /@types/vinyl/2.0.7:
     resolution: {integrity: sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==}
     dependencies:
@@ -186,6 +198,13 @@ packages:
       '@types/yargs-parser': 15.0.0
     dev: true
 
+  /abort-controller/3.0.0:
+    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
+    engines: {node: '>=6.5'}
+    dependencies:
+      event-target-shim: 5.0.1
+    dev: false
+
   /ajv/6.12.3:
     resolution: {integrity: sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==}
     dependencies:
@@ -296,10 +315,21 @@ packages:
     resolution: {integrity: sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==}
     dev: false
 
+  /b4a/1.6.3:
+    resolution: {integrity: sha512-aX6/FqpWQve8VN9kyTExy7GlmwNShvxcCWWD5QVR3ZbRlyBGtCrG5Autu95xxSPH4CRs+5PSV4d7PRnWpmqFlA==}
+    dev: false
+
   /balanced-match/1.0.0:
     resolution: {integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c=}
     dev: true
 
+  /base32-encode/2.0.0:
+    resolution: {integrity: sha512-mlmkfc2WqdDtMl/id4qm3A7RjW6jxcbAoMjdRmsPiwQP0ufD4oXItYMnPgVHe80lnAIy+1xwzhHE1s4FoIceSw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      to-data-view: 2.0.0
+    dev: false
+
   /base64-js/1.3.1:
     resolution: {integrity: sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==}
     dev: false
@@ -342,6 +372,14 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
+  /bl/6.0.1:
+    resolution: {integrity: sha512-zk1P1eAEBHhhB+4NfGxqmuV6NgwECnIoRgsOq2ObdEsmoFVIYzJ/Jjcgaj7JOY/8ekH27bIHSV4Si2T+evqu+Q==}
+    dependencies:
+      buffer: 6.0.3
+      inherits: 2.0.4
+      readable-stream: 4.3.0
+    dev: false
+
   /brace-expansion/1.1.11:
     resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
     dependencies:
@@ -367,6 +405,13 @@ packages:
       ieee754: 1.1.13
     dev: false
 
+  /buffer/6.0.3:
+    resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
+    dependencies:
+      base64-js: 1.3.1
+      ieee754: 1.2.1
+    dev: false
+
   /camelcase/5.3.1:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
     engines: {node: '>=6'}
@@ -659,6 +704,16 @@ packages:
     hasBin: true
     dev: true
 
+  /event-target-shim/5.0.1:
+    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
+    engines: {node: '>=6'}
+    dev: false
+
+  /events/3.3.0:
+    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
+    engines: {node: '>=0.8.x'}
+    dev: false
+
   /expand-template/2.0.3:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
@@ -689,6 +744,10 @@ packages:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
     dev: false
 
+  /fast-fifo/1.1.0:
+    resolution: {integrity: sha512-Kl29QoNbNvn4nhDsLYjyIAaIqaJB6rBx5p3sL9VjaefJ+eMFBWVZiaoguaoZfzEKr5RhAti0UgM8703akGPJ6g==}
+    dev: false
+
   /fast-json-stable-stringify/2.1.0:
     resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
     dev: false
@@ -907,6 +966,10 @@ packages:
     resolution: {integrity: sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==}
     dev: false
 
+  /ieee754/1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+    dev: false
+
   /inflight/1.0.6:
     resolution: {integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=}
     dependencies:
@@ -1491,6 +1554,11 @@ packages:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
     dev: false
 
+  /process/0.11.10:
+    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
+    engines: {node: '>= 0.6.0'}
+    dev: false
+
   /promise.allsettled/1.0.2:
     resolution: {integrity: sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==}
     engines: {node: '>= 0.4'}
@@ -1523,6 +1591,10 @@ packages:
     engines: {node: '>=0.6'}
     dev: false
 
+  /queue-tick/1.0.1:
+    resolution: {integrity: sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==}
+    dev: false
+
   /randombytes/2.1.0:
     resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
     dependencies:
@@ -1593,6 +1665,16 @@ packages:
       util-deprecate: 1.0.2
     dev: false
 
+  /readable-stream/4.3.0:
+    resolution: {integrity: sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      abort-controller: 3.0.0
+      buffer: 6.0.3
+      events: 3.3.0
+      process: 0.11.10
+    dev: false
+
   /readdirp/3.3.0:
     resolution: {integrity: sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==}
     engines: {node: '>=8.10.0'}
@@ -1746,6 +1828,13 @@ packages:
       escape-string-regexp: 2.0.0
     dev: true
 
+  /streamx/2.13.2:
+    resolution: {integrity: sha512-+TWqixPhGDXEG9L/XczSbhfkmwAtGs3BJX5QNU6cvno+pOLKeszByWcnaTu6dg8efsTYqR8ZZuXWHhZfgrxMvA==}
+    dependencies:
+      fast-fifo: 1.1.0
+      queue-tick: 1.0.1
+    dev: false
+
   /string-width/1.0.2:
     resolution: {integrity: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=}
     engines: {node: '>=0.10.0'}
@@ -1879,6 +1968,14 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
+  /tar-stream/3.0.0:
+    resolution: {integrity: sha512-O6OfUKBbQOqAhh6owTWmA730J/yZCYcpmZ1DBj2YX51ZQrt7d7NgzrR+CnO9wP6nt/viWZW2XeXLavX3/ZEbEg==}
+    dependencies:
+      b4a: 1.6.3
+      bl: 6.0.1
+      streamx: 2.13.2
+    dev: false
+
   /tar/4.4.10:
     resolution: {integrity: sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==}
     engines: {node: '>=4.5'}
@@ -1903,6 +2000,11 @@ packages:
       xtend: 4.0.2
     dev: false
 
+  /to-data-view/2.0.0:
+    resolution: {integrity: sha512-RGEM5KqlPHr+WVTPmGNAXNeFEmsBnlkxXaIfEpUYV0AST2Z5W1EGq9L/MENFrMMmL2WQr1wjkmZy/M92eKhjYA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dev: false
+
   /to-regex-range/5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}

ps-items.sheet.mjs

@@ -20,6 +20,7 @@ const ITEMS = {
 	"babiriberry": 17,
 	"belueberry": 21,
 	"berryjuice": 22,
+	"bignugget": 27,
 	"bigroot": 29,
 	"bindingband": 31,
 	"blackbelt": 32,
@@ -73,7 +74,6 @@ const ITEMS = {
 	"ejectbutton": 118,
 	"electirizer": 119,
 	"electricgem": 120,
-	"energypowder": 123,
 	"enigmaberry": 124,
 	"eviolite": 130,
 	"expertbelt": 132,
@@ -161,6 +161,7 @@ const ITEMS = {
 	"nevermeltice": 305,
 	"nomelberry": 306,
 	"normalgem": 307,
+	"strangeball": 308,
 	"occaberry": 311,
 	"oddincense": 312,
 	"oldamber": 314,
@@ -525,6 +526,26 @@ const ITEMS = {
 	"tr92": 738,
 	"galaricacuff": 739,
 	"galaricawreath": 740,
+	"adamantcrystal": 741,
+	"lustrousglobe": 742,
+	"griseouscore": 743,
+	"maliciousarmor": 744,
+	"boosterenergy": 745,
+	"abilityshield": 746,
+	"clearamulet": 747,
+	"mirrorherb": 748,
+	"punchingglove": 749,
+	"covertcloak": 750,
+	"loadeddice": 751,
+	"vilevial": 752,
+	"auspiciousarmor": 753,
+	"fairyfeather": 754,
+	"syrupyapple": 755,
+	"unremarkableteacup": 756,
+	"masterpieceteacup": 757,
+	"cornerstonemask": 758,
+	"wellspringmask": 759,
+	"hearthflamemask": 760,
 };
 
 const found = new Map;

ps-pokemon.sheet.mjs

@@ -15,6 +15,7 @@ function toPSID(name) {
 const BattlePokemonIconIndexes = {
 	unknown: 0,
     
+	// alt forms
 	egg: 1020 + 1,
 	pikachubelle: 1020 + 2,
 	pikachulibre: 1020 + 3,
@@ -131,7 +132,6 @@ const BattlePokemonIconIndexes = {
 	furfroustar: 1020 + 114,
 	meowsticf: 1020 + 115,
 	aegislashblade: 1020 + 116,
-	// Added
 	xerneasneutral: 1020 + 117,
 	hoopaunbound: 1020 + 118,
 	rattataalola: 1020 + 119,
@@ -198,8 +198,6 @@ const BattlePokemonIconIndexes = {
 	cramorantgulping: 1020 + 180,
 	cramorantgorging: 1020 + 181,
 	toxtricitylowkey: 1020 + 182,
-	//sinisteaantique: 854,
-	//polteageistantique: 855,
 	alcremierubycream: 1020 + 183,
 	alcremiematchacream: 1020 + 184,
 	alcremiemintcream: 1020 + 185,
@@ -223,211 +221,231 @@ const BattlePokemonIconIndexes = {
 	slowkinggalar: 1020 + 203,
 	calyrexice: 1020 + 204,
 	calyrexshadow: 1020 + 205,
-	// growlithehisui: 1020 + 206,
-	// arcaninehisui: 1020 + 207,
-	// voltorbhisui: 1020 + 208,
-	// electrodehisui: 1020 + 209,
-	// typhlosionhisui: 1020 + 210,
-	// qwilfishhisui: 1020 + 211,
-	// sneaselhisui: 1020 + 212,
-	// samurotthisui: 1020 + 213,
-	// lilliganthisui: 1020 + 214,
-	// zoruahisui: 1020 + 215,
-	// zoroarkhisui: 1020 + 216,
-	// braviaryhisui: 1020 + 217,
-	// sliggoohisui: 1020 + 218,
-	// goodrahisui: 1020 + 219,
-	// avalugghisui: 1020 + 220,
-	// decidueyehisui: 1020 + 221,
-	// basculegionf: 1020 + 222,
-	// enamorustherian: 1020 + 223,
-	// taurospaldea: 1020 + 224,
-	// taurospaldeafire: 1020 + 225,
-	// taurospaldeawater: 1020 + 226,
-	// wooperpaldea: 1020 + 227,
-	// oinkolognef: 1020 + 228,
-	// palafinhero: 1020 + 229,
-	// mausholdfour: 1020 + 230,
-	// tatsugiridroopy: 1020 + 231,
-	// tatsugiristretchy: 1020 + 232,
-	// squawkabillyblue: 1020 + 233,
-	// squawkabillyyellow: 1020 + 234,
-	// squawkabillywhite: 1020 + 235,
-	// gimmighoulroaming: 1020 + 236,
-	// dialgaorigin: 1020 + 237,
-	// palkiaorigin: 1020 + 238,
-	//basculinwhitestriped: 1020 + 239,
+	growlithehisui: 1020 + 206,
+	arcaninehisui: 1020 + 207,
+	voltorbhisui: 1020 + 208,
+	electrodehisui: 1020 + 209,
+	typhlosionhisui: 1020 + 210,
+	qwilfishhisui: 1020 + 211,
+	sneaselhisui: 1020 + 212,
+	samurotthisui: 1020 + 213,
+	lilliganthisui: 1020 + 214,
+	zoruahisui: 1020 + 215,
+	zoroarkhisui: 1020 + 216,
+	braviaryhisui: 1020 + 217,
+	sliggoohisui: 1020 + 218,
+	goodrahisui: 1020 + 219,
+	avalugghisui: 1020 + 220,
+	decidueyehisui: 1020 + 221,
+	basculegionf: 1020 + 222,
+	enamorustherian: 1020 + 223,
+	taurospaldeacombat: 1020 + 224,
+	taurospaldeablaze: 1020 + 225,
+	taurospaldeaaqua: 1020 + 226,
+	wooperpaldea: 1020 + 227,
+	oinkolognef: 1020 + 228,
+	palafinhero: 1020 + 229,
+	mausholdfour: 1020 + 230,
+	tatsugiridroopy: 1020 + 231,
+	tatsugiristretchy: 1020 + 232,
+	squawkabillyblue: 1020 + 233,
+	squawkabillyyellow: 1020 + 234,
+	squawkabillywhite: 1020 + 235,
+	gimmighoulroaming: 1020 + 236,
+	dialgaorigin: 1020 + 237,
+	palkiaorigin: 1020 + 238,
+	basculinwhitestriped: 1020 + 239,
+	ursalunabloodmoon: 1020 + 240,
+	ogerponwellspring: 1020 + 241,
+	ogerponhearthflame: 1020 + 242,
+	ogerponcornerstone: 1020 + 243,
 
-	//gumshoostotem: 735,
-	//raticatealolatotem: 900 + 120,
-	//marowakalolatotem: 900 + 136,
-	//araquanidtotem: 752,
-	//lurantistotem: 754,
-	//salazzletotem: 758,
-	//vikavolttotem: 738,
-	//togedemarutotem: 777,
-	//mimikyutotem: 778,
-	//mimikyubustedtotem: 778,
-	//ribombeetotem: 743,
-	//kommoototem: 784,
+	// alt forms with duplicate icons
+	/* greninjabond: 658,
+	gumshoostotem: 735,
+	raticatealolatotem: 1020 + 120,
+	marowakalolatotem: 1020 + 136,
+	araquanidtotem: 752,
+	lurantistotem: 754,
+	salazzletotem: 758,
+	vikavolttotem: 738,
+	togedemarutotem: 777,
+	mimikyutotem: 778,
+	mimikyubustedtotem: 778,
+	ribombeetotem: 743,
+	kommoototem: 784,
+	sinisteaantique: 854,
+	polteageistantique: 855,
+	poltchageistartisan: 1012,
+	sinistchamasterpiece: 1013,
+	ogerpontealtera: 1017,
+	ogerponwellspringtera: 1020 + 241,
+	ogerponhearthflametera: 1020 + 242,
+	ogerponcornerstonetera: 1020 + 243,
+ 	toxtricitylowkeygmax: 1272 + 69, */
 
-	venusaurmega: 1260 + 0,
-	charizardmegax: 1260 + 1,
-	charizardmegay: 1260 + 2,
-	blastoisemega: 1260 + 3,
-	beedrillmega: 1260 + 4,
-	pidgeotmega: 1260 + 5,
-	alakazammega: 1260 + 6,
-	slowbromega: 1260 + 7,
-	gengarmega: 1260 + 8,
-	kangaskhanmega: 1260 + 9,
-	pinsirmega: 1260 + 10,
-	gyaradosmega: 1260 + 11,
-	aerodactylmega: 1260 + 12,
-	mewtwomegax: 1260 + 13,
-	mewtwomegay: 1260 + 14,
-	ampharosmega: 1260 + 15,
-	steelixmega: 1260 + 16,
-	scizormega: 1260 + 17,
-	heracrossmega: 1260 + 18,
-	houndoommega: 1260 + 19,
-	tyranitarmega: 1260 + 20,
-	sceptilemega: 1260 + 21,
-	blazikenmega: 1260 + 22,
-	swampertmega: 1260 + 23,
-	gardevoirmega: 1260 + 24,
-	sableyemega: 1260 + 25,
-	mawilemega: 1260 + 26,
-	aggronmega: 1260 + 27,
-	medichammega: 1260 + 28,
-	manectricmega: 1260 + 29,
-	sharpedomega: 1260 + 30,
-	cameruptmega: 1260 + 31,
-	altariamega: 1260 + 32,
-	banettemega: 1260 + 33,
-	absolmega: 1260 + 34,
-	glaliemega: 1260 + 35,
-	salamencemega: 1260 + 36,
-	metagrossmega: 1260 + 37,
-	latiasmega: 1260 + 38,
-	latiosmega: 1260 + 39,
-	kyogreprimal: 1260 + 40,
-	groudonprimal: 1260 + 41,
-	rayquazamega: 1260 + 42,
-	lopunnymega: 1260 + 43,
-	garchompmega: 1260 + 44,
-	lucariomega: 1260 + 45,
-	abomasnowmega: 1260 + 46,
-	gallademega: 1260 + 47,
-	audinomega: 1260 + 48,
-	dianciemega: 1260 + 49,
-	charizardgmax: 1260 + 50,
-	butterfreegmax: 1260 + 51,
-	pikachugmax: 1260 + 52,
-	meowthgmax: 1260 + 53,
-	machampgmax: 1260 + 54,
-	gengargmax: 1260 + 55,
-	kinglergmax: 1260 + 56,
-	laprasgmax: 1260 + 57,
-	eeveegmax: 1260 + 58,
-	snorlaxgmax: 1260 + 59,
-	garbodorgmax: 1260 + 60,
-	melmetalgmax: 1260 + 61,
-	corviknightgmax: 1260 + 62,
-	orbeetlegmax: 1260 + 63,
-	drednawgmax: 1260 + 64,
-	coalossalgmax: 1260 + 65,
-	flapplegmax: 1260 + 66,
-	appletungmax: 1260 + 67,
-	sandacondagmax: 1260 + 68,
-	toxtricitygmax: 1260 + 69,
-	//toxtricitylowkeygmax: 1260 + 69,
-	centiskorchgmax: 1260 + 70,
-	hatterenegmax: 1260 + 71,
-	grimmsnarlgmax: 1260 + 72,
-	alcremiegmax: 1260 + 73,
-	copperajahgmax: 1260 + 74,
-	duraludongmax: 1260 + 75,
-	eternatuseternamax: 1260 + 76,
-	venusaurgmax: 1260 + 77,
-	blastoisegmax: 1260 + 78,
-	rillaboomgmax: 1260 + 79,
-	cinderacegmax: 1260 + 80,
-	inteleongmax: 1260 + 81,
-	urshifugmax: 1260 + 82,
-	urshifurapidstrikegmax: 1260 + 83,
+	// Mega/G-Max
+	venusaurmega: 1272 + 0,
+	charizardmegax: 1272 + 1,
+	charizardmegay: 1272 + 2,
+	blastoisemega: 1272 + 3,
+	beedrillmega: 1272 + 4,
+	pidgeotmega: 1272 + 5,
+	alakazammega: 1272 + 6,
+	slowbromega: 1272 + 7,
+	gengarmega: 1272 + 8,
+	kangaskhanmega: 1272 + 9,
+	pinsirmega: 1272 + 10,
+	gyaradosmega: 1272 + 11,
+	aerodactylmega: 1272 + 12,
+	mewtwomegax: 1272 + 13,
+	mewtwomegay: 1272 + 14,
+	ampharosmega: 1272 + 15,
+	steelixmega: 1272 + 16,
+	scizormega: 1272 + 17,
+	heracrossmega: 1272 + 18,
+	houndoommega: 1272 + 19,
+	tyranitarmega: 1272 + 20,
+	sceptilemega: 1272 + 21,
+	blazikenmega: 1272 + 22,
+	swampertmega: 1272 + 23,
+	gardevoirmega: 1272 + 24,
+	sableyemega: 1272 + 25,
+	mawilemega: 1272 + 26,
+	aggronmega: 1272 + 27,
+	medichammega: 1272 + 28,
+	manectricmega: 1272 + 29,
+	sharpedomega: 1272 + 30,
+	cameruptmega: 1272 + 31,
+	altariamega: 1272 + 32,
+	banettemega: 1272 + 33,
+	absolmega: 1272 + 34,
+	glaliemega: 1272 + 35,
+	salamencemega: 1272 + 36,
+	metagrossmega: 1272 + 37,
+	latiasmega: 1272 + 38,
+	latiosmega: 1272 + 39,
+	kyogreprimal: 1272 + 40,
+	groudonprimal: 1272 + 41,
+	rayquazamega: 1272 + 42,
+	lopunnymega: 1272 + 43,
+	garchompmega: 1272 + 44,
+	lucariomega: 1272 + 45,
+	abomasnowmega: 1272 + 46,
+	gallademega: 1272 + 47,
+	audinomega: 1272 + 48,
+	dianciemega: 1272 + 49,
+	charizardgmax: 1272 + 50,
+	butterfreegmax: 1272 + 51,
+	pikachugmax: 1272 + 52,
+	meowthgmax: 1272 + 53,
+	machampgmax: 1272 + 54,
+	gengargmax: 1272 + 55,
+	kinglergmax: 1272 + 56,
+	laprasgmax: 1272 + 57,
+	eeveegmax: 1272 + 58,
+	snorlaxgmax: 1272 + 59,
+	garbodorgmax: 1272 + 60,
+	melmetalgmax: 1272 + 61,
+	corviknightgmax: 1272 + 62,
+	orbeetlegmax: 1272 + 63,
+	drednawgmax: 1272 + 64,
+	coalossalgmax: 1272 + 65,
+	flapplegmax: 1272 + 66,
+	appletungmax: 1272 + 67,
+	sandacondagmax: 1272 + 68,
+	toxtricitygmax: 1272 + 69,
+	centiskorchgmax: 1272 + 70,
+	hatterenegmax: 1272 + 71,
+	grimmsnarlgmax: 1272 + 72,
+	alcremiegmax: 1272 + 73,
+	copperajahgmax: 1272 + 74,
+	duraludongmax: 1272 + 75,
+	eternatuseternamax: 1272 + 76,
+	venusaurgmax: 1272 + 77,
+	blastoisegmax: 1272 + 78,
+	rillaboomgmax: 1272 + 79,
+	cinderacegmax: 1272 + 80,
+	inteleongmax: 1272 + 81,
+	urshifugmax: 1272 + 82,
+	urshifurapidstrikegmax: 1272 + 83,
 
-	syclant: 1452 + 0,
-	revenankh: 1452 + 1,
-	pyroak: 1452 + 2,
-	fidgit: 1452 + 3,
-	stratagem: 1452 + 4,
-	arghonaut: 1452 + 5,
-	kitsunoh: 1452 + 6,
-	cyclohm: 1452 + 7,
-	colossoil: 1452 + 8,
-	krilowatt: 1452 + 9,
-	voodoom: 1452 + 10,
-	tomohawk: 1452 + 11,
-	necturna: 1452 + 12,
-	mollux: 1452 + 13,
-	aurumoth: 1452 + 14,
-	malaconda: 1452 + 15,
-	cawmodore: 1452 + 16,
-	volkraken: 1452 + 17,
-	plasmanta: 1452 + 18,
-	naviathan: 1452 + 19,
-	crucibelle: 1452 + 20,
-	crucibellemega: 1452 + 21,
-	kerfluffle: 1452 + 22,
-	pajantom: 1452 + 23,
-	jumbao: 1452 + 24,
-	caribolt: 1452 + 25,
-	smokomodo: 1452 + 26,
-	snaelstrom: 1452 + 27,
-	equilibra: 1452 + 28,
-	astrolotl: 1452 + 29,
-	miasmaw: 1452 + 30,
-	chromera: 1452 + 31,
-	venomicon: 1452 + 32,
-	venomiconepilogue: 1452 + 33,
-	saharaja: 1452 + 34,
+	// CAP
+	syclant: 1464 + 0,
+	revenankh: 1464 + 1,
+	pyroak: 1464 + 2,
+	fidgit: 1464 + 3,
+	stratagem: 1464 + 4,
+	arghonaut: 1464 + 5,
+	kitsunoh: 1464 + 6,
+	cyclohm: 1464 + 7,
+	colossoil: 1464 + 8,
+	krilowatt: 1464 + 9,
+	voodoom: 1464 + 10,
+	tomohawk: 1464 + 11,
+	necturna: 1464 + 12,
+	mollux: 1464 + 13,
+	aurumoth: 1464 + 14,
+	malaconda: 1464 + 15,
+	cawmodore: 1464 + 16,
+	volkraken: 1464 + 17,
+	plasmanta: 1464 + 18,
+	naviathan: 1464 + 19,
+	crucibelle: 1464 + 20,
+	crucibellemega: 1464 + 21,
+	kerfluffle: 1464 + 22,
+	pajantom: 1464 + 23,
+	jumbao: 1464 + 24,
+	caribolt: 1464 + 25,
+	smokomodo: 1464 + 26,
+	snaelstrom: 1464 + 27,
+	equilibra: 1464 + 28,
+	astrolotl: 1464 + 29,
+	miasmaw: 1464 + 30,
+	chromera: 1464 + 31,
+	venomicon: 1464 + 32,
+	venomiconepilogue: 1464 + 33,
+	saharaja: 1464 + 34,
+	hemogoblin: 1464 + 35,
 
-	syclar: 1488 + 0,
-	embirch: 1488 + 1,
-	flarelm: 1488 + 2,
-	breezi: 1488 + 3,
-	scratchet: 1488 + 4,
-	necturine: 1488 + 5,
-	cupra: 1488 + 6,
-	argalis: 1488 + 7,
-	brattler: 1488 + 8,
-	cawdet: 1488 + 9,
-	volkritter: 1488 + 10,
-	snugglow: 1488 + 11,
-	floatoy: 1488 + 12,
-	caimanoe: 1488 + 13,
-	pluffle: 1488 + 14,
-	rebble: 1488 + 15,
-	tactite: 1488 + 16,
-	privatyke: 1488 + 17,
-	nohface: 1488 + 18,
-	monohm: 1488 + 19,
-	duohm: 1488 + 20,
-	protowatt: 1488 + 21,
-	voodoll: 1488 + 22,
-	mumbao: 1488 + 23,
-	fawnifer: 1488 + 24,
-	electrelk: 1488 + 25,
-	smogecko: 1488 + 26,
-	smoguana: 1488 + 27,
-	swirlpool: 1488 + 28,
-	coribalis: 1488 + 29,
-	justyke: 1488 + 30,
-	solotl: 1488 + 31,
-	miasmite: 1488 + 32,
-	dorsoil: 1488 + 33,
-	//saharascal: 1488 + 34,
+	// CAP prevos
+	syclar: 1500 + 0,
+	embirch: 1500 + 1,
+	flarelm: 1500 + 2,
+	breezi: 1500 + 3,
+	scratchet: 1500 + 4,
+	necturine: 1500 + 5,
+	cupra: 1500 + 6,
+	argalis: 1500 + 7,
+	brattler: 1500 + 8,
+	cawdet: 1500 + 9,
+	volkritter: 1500 + 10,
+	snugglow: 1500 + 11,
+	floatoy: 1500 + 12,
+	caimanoe: 1500 + 13,
+	pluffle: 1500 + 14,
+	rebble: 1500 + 15,
+	tactite: 1500 + 16,
+	privatyke: 1500 + 17,
+	nohface: 1500 + 18,
+	monohm: 1500 + 19,
+	duohm: 1500 + 20,
+	protowatt: 1500 + 21,
+	voodoll: 1500 + 22,
+	mumbao: 1500 + 23,
+	fawnifer: 1500 + 24,
+	electrelk: 1500 + 25,
+	smogecko: 1500 + 26,
+	smoguana: 1500 + 27,
+	swirlpool: 1500 + 28,
+	coribalis: 1500 + 29,
+	justyke: 1500 + 30,
+	solotl: 1500 + 31,
+	miasmite: 1500 + 32,
+	dorsoil: 1500 + 33,
+	saharascal: 1500 + 34,
+	ababo: 1500 + 35,
+	scattervein: 1500 + 36,
 };
 
 const BattlePokemonIconIndexesLeft = {

smogon.deploy.js

@@ -5,6 +5,10 @@ function toSmogonAlias(name) {
         replace(/[^a-z0-9-]+/g, '');
 }
 
+function toPSID(name) {
+    return name.toLowerCase().replace(/[^a-z0-9]+/g, '');
+}
+
 function spritecopy(f, {dir, ext}) {
     const sn = spritedata.parseFilename(f.name);
     let name;
@@ -13,7 +17,7 @@ function spritecopy(f, {dir, ext}) {
     if (sn.extra.has("a") || sn.extra.has("b") || sn.extra.has("s")) {
         return;
     }
-    
+
     if (sn.extension) {
         // Skip this, we don't use Unknown/Substitute
         return;
@@ -30,7 +34,7 @@ function spritecopy(f, {dir, ext}) {
     if (sn.extra.has("g")) {
         name += "-gmax";
     }
-    
+
     copy(f, {dir, ext, name});
 }
 
@@ -44,7 +48,28 @@ function itemspritecopy(f, {dir, ext}) {
     }
 }
 
+function newspritecopy(f, {dir, ext}) {
+    const sn = spritedata.parseFilename(f.name);
+    if (sn.extension) {
+        return
+    }
+    const sd = spritedata.get(sn.id);
+    for (const n of sd.type === 'item' ? sd.names : [sd.base + sd.forme]) {
+        let name = toPSID(n);
+        if (sn.extra.has("f")) {
+            name += "f";
+        }
+        if (sn.extra.has("g")) {
+            name += "gmax";
+        }
+        copy(f, {dir, ext, name});
+    }
+}
+
+let seenModels = new Set;
+
 for (const f of list("src/models")) {
+    seenModels.add(f.name);
     spritecopy(f, {dir: "xy"});
 }
 
@@ -52,6 +77,17 @@ for (const f of list("build/gen9-modelslike")) {
     spritecopy(f, {dir: "xy"});
 }
 
+// Non-model CAPs
+for (const f of list("src/sprites/gen5")) {
+    if (f.ext !== 'gif' || seenModels.has(f.name)) continue;
+    spritecopy(f, {dir: "xy"});
+}
+
+for (const f of list("build/gen5-gif")) {
+    if (seenModels.has(f.name)) continue;
+    spritecopy(f, {dir: "xy"});
+}
+
 for (const f of list("build/gen6-minisprites-trimmed")) {
     spritecopy(f, {dir: "xyicons"});
 }
@@ -60,6 +96,12 @@ for (const f of list("build/item-minisprites-trimmed")) {
     itemspritecopy(f, {dir: "xyitems"});
 }
 
+let h = hash(...list("build/smogon/minisprites"));
+for (const f of list("build/smogon/minisprites")) {
+    newspritecopy(f, {dir: "minisprites/" + h});
+}
+write("minisprites/hash.txt", h);
+
 for (const f of list("build/item-minisprites-padded")) {
     itemspritecopy(f, {dir: "forumsprites"});
 }

src/README.md

@@ -6,6 +6,12 @@ Documentation for flags used.
 - `-b` Back sprite
 - `-g` Game it is from, can be `rb`, `rg`, `rgb`, or `y`
 
+# sprites/gen2
+
+- `-b` Back sprite
+- `-s` Shiny
+- `-g` Game it is from, can be `c`
+
 # models, dex, afd, previews
 
 - `-b` Back sprite