ROBOT-IS-CHILL · balt-dev · Sep 29, 2023 · Sep 24, 2023 · Sep 29, 2023
diff --git a/data/custom/bab.json b/data/custom/bab.json
@@ -342,7 +342,7 @@
         ]
     },
     {
-        "name": "kat",
+        "name": "babkat",
         "sprite": "kat",
         "tiling": "-1",
         "color": [
@@ -630,7 +630,7 @@
         "tiling": "-1"
     },
     {
-        "name": "prop",
+        "name": "babprop",
         "sprite": "prop",
         "color": [
             "0",
@@ -819,7 +819,7 @@
         "tiling": "-1"
     },
     {
-        "name": "sine",
+        "name": "babsine",
         "sprite": "sine",
         "color": [
             "6",

diff --git a/data/custom/dizzyandy-sprites.json b/data/custom/dizzyandy-sprites.json
@@ -520,5 +520,14 @@
             "3"
         ],
         "tiling": "-1"
+    },
+    {
+        "name": "sine",
+        "sprite": "sine",
+        "color": [
+            "5",
+            "3"
+        ],
+        "tiling": "1"
     }
 ]
diff --git a/data/custom/jawa-sprites.json b/data/custom/jawa-sprites.json
@@ -0,0 +1 @@
+[]
diff --git a/data/custom/misc.json b/data/custom/misc.json
@@ -1372,7 +1372,7 @@
         "sprite": "qiqi",
         "color": [
             "3",
-            "3"
+            "2"
         ],
         "tiling": "2"
     },

diff --git a/data/custom/muh-sprites.json b/data/custom/muh-sprites.json
@@ -96,7 +96,7 @@
             "2",
             "2"
         ],
-        "tiling": "0"
+        "tiling": "3"
     },
     {
         "name": "leaves",
@@ -120,8 +120,8 @@
         "name": "pebble",
         "sprite": "pebble",
         "color": [
-            "2",
-            "4"
+            "6",
+            "1"
         ],
         "tiling": "-1"
     },

diff --git a/data/custom/theopold-sprites.json b/data/custom/theopold-sprites.json
@@ -1196,15 +1196,6 @@
         ],
         "tiling": "-1"
     },
-    {
-        "name": "wudwud",
-        "sprite": "wudwud",
-        "color": [
-            "5",
-            "1"
-        ],
-        "tiling": "2"
-    },
     {
         "name": "sososo",
         "sprite": "sososo",
@@ -1366,5 +1357,32 @@
             "2"
         ],
         "tiling": "-1"
+    },
+    {
+        "name": "doda",
+        "sprite": "doda",
+        "color": [
+            "0",
+            "2"
+        ],
+        "tiling": "0"
+    },
+    {
+        "name": "wudwud",
+        "sprite": "wudwud",
+        "color": [
+            "5",
+            "1"
+        ],
+        "tiling": "2"
+    },
+    {
+        "name": "ebace",
+        "sprite": "ebace",
+        "color": [
+            "2",
+            "0"
+        ],
+        "tiling": "2"
     }
 ]
diff --git a/data/misc/listofcharacter.txt b/data/misc/listofcharacter.txt
@@ -67,9 +67,11 @@ dag
 debug
 debugc
 dider
+doda
 dog
 dude
 dufu
+ebace
 eeh
 eel
 ekek
@@ -103,6 +105,7 @@ goob2
 goopi
 goose
 greg
+grgr
 gugu
 gugu2
 hand
@@ -134,7 +137,6 @@ iz
 izbeta
 izzy
 jaja
-jaja
 jelly
 jiji
 jilt

