Merge pull request #187 from FofoFromBaba/main

glarg :)
ROBOT-IS-CHILL · Sep 11, 2024 · 6c57ba6 · 6c57ba6
2 parents eb3670b + d697373
commit 6c57ba6
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 18 deletions.
diff --git a/data/custom/doge-sprites.json b/data/custom/doge-sprites.json
@@ -196,5 +196,14 @@
             "3"
         ],
         "tiling": "-1"
+    },
+    {
+        "name": "text_glarg",
+        "sprite": "text_glarg",
+        "color": [
+            "5",
+            "4"
+        ],
+        "tiling": "-1"
     }
 ]
diff --git a/data/custom/mathman-sprites.json b/data/custom/mathman-sprites.json
@@ -197,5 +197,23 @@
             "3"
         ],
         "tiling": "0"
+    },
+    {
+        "name": "numx",
+        "sprite": "numx",
+        "color": [
+            "4",
+            "3"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "text_numx",
+        "sprite": "text_numx",
+        "color": [
+            "4",
+            "3"
+        ],
+        "tiling": "-1"
     }
 ]
diff --git a/data/custom/number.json b/data/custom/number.json
@@ -413,24 +413,6 @@
         ],
         "tiling": "-1"
     },
-    {
-        "name": "numx",
-        "sprite": "numx",
-        "color": [
-            "4",
-            "3"
-        ],
-        "tiling": "-1"
-    },
-    {
-        "name": "text_numx",
-        "sprite": "text_numx",
-        "color": [
-            "4",
-            "3"
-        ],
-        "tiling": "-1"
-    },
     {
         "name": "op_tothe",
         "sprite": "tothe",

diff --git a/data/sprites/doge-sprites/text_glarg_0_1.png b/data/sprites/doge-sprites/text_glarg_0_1.png
diff --git a/data/sprites/doge-sprites/text_glarg_0_2.png b/data/sprites/doge-sprites/text_glarg_0_2.png
diff --git a/data/sprites/doge-sprites/text_glarg_0_3.png b/data/sprites/doge-sprites/text_glarg_0_3.png
diff --git a/data/sprites/number/numx_0_1.png → data/sprites/mathman-sprites/numx_0_1.png b/data/sprites/number/numx_0_1.png → data/sprites/mathman-sprites/numx_0_1.png
diff --git a/data/sprites/number/numx_0_2.png → data/sprites/mathman-sprites/numx_0_2.png b/data/sprites/number/numx_0_2.png → data/sprites/mathman-sprites/numx_0_2.png
diff --git a/data/sprites/number/numx_0_3.png → data/sprites/mathman-sprites/numx_0_3.png b/data/sprites/number/numx_0_3.png → data/sprites/mathman-sprites/numx_0_3.png
diff --git a/data/sprites/number/number_0_1.png b/data/sprites/number/number_0_1.png
diff --git a/data/sprites/number/number_0_2.png b/data/sprites/number/number_0_2.png
diff --git a/data/sprites/number/number_0_3.png b/data/sprites/number/number_0_3.png