From 9510791a4fd58e8eba44d95350bf454259504168 Mon Sep 17 00:00:00 2001
From: Christopher Monsanto <chris@monsan.to>
Date: Sat, 29 Aug 2026 03:39:05 -0400
Subject: [PATCH] Give xyicons the same sprites as minisprites

The two sets are one set of pictures read two ways, but only minisprites
carried the items: xyicons published the gen 6 icons and stopped there, so
a name that answered in one directory was a 404 in the other. The trim rule
the items want is the one the deprecated block had kept commented since the
unstamped sets were retired.

Both sets are now spelled in one place, since what belongs in either is
decided once.
---
 smogon.build.ts | 64 +++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/smogon.build.ts b/smogon.build.ts
index 94f50e08..d7034964 100644
--- a/smogon.build.ts
+++ b/smogon.build.ts
@@ -82,25 +82,6 @@ deploy(async ctx => {
     manifest.links(LINKS);
 });
 
-// sprites/xyicons/: trimmed gen6 minisprites.
-
-let xyIcons = forEachRule('src/minisprites/pokemon/gen6/*.png', {
-    display: 'trim g6 minisprite %f',
-    cmds: [trimimg(), compresspng({config: 'MINISPRITE'})],
-}, '%b');
-
-deploy(async ctx => {
-    // icons: the gen 6 set has no art for some formes and lends them another's,
-    // which the smogdex sheet and forumsprites do off the same directory. Two
-    // formes lent the same icon are a duplicate name the manifest refuses.
-    let manifest = new Manifest(ctx, TREE);
-    for (let f of xyIcons) {
-        await spritecopy(manifest, f, {dir: 'xyicons'}, {icons: true});
-    }
-    manifest.write('__meta/xyicons/manifest.json');
-    manifest.links(LINKS);
-});
-
 // sprites/rb, rg, y, c, rs, dp, bw: the older-gen full sprites, the front of
 // each generation under the name the smogdex, the forum and chatot each
 // compose from a dex alias. They read no manifest, which is why these ride
@@ -162,15 +143,32 @@ oldgen('bw', async ctx => [
     ...xyGen5,
 ]);
 
-// sprites/minisprites/: the smogdex's icons as files, one apiece, for a reader
-// that wants one of them rather than the whole sheet. The sources ship
-// verbatim, which is what makes a file and its cell in the sheet the same
-// picture; xyicons/ is the trimmed reading of the same set.
+// sprites/minisprites/ and sprites/xyicons/: the smogdex's icons as files, one
+// apiece, for a reader that wants one of them rather than the whole sheet. The
+// two are the same set of pictures read two ways, which is why they are
+// spelled together: minisprites/ ships the sources verbatim, which is what
+// makes a file and its cell in the sheet the same picture, and xyicons/ is the
+// trimmed reading, where a name answers with the drawing and none of the box
+// around it.
 //
 // They ride the LINKS mirror because what asks for one composes the path out of
 // the sprite and nothing else, which is what the set used to make it read a
 // whole-set hash out of a pointer file to do.
 
+let xyItems = forEachRule('src/minisprites/items/*.png', {
+    display: 'trim item minisprite %f',
+    cmds: [trimimg(), compresspng({config: 'MINISPRITE'})],
+}, '%b');
+
+let xyIcons = forEachRule('src/minisprites/pokemon/gen6/*.png', {
+    display: 'trim g6 minisprite %f',
+    cmds: [trimimg(), compresspng({config: 'MINISPRITE'})],
+}, '%b');
+
+// icons: the gen 6 set has no art for some formes and lends them another's,
+// which the smogdex sheet and forumsprites do off the same directory. Two
+// formes lent the same icon are a duplicate name the manifest refuses.
+
 deploy(async ctx => {
     let manifest = new Manifest(ctx, TREE);
     for (let f of await ctx.list('src/minisprites/items')) {
@@ -183,6 +181,18 @@ deploy(async ctx => {
     manifest.links(LINKS);
 });
 
+deploy(async ctx => {
+    let manifest = new Manifest(ctx, TREE);
+    for (let f of xyItems) {
+        await itemspritecopy(manifest, f, {dir: 'xyicons'});
+    }
+    for (let f of xyIcons) {
+        await spritecopy(manifest, f, {dir: 'xyicons'}, {icons: true});
+    }
+    manifest.write('__meta/xyicons/manifest.json');
+    manifest.links(LINKS);
+});
+
 // Smogdex spritesheet. The sheet tool bakes the names parsed from the %f
 // filenames into the css, hence nameSensitive. The png is declared only so
 // cwebp has something to read; only the css and the webp are published.
@@ -355,11 +365,6 @@ deploy(async ctx => {
 // uses (PNG_DETERMINISTIC, base) and giving the copies a Manifest, as the
 // deploys above do.
 //
-// let xyItems = forEachRule('src/minisprites/items/*.png', {
-//     display: 'trim item minisprite %f',
-//     cmds: [trimimg(), compresspng({config: 'MINISPRITE'})],
-// }, '%b');
-//
 // Smogdex social images: models, backfilled with gen9 species not yet in
 // models (first source wins).
 //
@@ -392,9 +397,6 @@ deploy(async ctx => {
 // }, '%B.png');
 //
 // deploy(ctx => {
-//     for (let f of xyItems) {
-//         itemspritecopy(?, f, {dir: "xyitems"});
-//     }
 //     for (let f of fb) {
 //         spritecopy(?, f, {dir: "fbsprites/xy"});
 //     }