diff --git a/data/sprites/dizzyandy-sprites/badcat_31_3.png b/data/sprites/dizzyandy-sprites/badcat_31_3.png
diff --git a/data/sprites/theopold-sprites/doda_0_1.png b/data/sprites/theopold-sprites/doda_0_1.png
diff --git a/data/sprites/theopold-sprites/doda_0_2.png b/data/sprites/theopold-sprites/doda_0_2.png
diff --git a/data/sprites/theopold-sprites/doda_0_3.png b/data/sprites/theopold-sprites/doda_0_3.png
diff --git a/data/sprites/theopold-sprites/doda_16_1.png b/data/sprites/theopold-sprites/doda_16_1.png
diff --git a/data/sprites/theopold-sprites/doda_16_2.png b/data/sprites/theopold-sprites/doda_16_2.png
diff --git a/data/sprites/theopold-sprites/doda_16_3.png b/data/sprites/theopold-sprites/doda_16_3.png
diff --git a/data/sprites/theopold-sprites/doda_24_1.png b/data/sprites/theopold-sprites/doda_24_1.png
diff --git a/data/sprites/theopold-sprites/doda_24_2.png b/data/sprites/theopold-sprites/doda_24_2.png
diff --git a/data/sprites/theopold-sprites/doda_24_3.png b/data/sprites/theopold-sprites/doda_24_3.png
diff --git a/data/sprites/theopold-sprites/doda_8_1.png b/data/sprites/theopold-sprites/doda_8_1.png
diff --git a/data/sprites/theopold-sprites/doda_8_2.png b/data/sprites/theopold-sprites/doda_8_2.png
diff --git a/data/sprites/theopold-sprites/doda_8_3.png b/data/sprites/theopold-sprites/doda_8_3.png
diff --git a/data/sprites/theopold-sprites/ebace_0_1.png b/data/sprites/theopold-sprites/ebace_0_1.png
diff --git a/data/sprites/theopold-sprites/ebace_0_2.png b/data/sprites/theopold-sprites/ebace_0_2.png
diff --git a/data/sprites/theopold-sprites/ebace_0_3.png b/data/sprites/theopold-sprites/ebace_0_3.png
diff --git a/data/sprites/theopold-sprites/ebace_10_1.png b/data/sprites/theopold-sprites/ebace_10_1.png
diff --git a/data/sprites/theopold-sprites/ebace_10_2.png b/data/sprites/theopold-sprites/ebace_10_2.png
diff --git a/data/sprites/theopold-sprites/ebace_10_3.png b/data/sprites/theopold-sprites/ebace_10_3.png
diff --git a/data/sprites/theopold-sprites/ebace_11_1.png b/data/sprites/theopold-sprites/ebace_11_1.png
diff --git a/data/sprites/theopold-sprites/ebace_11_2.png b/data/sprites/theopold-sprites/ebace_11_2.png
diff --git a/data/sprites/theopold-sprites/ebace_11_3.png b/data/sprites/theopold-sprites/ebace_11_3.png
diff --git a/data/sprites/theopold-sprites/ebace_15_1.png b/data/sprites/theopold-sprites/ebace_15_1.png
diff --git a/data/sprites/theopold-sprites/ebace_15_2.png b/data/sprites/theopold-sprites/ebace_15_2.png
diff --git a/data/sprites/theopold-sprites/ebace_15_3.png b/data/sprites/theopold-sprites/ebace_15_3.png
diff --git a/data/sprites/theopold-sprites/ebace_16_1.png b/data/sprites/theopold-sprites/ebace_16_1.png
diff --git a/data/sprites/theopold-sprites/ebace_16_2.png b/data/sprites/theopold-sprites/ebace_16_2.png
diff --git a/data/sprites/theopold-sprites/ebace_16_3.png b/data/sprites/theopold-sprites/ebace_16_3.png
diff --git a/data/sprites/theopold-sprites/ebace_17_1.png b/data/sprites/theopold-sprites/ebace_17_1.png
diff --git a/data/sprites/theopold-sprites/ebace_17_2.png b/data/sprites/theopold-sprites/ebace_17_2.png
diff --git a/data/sprites/theopold-sprites/ebace_17_3.png b/data/sprites/theopold-sprites/ebace_17_3.png
diff --git a/data/sprites/theopold-sprites/ebace_18_1.png b/data/sprites/theopold-sprites/ebace_18_1.png
diff --git a/data/sprites/theopold-sprites/ebace_18_2.png b/data/sprites/theopold-sprites/ebace_18_2.png
diff --git a/data/sprites/theopold-sprites/ebace_18_3.png b/data/sprites/theopold-sprites/ebace_18_3.png
diff --git a/data/sprites/theopold-sprites/ebace_19_1.png b/data/sprites/theopold-sprites/ebace_19_1.png
diff --git a/data/sprites/theopold-sprites/ebace_19_2.png b/data/sprites/theopold-sprites/ebace_19_2.png
diff --git a/data/sprites/theopold-sprites/ebace_19_3.png b/data/sprites/theopold-sprites/ebace_19_3.png
diff --git a/data/sprites/theopold-sprites/ebace_1_1.png b/data/sprites/theopold-sprites/ebace_1_1.png
diff --git a/data/sprites/theopold-sprites/ebace_1_2.png b/data/sprites/theopold-sprites/ebace_1_2.png
diff --git a/data/sprites/theopold-sprites/ebace_1_3.png b/data/sprites/theopold-sprites/ebace_1_3.png
diff --git a/data/sprites/theopold-sprites/ebace_23_1.png b/data/sprites/theopold-sprites/ebace_23_1.png
diff --git a/data/sprites/theopold-sprites/ebace_23_2.png b/data/sprites/theopold-sprites/ebace_23_2.png
diff --git a/data/sprites/theopold-sprites/ebace_23_3.png b/data/sprites/theopold-sprites/ebace_23_3.png
diff --git a/data/sprites/theopold-sprites/ebace_24_1.png b/data/sprites/theopold-sprites/ebace_24_1.png
diff --git a/data/sprites/theopold-sprites/ebace_24_2.png b/data/sprites/theopold-sprites/ebace_24_2.png
diff --git a/data/sprites/theopold-sprites/ebace_24_3.png b/data/sprites/theopold-sprites/ebace_24_3.png
diff --git a/data/sprites/theopold-sprites/ebace_25_1.png b/data/sprites/theopold-sprites/ebace_25_1.png
diff --git a/data/sprites/theopold-sprites/ebace_25_2.png b/data/sprites/theopold-sprites/ebace_25_2.png
diff --git a/data/sprites/theopold-sprites/ebace_25_3.png b/data/sprites/theopold-sprites/ebace_25_3.png
diff --git a/data/sprites/theopold-sprites/ebace_26_1.png b/data/sprites/theopold-sprites/ebace_26_1.png
diff --git a/data/sprites/theopold-sprites/ebace_26_2.png b/data/sprites/theopold-sprites/ebace_26_2.png
diff --git a/data/sprites/theopold-sprites/ebace_26_3.png b/data/sprites/theopold-sprites/ebace_26_3.png
diff --git a/data/sprites/theopold-sprites/ebace_27_1.png b/data/sprites/theopold-sprites/ebace_27_1.png
diff --git a/data/sprites/theopold-sprites/ebace_27_2.png b/data/sprites/theopold-sprites/ebace_27_2.png
diff --git a/data/sprites/theopold-sprites/ebace_27_3.png b/data/sprites/theopold-sprites/ebace_27_3.png
diff --git a/data/sprites/theopold-sprites/ebace_2_1.png b/data/sprites/theopold-sprites/ebace_2_1.png
diff --git a/data/sprites/theopold-sprites/ebace_2_2.png b/data/sprites/theopold-sprites/ebace_2_2.png
diff --git a/data/sprites/theopold-sprites/ebace_2_3.png b/data/sprites/theopold-sprites/ebace_2_3.png
diff --git a/data/sprites/theopold-sprites/ebace_31_1.png b/data/sprites/theopold-sprites/ebace_31_1.png
diff --git a/data/sprites/theopold-sprites/ebace_31_2.png b/data/sprites/theopold-sprites/ebace_31_2.png
diff --git a/data/sprites/theopold-sprites/ebace_31_3.png b/data/sprites/theopold-sprites/ebace_31_3.png
diff --git a/data/sprites/theopold-sprites/ebace_3_1.png b/data/sprites/theopold-sprites/ebace_3_1.png
diff --git a/data/sprites/theopold-sprites/ebace_3_2.png b/data/sprites/theopold-sprites/ebace_3_2.png
diff --git a/data/sprites/theopold-sprites/ebace_3_3.png b/data/sprites/theopold-sprites/ebace_3_3.png
diff --git a/data/sprites/theopold-sprites/ebace_7_1.png b/data/sprites/theopold-sprites/ebace_7_1.png
diff --git a/data/sprites/theopold-sprites/ebace_7_2.png b/data/sprites/theopold-sprites/ebace_7_2.png
diff --git a/data/sprites/theopold-sprites/ebace_7_3.png b/data/sprites/theopold-sprites/ebace_7_3.png
diff --git a/data/sprites/theopold-sprites/ebace_8_1.png b/data/sprites/theopold-sprites/ebace_8_1.png
diff --git a/data/sprites/theopold-sprites/ebace_8_2.png b/data/sprites/theopold-sprites/ebace_8_2.png
diff --git a/data/sprites/theopold-sprites/ebace_8_3.png b/data/sprites/theopold-sprites/ebace_8_3.png
diff --git a/data/sprites/theopold-sprites/ebace_9_1.png b/data/sprites/theopold-sprites/ebace_9_1.png
diff --git a/data/sprites/theopold-sprites/ebace_9_2.png b/data/sprites/theopold-sprites/ebace_9_2.png
diff --git a/data/sprites/theopold-sprites/ebace_9_3.png b/data/sprites/theopold-sprites/ebace_9_3.png
diff --git a/data/sprites/theopold-sprites/sasa_0_1.png b/data/sprites/theopold-sprites/sasa_0_1.png
diff --git a/data/sprites/theopold-sprites/sasa_0_2.png b/data/sprites/theopold-sprites/sasa_0_2.png
diff --git a/data/sprites/theopold-sprites/sasa_0_3.png b/data/sprites/theopold-sprites/sasa_0_3.png
diff --git a/data/sprites/theopold-sprites/sasa_16_1.png b/data/sprites/theopold-sprites/sasa_16_1.png
diff --git a/data/sprites/theopold-sprites/sasa_16_2.png b/data/sprites/theopold-sprites/sasa_16_2.png
diff --git a/data/sprites/theopold-sprites/sasa_16_3.png b/data/sprites/theopold-sprites/sasa_16_3.png
diff --git a/data/sprites/theopold-sprites/sasa_8_1.png b/data/sprites/theopold-sprites/sasa_8_1.png
diff --git a/data/sprites/theopold-sprites/sasa_8_2.png b/data/sprites/theopold-sprites/sasa_8_2.png
diff --git a/data/sprites/theopold-sprites/sasa_8_3.png b/data/sprites/theopold-sprites/sasa_8_3.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -1372,7 +1372,7 @@ @@
             "sprite": "qiqi",
             "color": [
                 "3",
-                "3"
+                "2"
             ],
             "tiling": "2"
         },
@@ Expand Down @@