Merge pull request #184 from FofoFromBaba/main

fix problems from previous pr
ROBOT-IS-CHILL · Sep 11, 2024 · ff98896 · ff98896
2 parents ff9bf24 + aef8d18
commit ff98896
Show file tree

Hide file tree

Showing 38 changed files with 34 additions and 7 deletions.
diff --git a/data/custom/dizzyandy-sprites.json b/data/custom/dizzyandy-sprites.json
@@ -1864,7 +1864,7 @@
     },
     {
         "name": "text_that's",
-        "sprite": "text_that's",
+        "sprite": "text_thats",
         "color": [
             "1",
             "4"
@@ -1947,17 +1947,17 @@
         "name": "glyph_metanode",
         "sprite": "glyph_metanode",
         "color": [
-            "0",
-            "3"
+            "2",
+            "4"
         ],
         "tiling": "-1"
     },
     {
         "name": "glyph_metanode2",
         "sprite": "glyph_metanode2",
         "color": [
-            "0",
-            "3"
+            "2",
+            "4"
         ],
         "tiling": "-1"
     },
@@ -2014,5 +2014,14 @@
             "2"
         ],
         "tiling": "-1"
+    },
+    {
+        "name": "text_it'll",
+        "sprite": "text_it'll",
+        "color": [
+            "5",
+            "3"
+        ],
+        "tiling": "-1"
     }
 ]
diff --git a/data/custom/misc.json b/data/custom/misc.json
@@ -1802,7 +1802,7 @@
     },
     {
         "name": "text_aloneprop",
-        "sprite": "text_aloneprop",
+        "sprite": "text_alone",
         "color": [
             "2",
             "2"

diff --git a/data/custom/nodes.json b/data/custom/nodes.json
@@ -278,6 +278,15 @@
         ],
         "tiling": "0"
     },
+    {
+        "name": "node_is",
+        "sprite": "node_is",
+        "color": [
+            "0",
+            "3"
+        ],
+        "tiling": "0"
+    },
     {
         "name": "node_nil",
         "sprite": "node_nil",

diff --git a/data/custom/obj.json b/data/custom/obj.json
@@ -226,7 +226,7 @@
     },
     {
         "name": "obj_water",
-        "sprite": "obj_water",
+        "sprite": "obj_bog",
         "color": [
             "1",
             "2"

diff --git a/data/custom/wreckings-stuff.json b/data/custom/wreckings-stuff.json
@@ -628,5 +628,14 @@
             "3"
         ],
         "tiling": "-1"
+    },
+    {
+        "name": "event_glyph",
+        "sprite": "event_glyph",
+        "color": [
+            "3",
+            "2"
+        ],
+        "tiling": "-1"
     }
 ]
