From 0f840b3e183e49927b92f4fd0282ebaec0f70cf6 Mon Sep 17 00:00:00 2001
From: Christopher Monsanto <chris@monsan.to>
Date: Sun, 22 Feb 2026 04:52:18 -0500
Subject: [PATCH] various fixes

---
 Tuprules.lua      |   2 +-
 data/items.json   | 287 ++++++++++++++++++++++++++++++++--------------
 data/species.json |   2 +-
 3 files changed, 200 insertions(+), 91 deletions(-)

diff --git a/Tuprules.lua b/Tuprules.lua
index 34bc98e9..56034614 100644
--- a/Tuprules.lua
+++ b/Tuprules.lua
@@ -1,5 +1,5 @@
 
-tup.include("util/strict.lua")
+--tup.include("util/strict.lua")
 tup.include("util/lua-ext.lua")
 tup.include("util/tup-ext.lua")
 tup.include("util/sprites.lua")
diff --git a/data/items.json b/data/items.json
index 690a89d6..6a269fdf 100644
--- a/data/items.json
+++ b/data/items.json
@@ -20,6 +20,13 @@
         ],
         "sid": "i677"
     },
+    "i2588": {
+        "type": "item",
+        "names": [
+            "Absolite Z"
+        ],
+        "sid": "i2588"
+    },
     "i545": {
         "type": "item",
         "names": [
@@ -168,6 +175,14 @@
         ],
         "sid": "i2581"
     },
+    "i2601": {
+        "type": "item",
+        "names": [
+            "Baxcalibrite",
+            "Tatsugirinite"
+        ],
+        "sid": "i2601"
+    },
     "i851": {
         "type": "item",
         "names": [
@@ -308,13 +323,6 @@
         ],
         "sid": "i558"
     },
-    "i909": {
-        "type": "item",
-        "names": [
-            "Bug Memory"
-        ],
-        "sid": "i909"
-    },
     "i787": {
         "type": "item",
         "names": [
@@ -322,6 +330,13 @@
         ],
         "sid": "i787"
     },
+    "i909": {
+        "type": "item",
+        "names": [
+            "Bug Memory"
+        ],
+        "sid": "i909"
+    },
     "i118": {
         "type": "item",
         "names": [
@@ -422,6 +437,13 @@
         ],
         "sid": "i119"
     },
+    "i2587": {
+        "type": "item",
+        "names": [
+            "Chimechite"
+        ],
+        "sid": "i2587"
+    },
     "i1254": {
         "type": "item",
         "names": [
@@ -527,6 +549,13 @@
         ],
         "sid": "i1885"
     },
+    "i2595": {
+        "type": "item",
+        "names": [
+            "Crabominite"
+        ],
+        "sid": "i2595"
+    },
     "i1253": {
         "type": "item",
         "names": [
@@ -555,6 +584,13 @@
         ],
         "sid": "i562"
     },
+    "i791": {
+        "type": "item",
+        "names": [
+            "Darkinium Z"
+        ],
+        "sid": "i791"
+    },
     "i919": {
         "type": "item",
         "names": [
@@ -562,12 +598,12 @@
         ],
         "sid": "i919"
     },
-    "i791": {
+    "i2593": {
         "type": "item",
         "names": [
-            "Darkinium Z"
+            "Darkranite"
         ],
-        "sid": "i791"
+        "sid": "i2593"
     },
     "i109": {
         "type": "item",
@@ -667,20 +703,6 @@
         ],
         "sid": "i561"
     },
-    "i918": {
-        "type": "item",
-        "names": [
-            "Dragon Memory"
-        ],
-        "sid": "i918"
-    },
-    "i235": {
-        "type": "item",
-        "names": [
-            "Dragon Scale"
-        ],
-        "sid": "i235"
-    },
     "i2562": {
         "type": "item",
         "names": [
@@ -695,10 +717,25 @@
         ],
         "sid": "i790"
     },
+    "i918": {
+        "type": "item",
+        "names": [
+            "Dragon Memory"
+        ],
+        "sid": "i918"
+    },
+    "i235": {
+        "type": "item",
+        "names": [
+            "Dragon Scale"
+        ],
+        "sid": "i235"
+    },
     "i2585": {
         "type": "item",
         "names": [
-            "Drampanite"
+            "Drampanite",
+            "Raichunite X"
         ],
         "sid": "i2585"
     },
