diff --git a/data/custom/dizzyandy-sprites.json b/data/custom/dizzyandy-sprites.json index d576b7541..a62eb4265 100644 --- 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,8 +1947,8 @@ "name": "glyph_metanode", "sprite": "glyph_metanode", "color": [ - "0", - "3" + "2", + "4" ], "tiling": "-1" }, @@ -1956,8 +1956,8 @@ "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 index 8801f8912..0a4fec9e1 100644 --- 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 index 550702a2f..238d6bfa8 100644 --- 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 index 1e8b387b8..01cc0dae6 100644 --- 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 index b9b023e46..2762b1d07 100644 --- 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 index 87d7793c7..ba1379bbf 100644 Binary files a/data/sprites/bab/nobaddont_0_1.png and b/data/sprites/bab/nobaddont_0_1.png differ diff --git a/data/sprites/bab/nobaddont_0_2.png b/data/sprites/bab/nobaddont_0_2.png index 13465ca8e..ba1379bbf 100644 Binary files a/data/sprites/bab/nobaddont_0_2.png and b/data/sprites/bab/nobaddont_0_2.png differ diff --git a/data/sprites/bab/nobaddont_0_3.png b/data/sprites/bab/nobaddont_0_3.png index 13465ca8e..ba1379bbf 100644 Binary files a/data/sprites/bab/nobaddont_0_3.png and b/data/sprites/bab/nobaddont_0_3.png differ diff --git a/data/sprites/dizzyandy-sprites/text_it'll_0_1.png b/data/sprites/dizzyandy-sprites/text_it'll_0_1.png new file mode 100644 index 000000000..b6c868a87 Binary files /dev/null and b/data/sprites/dizzyandy-sprites/text_it'll_0_1.png differ diff --git a/data/sprites/dizzyandy-sprites/text_it'll_0_2.png b/data/sprites/dizzyandy-sprites/text_it'll_0_2.png new file mode 100644 index 000000000..e55c292c6 Binary files /dev/null and b/data/sprites/dizzyandy-sprites/text_it'll_0_2.png differ diff --git a/data/sprites/dizzyandy-sprites/text_it'll_0_3.png b/data/sprites/dizzyandy-sprites/text_it'll_0_3.png new file mode 100644 index 000000000..63436ac19 Binary files /dev/null and b/data/sprites/dizzyandy-sprites/text_it'll_0_3.png differ diff --git a/data/sprites/extrem-sprites/text_acted_0_1.png b/data/sprites/tense/text_acted_0_1.png similarity index 100% rename from data/sprites/extrem-sprites/text_acted_0_1.png rename to data/sprites/tense/text_acted_0_1.png diff --git a/data/sprites/extrem-sprites/text_acted_0_2.png b/data/sprites/tense/text_acted_0_2.png similarity index 100% rename from data/sprites/extrem-sprites/text_acted_0_2.png rename to data/sprites/tense/text_acted_0_2.png diff --git a/data/sprites/extrem-sprites/text_acted_0_3.png b/data/sprites/tense/text_acted_0_3.png similarity index 100% rename from data/sprites/extrem-sprites/text_acted_0_3.png rename to data/sprites/tense/text_acted_0_3.png diff --git a/data/sprites/extrem-sprites/text_drew_0_1.png b/data/sprites/tense/text_drew_0_1.png similarity index 100% rename from data/sprites/extrem-sprites/text_drew_0_1.png rename to data/sprites/tense/text_drew_0_1.png diff --git a/data/sprites/extrem-sprites/text_drew_0_2.png b/data/sprites/tense/text_drew_0_2.png similarity index 100% rename from data/sprites/extrem-sprites/text_drew_0_2.png rename to data/sprites/tense/text_drew_0_2.png diff --git a/data/sprites/extrem-sprites/text_drew_0_3.png b/data/sprites/tense/text_drew_0_3.png similarity index 100% rename from data/sprites/extrem-sprites/text_drew_0_3.png rename to data/sprites/tense/text_drew_0_3.png diff --git a/data/sprites/extrem-sprites/text_jotted_0_1.png b/data/sprites/tense/text_jotted_0_1.png similarity index 100% rename from data/sprites/extrem-sprites/text_jotted_0_1.png rename to data/sprites/tense/text_jotted_0_1.png diff --git a/data/sprites/extrem-sprites/text_jotted_0_2.png b/data/sprites/tense/text_jotted_0_2.png similarity index 100% rename from data/sprites/extrem-sprites/text_jotted_0_2.png rename to data/sprites/tense/text_jotted_0_2.png diff --git a/data/sprites/extrem-sprites/text_jotted_0_3.png b/data/sprites/tense/text_jotted_0_3.png similarity index 100% rename from data/sprites/extrem-sprites/text_jotted_0_3.png rename to data/sprites/tense/text_jotted_0_3.png diff --git a/data/sprites/extrem-sprites/text_performed_0_1.png b/data/sprites/tense/text_performed_0_1.png similarity index 100% rename from data/sprites/extrem-sprites/text_performed_0_1.png rename to data/sprites/tense/text_performed_0_1.png diff --git a/data/sprites/extrem-sprites/text_performed_0_2.png b/data/sprites/tense/text_performed_0_2.png similarity index 100% rename from data/sprites/extrem-sprites/text_performed_0_2.png rename to data/sprites/tense/text_performed_0_2.png diff --git a/data/sprites/extrem-sprites/text_performed_0_3.png b/data/sprites/tense/text_performed_0_3.png similarity index 100% rename from data/sprites/extrem-sprites/text_performed_0_3.png rename to data/sprites/tense/text_performed_0_3.png diff --git a/data/sprites/extrem-sprites/text_typed_0_1.png b/data/sprites/tense/text_typed_0_1.png similarity index 100% rename from data/sprites/extrem-sprites/text_typed_0_1.png rename to data/sprites/tense/text_typed_0_1.png diff --git a/data/sprites/extrem-sprites/text_typed_0_2.png b/data/sprites/tense/text_typed_0_2.png similarity index 100% rename from data/sprites/extrem-sprites/text_typed_0_2.png rename to data/sprites/tense/text_typed_0_2.png diff --git a/data/sprites/extrem-sprites/text_typed_0_3.png b/data/sprites/tense/text_typed_0_3.png similarity index 100% rename from data/sprites/extrem-sprites/text_typed_0_3.png rename to data/sprites/tense/text_typed_0_3.png diff --git a/data/sprites/extrem-sprites/text_willact_0_1.png b/data/sprites/tense/text_willact_0_1.png similarity index 100% rename from data/sprites/extrem-sprites/text_willact_0_1.png rename to data/sprites/tense/text_willact_0_1.png diff --git a/data/sprites/extrem-sprites/text_willact_0_2.png b/data/sprites/tense/text_willact_0_2.png similarity index 100% rename from data/sprites/extrem-sprites/text_willact_0_2.png rename to data/sprites/tense/text_willact_0_2.png diff --git a/data/sprites/extrem-sprites/text_willact_0_3.png b/data/sprites/tense/text_willact_0_3.png similarity index 100% rename from data/sprites/extrem-sprites/text_willact_0_3.png rename to data/sprites/tense/text_willact_0_3.png diff --git a/data/sprites/extrem-sprites/text_willdraw_0_1.png b/data/sprites/tense/text_willdraw_0_1.png similarity index 100% rename from data/sprites/extrem-sprites/text_willdraw_0_1.png rename to data/sprites/tense/text_willdraw_0_1.png diff --git a/data/sprites/extrem-sprites/text_willdraw_0_2.png b/data/sprites/tense/text_willdraw_0_2.png similarity index 100% rename from data/sprites/extrem-sprites/text_willdraw_0_2.png rename to data/sprites/tense/text_willdraw_0_2.png diff --git a/data/sprites/extrem-sprites/text_willdraw_0_3.png b/data/sprites/tense/text_willdraw_0_3.png similarity index 100% rename from data/sprites/extrem-sprites/text_willdraw_0_3.png rename to 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 new file mode 100644 index 000000000..43675d00e Binary files /dev/null and b/data/sprites/wreckings-stuff/event_glyph_0_1.png differ diff --git a/data/sprites/wreckings-stuff/event_glyph_0_2.png b/data/sprites/wreckings-stuff/event_glyph_0_2.png new file mode 100644 index 000000000..d3efbef7a Binary files /dev/null and b/data/sprites/wreckings-stuff/event_glyph_0_2.png differ diff --git a/data/sprites/wreckings-stuff/event_glyph_0_3.png b/data/sprites/wreckings-stuff/event_glyph_0_3.png new file mode 100644 index 000000000..7e6c6b423 Binary files /dev/null and b/data/sprites/wreckings-stuff/event_glyph_0_3.png differ diff --git a/data/sprites/wreckings-stuff/text_metaevent_0_1.png b/data/sprites/wreckings-stuff/text_metaevent_0_1.png new file mode 100644 index 000000000..55f0b3546 Binary files /dev/null and b/data/sprites/wreckings-stuff/text_metaevent_0_1.png differ diff --git a/data/sprites/wreckings-stuff/text_metaevent_0_2.png b/data/sprites/wreckings-stuff/text_metaevent_0_2.png new file mode 100644 index 000000000..b7aef1170 Binary files /dev/null and b/data/sprites/wreckings-stuff/text_metaevent_0_2.png differ diff --git a/data/sprites/wreckings-stuff/text_metaevent_0_3.png b/data/sprites/wreckings-stuff/text_metaevent_0_3.png new file mode 100644 index 000000000..c02645862 Binary files /dev/null and b/data/sprites/wreckings-stuff/text_metaevent_0_3.png differ