diff --git a/data/sprites/bab/nobaddont_0_1.png b/data/sprites/bab/nobaddont_0_1.png
diff --git a/data/sprites/bab/nobaddont_0_2.png b/data/sprites/bab/nobaddont_0_2.png
diff --git a/data/sprites/bab/nobaddont_0_3.png b/data/sprites/bab/nobaddont_0_3.png
diff --git a/data/sprites/dizzyandy-sprites/text_it'll_0_1.png b/data/sprites/dizzyandy-sprites/text_it'll_0_1.png
diff --git a/data/sprites/dizzyandy-sprites/text_it'll_0_2.png b/data/sprites/dizzyandy-sprites/text_it'll_0_2.png
diff --git a/data/sprites/dizzyandy-sprites/text_it'll_0_3.png b/data/sprites/dizzyandy-sprites/text_it'll_0_3.png
diff --git a/...sprites/extrem-sprites/text_acted_0_1.png → data/sprites/tense/text_acted_0_1.png b/...sprites/extrem-sprites/text_acted_0_1.png → data/sprites/tense/text_acted_0_1.png
diff --git a/...sprites/extrem-sprites/text_acted_0_2.png → data/sprites/tense/text_acted_0_2.png b/...sprites/extrem-sprites/text_acted_0_2.png → data/sprites/tense/text_acted_0_2.png
diff --git a/...sprites/extrem-sprites/text_acted_0_3.png → data/sprites/tense/text_acted_0_3.png b/...sprites/extrem-sprites/text_acted_0_3.png → data/sprites/tense/text_acted_0_3.png
diff --git a/.../sprites/extrem-sprites/text_drew_0_1.png → data/sprites/tense/text_drew_0_1.png b/.../sprites/extrem-sprites/text_drew_0_1.png → data/sprites/tense/text_drew_0_1.png
diff --git a/.../sprites/extrem-sprites/text_drew_0_2.png → data/sprites/tense/text_drew_0_2.png b/.../sprites/extrem-sprites/text_drew_0_2.png → data/sprites/tense/text_drew_0_2.png
diff --git a/.../sprites/extrem-sprites/text_drew_0_3.png → data/sprites/tense/text_drew_0_3.png b/.../sprites/extrem-sprites/text_drew_0_3.png → data/sprites/tense/text_drew_0_3.png
diff --git a/...prites/extrem-sprites/text_jotted_0_1.png → data/sprites/tense/text_jotted_0_1.png b/...prites/extrem-sprites/text_jotted_0_1.png → data/sprites/tense/text_jotted_0_1.png
diff --git a/...prites/extrem-sprites/text_jotted_0_2.png → data/sprites/tense/text_jotted_0_2.png b/...prites/extrem-sprites/text_jotted_0_2.png → data/sprites/tense/text_jotted_0_2.png
diff --git a/...prites/extrem-sprites/text_jotted_0_3.png → data/sprites/tense/text_jotted_0_3.png b/...prites/extrem-sprites/text_jotted_0_3.png → data/sprites/tense/text_jotted_0_3.png
diff --git a/...tes/extrem-sprites/text_performed_0_1.png → data/sprites/tense/text_performed_0_1.png b/...tes/extrem-sprites/text_performed_0_1.png → data/sprites/tense/text_performed_0_1.png
diff --git a/...tes/extrem-sprites/text_performed_0_2.png → data/sprites/tense/text_performed_0_2.png b/...tes/extrem-sprites/text_performed_0_2.png → data/sprites/tense/text_performed_0_2.png
diff --git a/...tes/extrem-sprites/text_performed_0_3.png → data/sprites/tense/text_performed_0_3.png b/...tes/extrem-sprites/text_performed_0_3.png → data/sprites/tense/text_performed_0_3.png
diff --git a/...sprites/extrem-sprites/text_typed_0_1.png → data/sprites/tense/text_typed_0_1.png b/...sprites/extrem-sprites/text_typed_0_1.png → data/sprites/tense/text_typed_0_1.png
diff --git a/...sprites/extrem-sprites/text_typed_0_2.png → data/sprites/tense/text_typed_0_2.png b/...sprites/extrem-sprites/text_typed_0_2.png → data/sprites/tense/text_typed_0_2.png
diff --git a/...sprites/extrem-sprites/text_typed_0_3.png → data/sprites/tense/text_typed_0_3.png b/...sprites/extrem-sprites/text_typed_0_3.png → data/sprites/tense/text_typed_0_3.png
diff --git a/...rites/extrem-sprites/text_willact_0_1.png → data/sprites/tense/text_willact_0_1.png b/...rites/extrem-sprites/text_willact_0_1.png → data/sprites/tense/text_willact_0_1.png
diff --git a/...rites/extrem-sprites/text_willact_0_2.png → data/sprites/tense/text_willact_0_2.png b/...rites/extrem-sprites/text_willact_0_2.png → data/sprites/tense/text_willact_0_2.png
diff --git a/...rites/extrem-sprites/text_willact_0_3.png → data/sprites/tense/text_willact_0_3.png b/...rites/extrem-sprites/text_willact_0_3.png → data/sprites/tense/text_willact_0_3.png
diff --git a/...ites/extrem-sprites/text_willdraw_0_1.png → data/sprites/tense/text_willdraw_0_1.png b/...ites/extrem-sprites/text_willdraw_0_1.png → data/sprites/tense/text_willdraw_0_1.png
diff --git a/...ites/extrem-sprites/text_willdraw_0_2.png → data/sprites/tense/text_willdraw_0_2.png b/...ites/extrem-sprites/text_willdraw_0_2.png → data/sprites/tense/text_willdraw_0_2.png
diff --git a/...ites/extrem-sprites/text_willdraw_0_3.png → data/sprites/tense/text_willdraw_0_3.png b/...ites/extrem-sprites/text_willdraw_0_3.png → data/sprites/tense/text_willdraw_0_3.png
diff --git a/data/sprites/wreckings-stuff/event_glyph_0_1.png b/data/sprites/wreckings-stuff/event_glyph_0_1.png
diff --git a/data/sprites/wreckings-stuff/event_glyph_0_2.png b/data/sprites/wreckings-stuff/event_glyph_0_2.png
diff --git a/data/sprites/wreckings-stuff/event_glyph_0_3.png b/data/sprites/wreckings-stuff/event_glyph_0_3.png
diff --git a/data/sprites/wreckings-stuff/text_metaevent_0_1.png b/data/sprites/wreckings-stuff/text_metaevent_0_1.png
diff --git a/data/sprites/wreckings-stuff/text_metaevent_0_2.png b/data/sprites/wreckings-stuff/text_metaevent_0_2.png
diff --git a/data/sprites/wreckings-stuff/text_metaevent_0_3.png b/data/sprites/wreckings-stuff/text_metaevent_0_3.png