@@ -880,7 +917,8 @@
     "i2586": {
         "type": "item",
         "names": [
-            "Falinksite"
+            "Falinksite",
+            "Raichunite Y"
         ],
         "sid": "i2586"
     },
@@ -1115,6 +1153,13 @@
         ],
         "sid": "i683"
     },
+    "i2590": {
+        "type": "item",
+        "names": [
+            "Garchompite Z"
+        ],
+        "sid": "i2590"
+    },
     "i657": {
         "type": "item",
         "names": [
@@ -1136,13 +1181,6 @@
         ],
         "sid": "i560"
     },
-    "i910": {
-        "type": "item",
-        "names": [
-            "Ghost Memory"
-        ],
-        "sid": "i910"
-    },
     "i789": {
         "type": "item",
         "names": [
@@ -1150,6 +1188,13 @@
         ],
         "sid": "i789"
     },
+    "i910": {
+        "type": "item",
+        "names": [
+            "Ghost Memory"
+        ],
+        "sid": "i910"
+    },
     "i763": {
         "type": "item",
         "names": [
@@ -1157,6 +1202,13 @@
         ],
         "sid": "i763"
     },
+    "i2600": {
+        "type": "item",
+        "names": [
+            "Glimmoranite"
+        ],
+        "sid": "i2600"
+    },
     "i796": {
         "type": "item",
         "names": [
@@ -1164,6 +1216,21 @@
         ],
         "sid": "i796"
     },
+    "i2596": {
+        "type": "item",
+        "names": [
+            "Golisopite"
+        ],
+        "sid": "i2596"
+    },
+    "i2594": {
+        "type": "item",
+        "names": [
+            "Golurkite",
+            "Meowsticite"
+        ],
+        "sid": "i2594"
+    },
     "i551": {
         "type": "item",
         "names": [
@@ -1171,13 +1238,6 @@
         ],
         "sid": "i551"
     },
-    "i914": {
-        "type": "item",
-        "names": [
-            "Grass Memory"
-        ],
-        "sid": "i914"
-    },
     "i780": {
         "type": "item",
         "names": [
@@ -1185,6 +1245,13 @@
         ],
         "sid": "i780"
     },
+    "i914": {
+        "type": "item",
+        "names": [
+            "Grass Memory"
+        ],
+        "sid": "i914"
+    },
     "i884": {
         "type": "item",
         "names": [
@@ -1241,13 +1308,6 @@
         ],
         "sid": "i555"
     },
-    "i907": {
-        "type": "item",
-        "names": [
-            "Ground Memory"
-        ],
-        "sid": "i907"
-    },
     "i784": {
         "type": "item",
         "names": [
@@ -1255,6 +1315,13 @@
         ],
         "sid": "i784"
     },
+    "i907": {
+        "type": "item",
+        "names": [
+            "Ground Memory"
+        ],
+        "sid": "i907"
+    },
     "i676": {
         "type": "item",
         "names": [
@@ -1297,6 +1364,13 @@
         ],
         "sid": "i2408"
     },
+    "i2592": {
+        "type": "item",
+        "names": [
+            "Heatranite"
+        ],
+        "sid": "i2592"
+    },
     "i284": {
         "type": "item",
         "names": [
@@ -1437,6 +1511,13 @@
         ],
         "sid": "i710"
     },
+    "i675": {
+        "type": "item",
+        "names": [
+            "Kangaskhanite"
+        ],
+        "sid": "i675"
+    },
     "i196": {
         "type": "item",
         "names": [
@@ -1465,13 +1546,6 @@
         ],
         "sid": "i170"
     },
-    "i675": {
-        "type": "item",
-        "names": [
-            "Kangaskhanite"
-        ],
-        "sid": "i675"
-    },
     "i221": {
         "type": "item",
         "names": [
@@ -1621,6 +1695,13 @@
         ],
         "sid": "i673"
     },
+    "i2591": {
+        "type": "item",
+        "names": [
+            "Lucarionite Z"
+        ],
+        "sid": "i2591"
+    },
     "i256": {
         "type": "item",
         "names": [
@@ -1692,6 +1773,13 @@
         ],
         "sid": "i215"
     },
