Merge pull request #107 from BockyBlock/main

Make sure you also add Tuwih's pull
ROBOT-IS-CHILL · Nov 5, 2023 · 9fd662e · 9fd662e
2 parents bde6c52 + 941fbda
commit 9fd662e
Show file tree

Hide file tree

Showing 357 changed files with 382 additions and 292 deletions.
diff --git a/data/custom/dizzyandy-sprites.json b/data/custom/dizzyandy-sprites.json
@@ -592,5 +592,32 @@
             "3"
         ],
         "tiling": "-1"
+    },
+    {
+        "name": "roy",
+        "sprite": "roy",
+        "color": [
+            "2",
+            "4"
+        ],
+        "tiling": "2"
+    },
+    {
+        "name": "glyph_metanot",
+        "sprite": "glyph_metanot",
+        "color": [
+            "2",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "glyph_metanot2",
+        "sprite": "glyph_metanot2",
+        "color": [
+            "2",
+            "2"
+        ],
+        "tiling": "-1"
     }
 ]
diff --git a/data/custom/extrem-sprites.json b/data/custom/extrem-sprites.json
@@ -61,5 +61,68 @@
             "4"
         ],
         "tiling": "-1"
+    },
+    {
+        "name": "text_alkali",
+        "sprite": "text_alkali",
+        "color": [
+            "5",
+            "1"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "text_toxic",
+        "sprite": "text_toxic",
+        "color": [
+            "3",
+            "1"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "text_curious",
+        "sprite": "text_curious",
+        "color": [
+            "0",
+            "3"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "text_type",
+        "sprite": "text_type",
+        "color": [
+            "3",
+            "3"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "text_watch",
+        "sprite": "text_watch",
+        "color": [
+            "2",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "text_watch2",
+        "sprite": "text_watch2",
+        "color": [
+            "2",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "text_watch3",
+        "sprite": "text_watch3",
+        "color": [
+            "2",
+            "2"
+        ],
+        "tiling": "-1"
     }
 ]
diff --git a/data/custom/fofo-collabs.json b/data/custom/fofo-collabs.json
@@ -16,6 +16,33 @@
             "2"
         ],
         "tiling": "2"
+    },
+    {
+        "name": "dork",
+        "sprite": "dork",
+        "color": [
+            "3",
+            "1"
+        ],
+        "tiling": "2"
+    },
+    {
+        "name": "yoyo",
+        "sprite": "yoyo",
+        "color": [
+            "5",
+            "1"
+        ],
+        "tiling": "2"
+    },
+    {
+        "name": "ptpt",
+        "sprite": "ptpt",
+        "color": [
+            "0",
+            "2"
+        ],
+        "tiling": "2"
     },
 	{
         "name": "glyph_n1",

diff --git a/data/custom/gabe-sprites.json b/data/custom/gabe-sprites.json
@@ -106,5 +106,86 @@
             "4"
         ],
         "tiling": "-1"
+    },
+    {
+        "name": "genemy",
+        "sprite": "groupenemy",
+        "color": [
+            "2",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "genemy1",
+        "sprite": "groupenemy1",
+        "color": [
+            "2",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "genemy2",
+        "sprite": "groupenemy2",
+        "color": [
+            "4",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "gextra",
+        "sprite": "gextra",
+        "color": [
+            "4",
+            "1"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "gplayer",
+        "sprite": "groupplayer",
+        "color": [
+            "4",
+            "2"
+        ],
+        "tiling": "0"
+    },
+    {
+        "name": "gplayer2",
+        "sprite": "groupplayer2",
+        "color": [
+            "4",
+            "2"
+        ],
+        "tiling": "0"
+    },
+    {
+        "name": "gwincon",
+        "sprite": "groupwincon",
+        "color": [
+            "2",
+            "4"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "ion",
+        "sprite": "ion",
+        "color": [
+            "3",
+            "3"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "jaejae",
+        "sprite": "jaejae",
+        "color": [
+            "4",
+            "2"
+        ],
+        "tiling": "2"
     }
 ]
diff --git a/data/custom/wreckings-stuff.json b/data/custom/wreckings-stuff.json
@@ -385,5 +385,23 @@
             "0",
             "3"
         ]
+    },
+	{
+        "name": "text_sauosolewbiye",
+        "sprite": "text_sauosolewbiye",
+        "tiling": "-1",
+        "color": [
+            "0",
+            "3"
+        ]
+    },
+	{
+        "name": "sauosolewbiye",
+        "sprite": "sauosolewbiye",
+        "tiling": "0",
+        "color": [
+            "0",
+            "3"
+        ]
     }
 ]
diff --git a/data/custom/xtrem-sprites - Copy.json b/data/custom/xtrem-sprites - Copy.json