+    "i2597": {
+        "type": "item",
+        "names": [
+            "Magearnite"
+        ],
+        "sid": "i2597"
+    },
     "i323": {
         "type": "item",
         "names": [
@@ -2136,13 +2224,6 @@
         ],
         "sid": "i554"
     },
-    "i906": {
-        "type": "item",
-        "names": [
-            "Poison Memory"
-        ],
-        "sid": "i906"
-    },
     "i783": {
         "type": "item",
         "names": [
@@ -2150,6 +2231,13 @@
         ],
         "sid": "i783"
     },
+    "i906": {
+        "type": "item",
+        "names": [
+            "Poison Memory"
+        ],
+        "sid": "i906"
+    },
     "i4": {
         "type": "item",
         "names": [
@@ -2431,13 +2519,6 @@
         ],
         "sid": "i315"
     },
-    "i908": {
-        "type": "item",
-        "names": [
-            "Rock Memory"
-        ],
-        "sid": "i908"
-    },
     "i788": {
         "type": "item",
         "names": [
@@ -2445,6 +2526,13 @@
         ],
         "sid": "i788"
     },
+    "i908": {
+        "type": "item",
+        "names": [
+            "Rock Memory"
+        ],
+        "sid": "i908"
+    },
     "i540": {
         "type": "item",
         "names": [
@@ -2578,6 +2666,13 @@
         ],
         "sid": "i232"
     },
+    "i2599": {
+        "type": "item",
+        "names": [
+            "Scovillainite"
+        ],
+        "sid": "i2599"
+    },
     "i2572": {
         "type": "item",
         "names": [
@@ -2770,6 +2865,13 @@
         ],
         "sid": "i499"
     },
+    "i2589": {
+        "type": "item",
+        "names": [
+            "Staraptite"
+        ],
+        "sid": "i2589"
+    },
     "i207": {
         "type": "item",
         "names": [
@@ -2791,13 +2893,6 @@
         ],
         "sid": "i1114"
     },
-    "i761": {
-        "type": "item",
-        "names": [
-            "Steelixite"
-        ],
-        "sid": "i761"
-    },
     "i563": {
         "type": "item",
         "names": [
@@ -2805,13 +2900,6 @@
         ],
         "sid": "i563"
     },
-    "i911": {
-        "type": "item",
-        "names": [
-            "Steel Memory"
-        ],
-        "sid": "i911"
-    },
     "i792": {
         "type": "item",
         "names": [
@@ -2819,6 +2907,20 @@
         ],
         "sid": "i792"
     },
+    "i761": {
+        "type": "item",
+        "names": [
+            "Steelixite"
+        ],
+        "sid": "i761"
+    },
+    "i911": {
+        "type": "item",
+        "names": [
+            "Steel Memory"
+        ],
+        "sid": "i911"
+    },
     "i288": {
         "type": "item",
         "names": [
@@ -3729,6 +3831,13 @@
         ],
         "sid": "i549"
     },
+    "i778": {
+        "type": "item",
+        "names": [
+            "Waterium Z"
+        ],
+        "sid": "i778"
+    },
     "i913": {
         "type": "item",
         "names": [
@@ -3743,13 +3852,6 @@
         ],
         "sid": "i84"
     },
-    "i778": {
-        "type": "item",
-        "names": [
-            "Waterium Z"
-        ],
-        "sid": "i778"
-    },
     "i181": {
         "type": "item",
         "names": [
@@ -3834,6 +3936,13 @@
         ],
         "sid": "i300"
     },
+    "i2598": {
+        "type": "item",
+        "names": [
+            "Zeraorite"
+        ],
+        "sid": "i2598"
+    },
     "i276": {
         "type": "item",
         "names": [
diff --git a/data/species.json b/data/species.json
index 94825aa9..9cce8623 100644
--- a/data/species.json
+++ b/data/species.json
@@ -8460,7 +8460,7 @@
         "num": 744,
         "formeNum": 1,
         "base": "Rockruff",
-        "forme": "",
+        "forme": "Dusk",
         "sid": "s23809"
     },
     "s23840": {