46 changed files with 39 additions and 783 deletions
--- a/flames/eastern
+++ b/flames/eastern
@ -24,9 +24,7 @@
    {"id":{"name":"rescale","path":"scripts/rescale/rescale.yy",},"order":16,},
    {"id":{"name":"draw_settings","path":"scripts/draw_settings/draw_settings.yy",},"order":3,},
    {"id":{"name":"draw_circle_curve","path":"scripts/draw_circle_curve/draw_circle_curve.yy",},"order":2,},
-    {"id":{"name":"s_momijidown","path":"sprites/s_momijidown/s_momijidown.yy",},"order":2,},
    {"id":{"name":"o_unit","path":"objects/o_unit/o_unit.yy",},"order":2,},
-    {"id":{"name":"combat","path":"scripts/combat/combat.yy",},"order":13,},
    {"id":{"name":"mod_negative","path":"scripts/mod_negative/mod_negative.yy",},"order":11,},
    {"id":{"name":"draw_circle_width","path":"scripts/draw_circle_width/draw_circle_width.yy",},"order":3,},
    {"id":{"name":"gcd","path":"scripts/gcd/gcd.yy",},"order":5,},
@ -41,11 +39,9 @@
    {"id":{"name":"function_append","path":"scripts/function_append/function_append.yy",},"order":13,},
    {"id":{"name":"string_contains","path":"scripts/string_contains/string_contains.yy",},"order":17,},
    {"id":{"name":"is_prime","path":"scripts/is_prime/is_prime.yy",},"order":14,},
-    {"id":{"name":"weapon","path":"scripts/weapon/weapon.yy",},"order":15,},
    {"id":{"name":"KROMER_scrip","path":"scripts/KROMER_scrip/KROMER_scrip.yy",},"order":0,},
    {"id":{"name":"is_oob","path":"scripts/is_oob/is_oob.yy",},"order":7,},
    {"id":{"name":"linear_approach","path":"scripts/linear_approach/linear_approach.yy",},"order":18,},
-    {"id":{"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},"order":1,},
    {"id":{"name":"array_contains","path":"scripts/array_contains/array_contains.yy",},"order":0,},
    {"id":{"name":"song","path":"scripts/song/song.yy",},"order":1,},
    {"id":{"name":"cpp","path":"scripts/cpp/cpp.yy",},"order":1,},
@ -54,7 +50,6 @@
    {"id":{"name":"collision_line_width","path":"scripts/collision_line_width/collision_line_width.yy",},"order":9,},
    {"id":{"name":"draw_rectangle_width","path":"scripts/draw_rectangle_width/draw_rectangle_width.yy",},"order":7,},
    {"id":{"name":"s_guy2","path":"sprites/s_guy2/s_guy2.yy",},"order":1,},
-    {"id":{"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},"order":0,},
    {"id":{"name":"dir2hv","path":"scripts/dir2hv/dir2hv.yy",},"order":2,},
    {"id":{"name":"tag","path":"scripts/tag/tag.yy",},"order":6,},
    {"id":{"name":"instance_create","path":"scripts/instance_create/instance_create.yy",},"order":6,},
@ -73,11 +68,9 @@
    {"id":{"name":"draw_outline","path":"scripts/draw_outline/draw_outline.yy",},"order":5,},
    {"id":{"name":"distabs","path":"scripts/distabs/distabs.yy",},"order":11,},
    {"id":{"name":"nam","path":"scripts/nam/nam.yy",},"order":13,},
-    {"id":{"name":"c_resetbattlevar","path":"scripts/c_resetbattlevar/c_resetbattlevar.yy",},"order":14,},
    {"id":{"name":"array_find_index","path":"scripts/array_find_index/array_find_index.yy",},"order":1,},
    {"id":{"name":"array_greatest","path":"scripts/array_greatest/array_greatest.yy",},"order":4,},
    {"id":{"name":"c_null","path":"scripts/c_null/c_null.yy",},"order":4,},
-    {"id":{"name":"array_contains_within","path":"scripts/array_contains_within/array_contains_within.yy",},"order":19,},
    {"id":{"name":"st_moving","path":"scripts/st_moving/st_moving.yy",},"order":7,},
    {"id":{"name":"Room1","path":"rooms/Room1/Room1.yy",},"order":0,},
  ],
@ -115,7 +108,6 @@
    {"folderPath":"folders/Scripts/util/drawing.yy","order":3,"resourceVersion":"1.0","name":"drawing","tags":[],"resourceType":"GMFolder",},
    {"folderPath":"folders/Scripts/util/drawing/vlambeer.yy","order":1,"resourceVersion":"1.0","name":"vlambeer","tags":[],"resourceType":"GMFolder",},
    {"folderPath":"folders/Scripts/util.yy","order":1,"resourceVersion":"1.0","name":"util","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Sprites/momiji.yy","order":2,"resourceVersion":"1.0","name":"momiji","tags":[],"resourceType":"GMFolder",},
  ],
  "AudioGroups": [
    {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",},
--- a/flames/objects/ARTICULATOR/Create_0.gml
+++ b/flames/objects/ARTICULATOR/Create_0.gml
@ -1,8 +1,5 @@
 c_addunit(un.chara, ARMY.US);
 var i;
-/*for (i=0; i<array_length(global.units[ARMY.US]); i++) {
+for (i=0; i<array_length(global.units[ARMY.US]); i++) {
 	c_inheritunit(2+i, 2, un.chara);
-}*/
-c_inheritunit(2, 2, un.chara);
-c_inheritunit(3, 2, un.kris);
-selectedunit = noone;
+}
--- a/flames/objects/ARTICULATOR/Step_0.gml
+++ b/flames/objects/ARTICULATOR/Step_0.gml
@ -1,5 +1,5 @@
 c_input();
-if select  && selectedunit == noone {
+if select {
 	var mousex = floor(mouse_x/global.tilesize.x);
 	var mousey = floor(mouse_y/global.tilesize.y);
 	log(mousex, mousey);
--- a/flames/objects/o_unit/Create_0.gml
+++ b/flames/objects/o_unit/Create_0.gml
@ -6,25 +6,3 @@ hspd = 0;
 vspd = 0;
 returnpos = new vec2(0, 0);
 dir = DIR.NONE;
-attacks = 0;
-attacked = 0;
-
-continuecombat = function(me, them) {
-	//if stamina returnable = true stamina-- return true
-	if !(attacks-(me.data.spd.val > them.data.spd.val+5)) { //DONT USE FIVE, OR ANY OF THIS
-		attacks++;
-		return true;
-	}
-	return false;
-}
-
-action = {
-	effect: function(me, them) {
-		them.data.hp.val -= me.data.str.val;
-		return me.data.str.val;
-	}
-	//animation: new actionanim()
-	
-}
-image_speed = .15;
-hooks = {};
--- a/flames/objects/o_unit/Draw_0.gml
+++ b/flames/objects/o_unit/Draw_0.gml
@ -1,11 +1,10 @@
 draw_self();
 drawstate();
-//log(data);
+log(data);
 draw_set_color(c_red);
 draw_rectangle(x-ts.x/2, y-ts.y/2-1,
-	x-ts.x/2+(ts.x*(data.hp.val/data.hp.cap)),
+	x-ts.x/2+(ts.x*(data.hp.val/data.hp.val)),
 	y-ts.y/2+1, false
 );
-draw_text(x, y-ts.y, data.hp.val);
 //draw_set_color(c_red);
 //draw_circle(x, y, 5, false);
--- a/flames/scripts/array_contains_within/array_contains.yy
+++ b/flames/scripts/array_contains_within/array_contains.yy
@ -1,12 +0,0 @@
-{
-  "isDnD": false,
-  "isCompatibility": false,
-  "parent": {
-    "name": "data",
-    "path": "folders/Scripts/util/data.yy",
-  },
-  "resourceVersion": "1.0",
-  "name": "array_contains",
-  "tags": [],
-  "resourceType": "GMScript",
-}
--- a/flames/scripts/array_contains_within/array_contains_within.gml
+++ b/flames/scripts/array_contains_within/array_contains_within.gml
@ -1,12 +0,0 @@
-function array_contains_within(array, val) {
-	var i, j;
-	for (i=0; i<array_length(array); i++) {
-		if typeof(array[i]) == "struct" {
-			var dudes = variable_struct_get_names(array[i]);
-			for (j=0; j<array_length(dudes); j++) {
-				if array[i][$dudes[j]] == val return true;
-			}
-		}
-	}
-	return false;
-}
--- a/flames/scripts/array_contains_within/array_contains_within.yy
+++ b/flames/scripts/array_contains_within/array_contains_within.yy
@ -1,12 +0,0 @@
-{
-  "isDnD": false,
-  "isCompatibility": false,
-  "parent": {
-    "name": "data",
-    "path": "folders/Scripts/util/data.yy",
-  },
-  "resourceVersion": "1.0",
-  "name": "array_contains_within",
-  "tags": [],
-  "resourceType": "GMScript",
-}
--- a/flames/scripts/c_gettile/c_gettile.gml
+++ b/flames/scripts/c_gettile/c_gettile.gml
@ -1,11 +1,6 @@
 function c_gettile(x, y, absolute=false) {
-	if absolute {
-		var thex = round((x-16)/ts.x);
-		var they = round((y-16)/ts.y);
-	} else {
-		var thex = x;
-		var they = y;
-	}
+	var thex = round((x-16)/ts.x);
+	var they = round((y-16)/ts.y);
 	if c_tileexists(thex, they) return mp[thex][they];
 	return noone;
 }
--- a/flames/scripts/c_inheritunit/c_inheritunit.gml
+++ b/flames/scripts/c_inheritunit/c_inheritunit.gml
@ -3,7 +3,7 @@ function c_inheritunit(x, y, unit_) {
 	chump.data = unit_;
 	chump.pos.x = x;
 	chump.pos.y = y;
-	chump.sprite_index = unit_.idle;
+	chump.sprite_index = unit_.sprite;
 	array_push(global.map[x][y].contents, chump);
 	return chump;
 }
--- a/flames/scripts/c_resetbattlevar/c_resetbattlevar.gml
+++ b/flames/scripts/c_resetbattlevar/c_resetbattlevar.gml
@ -1,6 +0,0 @@
-function c_resetbattlevar(target=id) {
-	with target {
-		attacks = 0;
-		attacked = 0;
-	}
-}
--- a/flames/scripts/c_resetbattlevar/c_resetbattlevar.yy
+++ b/flames/scripts/c_resetbattlevar/c_resetbattlevar.yy
@ -1,12 +0,0 @@
-{
-  "isDnD": false,
-  "isCompatibility": false,
-  "parent": {
-    "name": "Scripts",
-    "path": "folders/Scripts.yy",
-  },
-  "resourceVersion": "1.0",
-  "name": "c_resetbattlevar",
-  "tags": [],
-  "resourceType": "GMScript",
-}
--- a/flames/scripts/c_selectunit/c_selectunit.gml
+++ b/flames/scripts/c_selectunit/c_selectunit.gml
@ -11,19 +11,6 @@ function c_selectunit(unitobject) {
 			}
 		}
 	}
-	ARTICULATOR.selectedunit = unitobject;
-}
-
-function c_deselectunit(unitobject) {
-	if ARTICULATOR.selectedunit != unitobject return false
-	unitobject.sprite_index = unitobject.data.idle;
-	state = st_standing;
-	drawstate = c_null;
-	c_decolor_all(c_cyan);
-	c_decolor_all(c_red);
-	c_decolor_all(c_green);
-	ARTICULATOR.selectedunit = noone;
-	return true;
 }

 function c_colortile(x, y, color) {
--- a/flames/scripts/combat/combat.gml
+++ b/flames/scripts/combat/combat.gml
@ -1,53 +0,0 @@
-function c_generatecombatstack(combatants=[]) {
-	log(combatants);
-	//c_doallhook(hooks.precombat);
-	for (i=0; i<array_length(combatants); i++) {
-		c_resetbattlevar(combatants[i]);
-	}
-	//while combatants != [] {
-		log("whiling");
-		var i=0;
-		for (i=0; i<array_length(combatants); i++) {
-			//c_dodualhook(combatants[i], preaction);
-			tryaction(combatants[i], combatants[(i+1)%array_length(combatants)]);
-			//c_dodualhook(combatants[i], postaction);
-		}
-	//}
-	for (i=0; i<array_length(combatants); i++) {
-		c_resetbattlevar(combatants[i]);
-	}
-}
-
-function c_recordaction(action) {
-	log(action);
-}
-
-function c_dodualhook(host, hook) {
-	
-}
-function c_doallhook(hook) {
-	
-}
-
-
-function tryaction(me, them) {
-	//c_dodualhook(hooks.onstaminacheck);
-	while me.continuecombat(me, them) {
-		//action = defaultaction;
-		//c_dodualhook(hooks.prehit);
-		c_recordaction(me.action.effect(me, them));
-		//c_dodualhook(hooks.posthit);
-	}
-}
-
-/*action {
-	effect: function() {
-		
-	}
-	animation: new actionanim()
-	
-}*/
-
-function insertaction(action, interruptable) {
-	
-}
--- a/flames/scripts/combat/combat.yy
+++ b/flames/scripts/combat/combat.yy
@ -1,12 +0,0 @@
-{
-  "isDnD": false,
-  "isCompatibility": false,
-  "parent": {
-    "name": "Scripts",
-    "path": "folders/Scripts.yy",
-  },
-  "resourceVersion": "1.0",
-  "name": "combat",
-  "tags": [],
-  "resourceType": "GMScript",
-}
--- a/flames/scripts/st_moving/st_moving.gml
+++ b/flames/scripts/st_moving/st_moving.gml
@ -42,59 +42,48 @@ function st_moving() {
 	c_decolor_all(c_red);
 	c_decolor_all(c_green);
 	var guy = c_gettile(x, y, true);
-	c_colortile(guy.x, guy.y, c_green);
-	//log("selecting");
-	//var rng = [1];
-	var guy = c_gettile(x, y, true);
-	var hitting = noone;
 	if guy != noone {
+		c_colortile(guy.x, guy.y, c_green);
+		switch dir {
+			case DIR.LEFT:
+				c_colortile(guy.x-1, guy.y, c_red);
+				break;
+			case DIR.DOWN:
+				c_colortile(guy.x, guy.y+1, c_red);
+				break;
+			case DIR.UP:
+				c_colortile(guy.x, guy.y-1, c_red);
+				break;
+			case DIR.RIGHT:
+				c_colortile(guy.x+1, guy.y, c_red);
+				break;
+		}
+	}
+	if select {
+		var rng = [1];
+		var guy = c_gettile(x, y, true);
+		var hitting = noone;
 		switch dir {
 			case DIR.LEFT:
 				hitting = c_gettile(guy.x-1, guy.y);
-				c_colortile(guy.x-1, guy.y, c_red);
-				sprite_index = data.down;
-				image_xscale = -1;
 				break;
 			case DIR.DOWN:
 				hitting = c_gettile(guy.x, guy.y+1);
-				c_colortile(guy.x, guy.y+1, c_red);
-				sprite_index = data.down;
 				break;
 			case DIR.UP:
 				hitting = c_gettile(guy.x, guy.y-1);
-				c_colortile(guy.x, guy.y-1, c_red);
-				sprite_index = data.up;
 				break;
 			case DIR.RIGHT:
 				hitting = c_gettile(guy.x+1, guy.y);
-				c_colortile(guy.x+1, guy.y, c_red);
-				sprite_index = data.down;
-				image_xscale = 1;
 				break;
-			default:
-				sprite_index = data.idle;
-				image_xscale = -1;
-				break;
-				
 		}
-		if hitting != noone && select {
-			log("found one");
-			log(hitting.contents, hitting.x, hitting.y);
-			var i;
-			for (i=0; i<array_length(hitting.contents); i++) {
-				if instance_exists(hitting.contents[i]) {
-					log("is instance");
-					if hitting.contents[i].object_index = o_unit {
-						log("is unit");
-						log("found two");
-						c_generatecombatstack([id, hitting.contents[i]]);
-					}
-				}
-			}
+		if hitting != noone {
+			
 		}
 	}
 	if back {
-		c_deselectunit(id);
+		state = st_standing;
+		drawstate = c_null;
 	}
 	/*if x < (pos.x-mov)*ts.x {
 		x = (pos.x-mov)*ts.x;
--- a/flames/scripts/stat/stat.gml
+++ b/flames/scripts/stat/stat.gml
@ -14,11 +14,9 @@ function stat(name_, fullname_, desc_, replacements_=[]) constructor {

 function unitstat(val_, name_, fullname_, desc_, replacements_) : stat(name_, fullname_, desc_, replacements_) constructor {
 	val = val_;
-	cap = val_;
 	modifier = 0;
 }

 nu stat("hp", "health", "vitality");
 nu stat("str", "strength", "physical power");
 nu stat("def", "defense", "physical defense");
-nu stat("spd", "speed", "avoid and follow-up");
--- a/flames/scripts/unit/unit.gml
+++ b/flames/scripts/unit/unit.gml
@ -11,16 +11,12 @@ var mydata = {
 	name: "chara",
 	desc: "the first fallen human",
 	skills: ["SKILLS.LUNA"],
-	idle: s_momiji,
-	up: s_momijiup,
-	down: s_momijidown,
+	sprite: s_guy,
 }

 function unit(personaldata_, classdata_, stats_) constructor {
 	name = personaldata_.name;
-	idle = personaldata_.idle;
-	up = personaldata_.up;
-	down = personaldata_.down;
+	sprite = personaldata_.sprite;
 	alignment = noone;
 	var i;
 	for (i=0; i<array_length(stats_); i++) {
@ -29,17 +25,15 @@ function unit(personaldata_, classdata_, stats_) constructor {
 	global.unitdata[$name] = self;
 }

-nu unit(mydata, mydata, [st.hp.add(92), st.str.add(20), st.def.add(20), st.spd.add(5)]);
+nu unit(mydata, mydata, [st.hp.add(92), st.str.add(20), st.def.add(20)]);

 mydata = {
 	name: "kris",
 	desc: "totally kris",
 	skills: ["SKILLS.LUNA"],
-	idle: s_guy2,
-	up: s_guy2,
-	down: s_guy2,
+	sprite: s_guy2,
 }
-nu unit(mydata, mydata, [st.hp.add(92), st.str.add(20), st.def.add(20), st.spd.add(5)]);
+nu unit(mydata, mydata, [st.hp.add(92), st.str.add(20), st.def.add(20)]);

 function archetypedata() constructor {
 	//PERSONALDATA AND CLASSDATA ARE THE SAME THINGS
--- a/flames/scripts/weapon/weapon.gml
+++ b/flames/scripts/weapon/weapon.gml
@ -1,28 +0,0 @@
-global.weapons = {};
-#macro wp global.weapons
-function weapon(name_, description_, statmod_) constructor {
-	name = name_;
-	description = description_;
-	statmod = statmod_;
-}
-
-function c_addweapon(target, weapon_) {
-	array_push(target.inventory, deep_copy(weapon_));
-}
-
-function c_modifierreset(target) {
-	var dudes = variable_struct_get_names(target.data);
-	var lads = variable_struct_get_names(st);
-	var i;
-	for (i=0; i<array_length(dudes); i++) {
-		while !array_contains(lads, dudes[i]) || dudes[i] == "hp" {
-			array_delete(dudes, i, 1);
-		}
-		if i > array_length(dudes) break;
-		target.data[$dudes[i]].val = target.data[$dudes[i]].cap;
-	}
-}
-
-function c_wpeval(target, weapon_) {
-	
-}
--- a/flames/scripts/weapon/weapon.yy
+++ b/flames/scripts/weapon/weapon.yy
@ -1,12 +0,0 @@
-{
-  "isDnD": false,
-  "isCompatibility": false,
-  "parent": {
-    "name": "Scripts",
-    "path": "folders/Scripts.yy",
-  },
-  "resourceVersion": "1.0",
-  "name": "weapon",
-  "tags": [],
-  "resourceType": "GMScript",
-}
--- a/flames/sprites/s_momiji/96854095-3af2-40f3-bb14-8257505a363e.png
+++ b/flames/sprites/s_momiji/96854095-3af2-40f3-bb14-8257505a363e.png
--- a/flames/sprites/s_momiji/b9a29115-ef15-4975-b027-1a638e5f1b0d.png
+++ b/flames/sprites/s_momiji/b9a29115-ef15-4975-b027-1a638e5f1b0d.png
--- a/flames/sprites/s_momiji/layers/96854095-3af2-40f3-bb14-8257505a363e/206909f4-e032-4b53-8fd6-af98eddb6d84.png
+++ b/flames/sprites/s_momiji/layers/96854095-3af2-40f3-bb14-8257505a363e/206909f4-e032-4b53-8fd6-af98eddb6d84.png
--- a/flames/sprites/s_momiji/layers/b9a29115-ef15-4975-b027-1a638e5f1b0d/206909f4-e032-4b53-8fd6-af98eddb6d84.png
+++ b/flames/sprites/s_momiji/layers/b9a29115-ef15-4975-b027-1a638e5f1b0d/206909f4-e032-4b53-8fd6-af98eddb6d84.png
--- a/flames/sprites/s_momiji/s_momiji.yy
+++ b/flames/sprites/s_momiji/s_momiji.yy
@ -1,83 +0,0 @@
-{
-  "bboxMode": 0,
-  "collisionKind": 0,
-  "type": 0,
-  "origin": 4,
-  "preMultiplyAlpha": false,
-  "edgeFiltering": false,
-  "collisionTolerance": 0,
-  "swfPrecision": 2.525,
-  "bbox_left": 7,
-  "bbox_right": 28,
-  "bbox_top": 2,
-  "bbox_bottom": 26,
-  "HTile": false,
-  "VTile": false,
-  "For3D": false,
-  "width": 32,
-  "height": 32,
-  "textureGroupId": {
-    "name": "Default",
-    "path": "texturegroups/Default",
-  },
-  "swatchColours": null,
-  "gridX": 0,
-  "gridY": 0,
-  "frames": [
-    {"compositeImage":{"FrameId":{"name":"b9a29115-ef15-4975-b027-1a638e5f1b0d","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"b9a29115-ef15-4975-b027-1a638e5f1b0d","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":{"name":"206909f4-e032-4b53-8fd6-af98eddb6d84","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"b9a29115-ef15-4975-b027-1a638e5f1b0d","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"96854095-3af2-40f3-bb14-8257505a363e","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"96854095-3af2-40f3-bb14-8257505a363e","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":{"name":"206909f4-e032-4b53-8fd6-af98eddb6d84","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"96854095-3af2-40f3-bb14-8257505a363e","tags":[],"resourceType":"GMSpriteFrame",},
-  ],
-  "sequence": {
-    "spriteId": {"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},
-    "timeUnits": 1,
-    "playback": 1,
-    "playbackSpeed": 30.0,
-    "playbackSpeedType": 0,
-    "autoRecord": true,
-    "volume": 1.0,
-    "length": 2.0,
-    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
-    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
-    "tracks": [
-      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"3699254c-8f34-4b4c-8f1f-f83ca5fb1e8b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b9a29115-ef15-4975-b027-1a638e5f1b0d","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"cea265df-adad-478a-b603-7c22616eba11","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"96854095-3af2-40f3-bb14-8257505a363e","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-          ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
-    ],
-    "visibleRange": null,
-    "lockOrigin": false,
-    "showBackdrop": true,
-    "showBackdropImage": false,
-    "backdropImagePath": "",
-    "backdropImageOpacity": 0.5,
-    "backdropWidth": 1366,
-    "backdropHeight": 768,
-    "backdropXOffset": 0.0,
-    "backdropYOffset": 0.0,
-    "xorigin": 16,
-    "yorigin": 16,
-    "eventToFunction": {},
-    "eventStubScript": null,
-    "parent": {"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},
-    "resourceVersion": "1.3",
-    "name": "s_momiji",
-    "tags": [],
-    "resourceType": "GMSequence",
-  },
-  "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"206909f4-e032-4b53-8fd6-af98eddb6d84","tags":[],"resourceType":"GMImageLayer",},
-  ],
-  "nineSlice": null,
-  "parent": {
-    "name": "momiji",
-    "path": "folders/Sprites/momiji.yy",
-  },
-  "resourceVersion": "1.0",
-  "name": "s_momiji",
-  "tags": [],
-  "resourceType": "GMSprite",
-}
--- a/flames/sprites/s_momijidown/000a317a-54a0-4d5e-b29c-74e7f9c68cb4.png
+++ b/flames/sprites/s_momijidown/000a317a-54a0-4d5e-b29c-74e7f9c68cb4.png
--- a/flames/sprites/s_momijidown/46e6ae5d-cdca-4eb8-af9b-623343b88a71.png
+++ b/flames/sprites/s_momijidown/46e6ae5d-cdca-4eb8-af9b-623343b88a71.png
--- a/flames/sprites/s_momijidown/4de403df-21bc-4cf7-8852-238d4a179b8c.png
+++ b/flames/sprites/s_momijidown/4de403df-21bc-4cf7-8852-238d4a179b8c.png
--- a/flames/sprites/s_momijidown/cb908577-194c-465c-b818-976df07019cc.png
+++ b/flames/sprites/s_momijidown/cb908577-194c-465c-b818-976df07019cc.png
--- a/flames/sprites/s_momijidown/layers/000a317a-54a0-4d5e-b29c-74e7f9c68cb4/a9e54b69-cd1b-40ec-862e-7cf86d40dc21.png
+++ b/flames/sprites/s_momijidown/layers/000a317a-54a0-4d5e-b29c-74e7f9c68cb4/a9e54b69-cd1b-40ec-862e-7cf86d40dc21.png
--- a/flames/sprites/s_momijidown/layers/46e6ae5d-cdca-4eb8-af9b-623343b88a71/a9e54b69-cd1b-40ec-862e-7cf86d40dc21.png
+++ b/flames/sprites/s_momijidown/layers/46e6ae5d-cdca-4eb8-af9b-623343b88a71/a9e54b69-cd1b-40ec-862e-7cf86d40dc21.png
--- a/flames/sprites/s_momijidown/layers/4de403df-21bc-4cf7-8852-238d4a179b8c/a9e54b69-cd1b-40ec-862e-7cf86d40dc21.png
+++ b/flames/sprites/s_momijidown/layers/4de403df-21bc-4cf7-8852-238d4a179b8c/a9e54b69-cd1b-40ec-862e-7cf86d40dc21.png
--- a/flames/sprites/s_momijidown/layers/cb908577-194c-465c-b818-976df07019cc/a9e54b69-cd1b-40ec-862e-7cf86d40dc21.png
+++ b/flames/sprites/s_momijidown/layers/cb908577-194c-465c-b818-976df07019cc/a9e54b69-cd1b-40ec-862e-7cf86d40dc21.png
--- a/flames/sprites/s_momijidown/s_momiji.yy
+++ b/flames/sprites/s_momijidown/s_momiji.yy
@ -1,83 +0,0 @@
-{
-  "bboxMode": 0,
-  "collisionKind": 0,
-  "type": 0,
-  "origin": 4,
-  "preMultiplyAlpha": false,
-  "edgeFiltering": false,
-  "collisionTolerance": 0,
-  "swfPrecision": 2.525,
-  "bbox_left": 3,
-  "bbox_right": 24,
-  "bbox_top": 2,
-  "bbox_bottom": 26,
-  "HTile": false,
-  "VTile": false,
-  "For3D": false,
-  "width": 32,
-  "height": 32,
-  "textureGroupId": {
-    "name": "Default",
-    "path": "texturegroups/Default",
-  },
-  "swatchColours": null,
-  "gridX": 0,
-  "gridY": 0,
-  "frames": [
-    {"compositeImage":{"FrameId":{"name":"99275dfc-aa96-4110-8106-19fea8895cad","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"99275dfc-aa96-4110-8106-19fea8895cad","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":{"name":"eab58ea9-e679-4640-b6b5-ea239690dbda","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"99275dfc-aa96-4110-8106-19fea8895cad","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"dec35a3a-745e-46b0-b2d4-008bad759688","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"dec35a3a-745e-46b0-b2d4-008bad759688","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":{"name":"eab58ea9-e679-4640-b6b5-ea239690dbda","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"dec35a3a-745e-46b0-b2d4-008bad759688","tags":[],"resourceType":"GMSpriteFrame",},
-  ],
-  "sequence": {
-    "spriteId": {"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},
-    "timeUnits": 1,
-    "playback": 1,
-    "playbackSpeed": 30.0,
-    "playbackSpeedType": 0,
-    "autoRecord": true,
-    "volume": 1.0,
-    "length": 2.0,
-    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
-    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
-    "tracks": [
-      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"8fa931f9-f257-476b-9cec-ab9877a4c804","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"99275dfc-aa96-4110-8106-19fea8895cad","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"a8ac96c1-1850-4cb8-a8b0-d47664a4e674","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dec35a3a-745e-46b0-b2d4-008bad759688","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-          ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
-    ],
-    "visibleRange": null,
-    "lockOrigin": false,
-    "showBackdrop": true,
-    "showBackdropImage": false,
-    "backdropImagePath": "",
-    "backdropImageOpacity": 0.5,
-    "backdropWidth": 1366,
-    "backdropHeight": 768,
-    "backdropXOffset": 0.0,
-    "backdropYOffset": 0.0,
-    "xorigin": 16,
-    "yorigin": 16,
-    "eventToFunction": {},
-    "eventStubScript": null,
-    "parent": {"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},
-    "resourceVersion": "1.3",
-    "name": "s_momiji",
-    "tags": [],
-    "resourceType": "GMSequence",
-  },
-  "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"eab58ea9-e679-4640-b6b5-ea239690dbda","tags":[],"resourceType":"GMImageLayer",},
-  ],
-  "nineSlice": null,
-  "parent": {
-    "name": "momiji",
-    "path": "folders/Sprites/momiji.yy",
-  },
-  "resourceVersion": "1.0",
-  "name": "s_momiji",
-  "tags": [],
-  "resourceType": "GMSprite",
-}
--- a/flames/sprites/s_momijidown/s_momijidown.yy
+++ b/flames/sprites/s_momijidown/s_momijidown.yy
@ -1,91 +0,0 @@
-{
-  "bboxMode": 0,
-  "collisionKind": 0,
-  "type": 0,
-  "origin": 4,
-  "preMultiplyAlpha": false,
-  "edgeFiltering": false,
-  "collisionTolerance": 0,
-  "swfPrecision": 2.525,
-  "bbox_left": 6,
-  "bbox_right": 24,
-  "bbox_top": 3,
-  "bbox_bottom": 28,
-  "HTile": false,
-  "VTile": false,
-  "For3D": false,
-  "width": 32,
-  "height": 32,
-  "textureGroupId": {
-    "name": "Default",
-    "path": "texturegroups/Default",
-  },
-  "swatchColours": null,
-  "gridX": 0,
-  "gridY": 0,
-  "frames": [
-    {"compositeImage":{"FrameId":{"name":"46e6ae5d-cdca-4eb8-af9b-623343b88a71","path":"sprites/s_momijidown/s_momijidown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"46e6ae5d-cdca-4eb8-af9b-623343b88a71","path":"sprites/s_momijidown/s_momijidown.yy",},"LayerId":{"name":"a9e54b69-cd1b-40ec-862e-7cf86d40dc21","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momijidown","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","name":"46e6ae5d-cdca-4eb8-af9b-623343b88a71","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"000a317a-54a0-4d5e-b29c-74e7f9c68cb4","path":"sprites/s_momijidown/s_momijidown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"000a317a-54a0-4d5e-b29c-74e7f9c68cb4","path":"sprites/s_momijidown/s_momijidown.yy",},"LayerId":{"name":"a9e54b69-cd1b-40ec-862e-7cf86d40dc21","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momijidown","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","name":"000a317a-54a0-4d5e-b29c-74e7f9c68cb4","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"cb908577-194c-465c-b818-976df07019cc","path":"sprites/s_momijidown/s_momijidown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"cb908577-194c-465c-b818-976df07019cc","path":"sprites/s_momijidown/s_momijidown.yy",},"LayerId":{"name":"a9e54b69-cd1b-40ec-862e-7cf86d40dc21","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momijidown","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","name":"cb908577-194c-465c-b818-976df07019cc","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"4de403df-21bc-4cf7-8852-238d4a179b8c","path":"sprites/s_momijidown/s_momijidown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"4de403df-21bc-4cf7-8852-238d4a179b8c","path":"sprites/s_momijidown/s_momijidown.yy",},"LayerId":{"name":"a9e54b69-cd1b-40ec-862e-7cf86d40dc21","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momijidown","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","name":"4de403df-21bc-4cf7-8852-238d4a179b8c","tags":[],"resourceType":"GMSpriteFrame",},
-  ],
-  "sequence": {
-    "spriteId": {"name":"s_momijidown","path":"sprites/s_momijidown/s_momijidown.yy",},
-    "timeUnits": 1,
-    "playback": 1,
-    "playbackSpeed": 50.0,
-    "playbackSpeedType": 0,
-    "autoRecord": true,
-    "volume": 1.0,
-    "length": 4.0,
-    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
-    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
-    "tracks": [
-      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"ad8bca38-48c2-4e31-b87b-88d4e5fd1620","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"46e6ae5d-cdca-4eb8-af9b-623343b88a71","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"fd85b4c5-83ea-4106-99c4-786dca4835bd","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"000a317a-54a0-4d5e-b29c-74e7f9c68cb4","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"f3b76b0c-1371-4664-bb66-0b4e02890eda","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cb908577-194c-465c-b818-976df07019cc","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"48bfe9f0-b8f6-49b5-a838-865736aa68e1","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4de403df-21bc-4cf7-8852-238d4a179b8c","path":"sprites/s_momijidown/s_momijidown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-          ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
-    ],
-    "visibleRange": null,
-    "lockOrigin": false,
-    "showBackdrop": true,
-    "showBackdropImage": false,
-    "backdropImagePath": "",
-    "backdropImageOpacity": 0.5,
-    "backdropWidth": 1366,
-    "backdropHeight": 768,
-    "backdropXOffset": 0.0,
-    "backdropYOffset": 0.0,
-    "xorigin": 16,
-    "yorigin": 16,
-    "eventToFunction": {},
-    "eventStubScript": null,
-    "parent": {"name":"s_momijidown","path":"sprites/s_momijidown/s_momijidown.yy",},
-    "resourceVersion": "1.3",
-    "name": "s_momijidown",
-    "tags": [],
-    "resourceType": "GMSequence",
-  },
-  "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"a9e54b69-cd1b-40ec-862e-7cf86d40dc21","tags":[],"resourceType":"GMImageLayer",},
-  ],
-  "nineSlice": null,
-  "parent": {
-    "name": "momiji",
-    "path": "folders/Sprites/momiji.yy",
-  },
-  "resourceVersion": "1.0",
-  "name": "s_momijidown",
-  "tags": [],
-  "resourceType": "GMSprite",
-}
--- a/flames/sprites/s_momijidown/s_momijiup.yy
+++ b/flames/sprites/s_momijidown/s_momijiup.yy
@ -1,83 +0,0 @@
-{
-  "bboxMode": 0,
-  "collisionKind": 0,
-  "type": 0,
-  "origin": 4,
-  "preMultiplyAlpha": false,
-  "edgeFiltering": false,
-  "collisionTolerance": 0,
-  "swfPrecision": 2.525,
-  "bbox_left": 3,
-  "bbox_right": 24,
-  "bbox_top": 2,
-  "bbox_bottom": 26,
-  "HTile": false,
-  "VTile": false,
-  "For3D": false,
-  "width": 32,
-  "height": 32,
-  "textureGroupId": {
-    "name": "Default",
-    "path": "texturegroups/Default",
-  },
-  "swatchColours": null,
-  "gridX": 0,
-  "gridY": 0,
-  "frames": [
-    {"compositeImage":{"FrameId":{"name":"99275dfc-aa96-4110-8106-19fea8895cad","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"99275dfc-aa96-4110-8106-19fea8895cad","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":{"name":"eab58ea9-e679-4640-b6b5-ea239690dbda","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"99275dfc-aa96-4110-8106-19fea8895cad","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"dec35a3a-745e-46b0-b2d4-008bad759688","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"dec35a3a-745e-46b0-b2d4-008bad759688","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":{"name":"eab58ea9-e679-4640-b6b5-ea239690dbda","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"dec35a3a-745e-46b0-b2d4-008bad759688","tags":[],"resourceType":"GMSpriteFrame",},
-  ],
-  "sequence": {
-    "spriteId": {"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},
-    "timeUnits": 1,
-    "playback": 1,
-    "playbackSpeed": 30.0,
-    "playbackSpeedType": 0,
-    "autoRecord": true,
-    "volume": 1.0,
-    "length": 2.0,
-    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
-    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
-    "tracks": [
-      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"61ff0117-054a-4410-8601-2794ed68203a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"99275dfc-aa96-4110-8106-19fea8895cad","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"ec114919-df4f-40d4-91c6-950d7e34b880","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dec35a3a-745e-46b0-b2d4-008bad759688","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-          ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
-    ],
-    "visibleRange": null,
-    "lockOrigin": false,
-    "showBackdrop": true,
-    "showBackdropImage": false,
-    "backdropImagePath": "",
-    "backdropImageOpacity": 0.5,
-    "backdropWidth": 1366,
-    "backdropHeight": 768,
-    "backdropXOffset": 0.0,
-    "backdropYOffset": 0.0,
-    "xorigin": 16,
-    "yorigin": 16,
-    "eventToFunction": {},
-    "eventStubScript": null,
-    "parent": {"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},
-    "resourceVersion": "1.3",
-    "name": "s_momijiup",
-    "tags": [],
-    "resourceType": "GMSequence",
-  },
-  "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"eab58ea9-e679-4640-b6b5-ea239690dbda","tags":[],"resourceType":"GMImageLayer",},
-  ],
-  "nineSlice": null,
-  "parent": {
-    "name": "momiji",
-    "path": "folders/Sprites/momiji.yy",
-  },
-  "resourceVersion": "1.0",
-  "name": "s_momijiup",
-  "tags": [],
-  "resourceType": "GMSprite",
-}
--- a/flames/sprites/s_momijiup/0e22985f-c93d-41b6-8778-bc58d1256abb.png
+++ b/flames/sprites/s_momijiup/0e22985f-c93d-41b6-8778-bc58d1256abb.png
--- a/flames/sprites/s_momijiup/23324d60-330b-45e2-8add-0d4dc27c17e3.png
+++ b/flames/sprites/s_momijiup/23324d60-330b-45e2-8add-0d4dc27c17e3.png
--- a/flames/sprites/s_momijiup/55171f99-793a-45e1-a3ad-4235cbd02698.png
+++ b/flames/sprites/s_momijiup/55171f99-793a-45e1-a3ad-4235cbd02698.png
--- a/flames/sprites/s_momijiup/91e9ad61-8d67-4b77-a5a2-fd1657278248.png
+++ b/flames/sprites/s_momijiup/91e9ad61-8d67-4b77-a5a2-fd1657278248.png
--- a/flames/sprites/s_momijiup/layers/0e22985f-c93d-41b6-8778-bc58d1256abb/435f8b7b-618a-4baf-a455-7772f7ddc10b.png
+++ b/flames/sprites/s_momijiup/layers/0e22985f-c93d-41b6-8778-bc58d1256abb/435f8b7b-618a-4baf-a455-7772f7ddc10b.png
--- a/flames/sprites/s_momijiup/layers/23324d60-330b-45e2-8add-0d4dc27c17e3/435f8b7b-618a-4baf-a455-7772f7ddc10b.png
+++ b/flames/sprites/s_momijiup/layers/23324d60-330b-45e2-8add-0d4dc27c17e3/435f8b7b-618a-4baf-a455-7772f7ddc10b.png
--- a/flames/sprites/s_momijiup/layers/55171f99-793a-45e1-a3ad-4235cbd02698/435f8b7b-618a-4baf-a455-7772f7ddc10b.png
+++ b/flames/sprites/s_momijiup/layers/55171f99-793a-45e1-a3ad-4235cbd02698/435f8b7b-618a-4baf-a455-7772f7ddc10b.png
--- a/flames/sprites/s_momijiup/layers/91e9ad61-8d67-4b77-a5a2-fd1657278248/435f8b7b-618a-4baf-a455-7772f7ddc10b.png
+++ b/flames/sprites/s_momijiup/layers/91e9ad61-8d67-4b77-a5a2-fd1657278248/435f8b7b-618a-4baf-a455-7772f7ddc10b.png
--- a/flames/sprites/s_momijiup/s_momiji.yy
+++ b/flames/sprites/s_momijiup/s_momiji.yy
@ -1,83 +0,0 @@
-{
-  "bboxMode": 0,
-  "collisionKind": 0,
-  "type": 0,
-  "origin": 4,
-  "preMultiplyAlpha": false,
-  "edgeFiltering": false,
-  "collisionTolerance": 0,
-  "swfPrecision": 2.525,
-  "bbox_left": 3,
-  "bbox_right": 24,
-  "bbox_top": 2,
-  "bbox_bottom": 26,
-  "HTile": false,
-  "VTile": false,
-  "For3D": false,
-  "width": 32,
-  "height": 32,
-  "textureGroupId": {
-    "name": "Default",
-    "path": "texturegroups/Default",
-  },
-  "swatchColours": null,
-  "gridX": 0,
-  "gridY": 0,
-  "frames": [
-    {"compositeImage":{"FrameId":{"name":"99275dfc-aa96-4110-8106-19fea8895cad","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"99275dfc-aa96-4110-8106-19fea8895cad","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":{"name":"eab58ea9-e679-4640-b6b5-ea239690dbda","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"99275dfc-aa96-4110-8106-19fea8895cad","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"dec35a3a-745e-46b0-b2d4-008bad759688","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"dec35a3a-745e-46b0-b2d4-008bad759688","path":"sprites/s_momiji/s_momiji.yy",},"LayerId":{"name":"eab58ea9-e679-4640-b6b5-ea239690dbda","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","name":"dec35a3a-745e-46b0-b2d4-008bad759688","tags":[],"resourceType":"GMSpriteFrame",},
-  ],
-  "sequence": {
-    "spriteId": {"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},
-    "timeUnits": 1,
-    "playback": 1,
-    "playbackSpeed": 30.0,
-    "playbackSpeedType": 0,
-    "autoRecord": true,
-    "volume": 1.0,
-    "length": 2.0,
-    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
-    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
-    "tracks": [
-      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"8fa931f9-f257-476b-9cec-ab9877a4c804","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"99275dfc-aa96-4110-8106-19fea8895cad","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"a8ac96c1-1850-4cb8-a8b0-d47664a4e674","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dec35a3a-745e-46b0-b2d4-008bad759688","path":"sprites/s_momiji/s_momiji.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-          ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
-    ],
-    "visibleRange": null,
-    "lockOrigin": false,
-    "showBackdrop": true,
-    "showBackdropImage": false,
-    "backdropImagePath": "",
-    "backdropImageOpacity": 0.5,
-    "backdropWidth": 1366,
-    "backdropHeight": 768,
-    "backdropXOffset": 0.0,
-    "backdropYOffset": 0.0,
-    "xorigin": 16,
-    "yorigin": 16,
-    "eventToFunction": {},
-    "eventStubScript": null,
-    "parent": {"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},
-    "resourceVersion": "1.3",
-    "name": "s_momiji",
-    "tags": [],
-    "resourceType": "GMSequence",
-  },
-  "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"eab58ea9-e679-4640-b6b5-ea239690dbda","tags":[],"resourceType":"GMImageLayer",},
-  ],
-  "nineSlice": null,
-  "parent": {
-    "name": "momiji",
-    "path": "folders/Sprites/momiji.yy",
-  },
-  "resourceVersion": "1.0",
-  "name": "s_momiji",
-  "tags": [],
-  "resourceType": "GMSprite",
-}
--- a/flames/sprites/s_momijiup/s_momijiup.yy
+++ b/flames/sprites/s_momijiup/s_momijiup.yy
@ -1,91 +0,0 @@
-{
-  "bboxMode": 0,
-  "collisionKind": 0,
-  "type": 0,
-  "origin": 4,
-  "preMultiplyAlpha": false,
-  "edgeFiltering": false,
-  "collisionTolerance": 0,
-  "swfPrecision": 2.525,
-  "bbox_left": 5,
-  "bbox_right": 22,
-  "bbox_top": 3,
-  "bbox_bottom": 26,
-  "HTile": false,
-  "VTile": false,
-  "For3D": false,
-  "width": 32,
-  "height": 32,
-  "textureGroupId": {
-    "name": "Default",
-    "path": "texturegroups/Default",
-  },
-  "swatchColours": null,
-  "gridX": 0,
-  "gridY": 0,
-  "frames": [
-    {"compositeImage":{"FrameId":{"name":"55171f99-793a-45e1-a3ad-4235cbd02698","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"55171f99-793a-45e1-a3ad-4235cbd02698","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":{"name":"435f8b7b-618a-4baf-a455-7772f7ddc10b","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"55171f99-793a-45e1-a3ad-4235cbd02698","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"23324d60-330b-45e2-8add-0d4dc27c17e3","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"23324d60-330b-45e2-8add-0d4dc27c17e3","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":{"name":"435f8b7b-618a-4baf-a455-7772f7ddc10b","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"23324d60-330b-45e2-8add-0d4dc27c17e3","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"0e22985f-c93d-41b6-8778-bc58d1256abb","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"0e22985f-c93d-41b6-8778-bc58d1256abb","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":{"name":"435f8b7b-618a-4baf-a455-7772f7ddc10b","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"0e22985f-c93d-41b6-8778-bc58d1256abb","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"91e9ad61-8d67-4b77-a5a2-fd1657278248","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"91e9ad61-8d67-4b77-a5a2-fd1657278248","path":"sprites/s_momijiup/s_momijiup.yy",},"LayerId":{"name":"435f8b7b-618a-4baf-a455-7772f7ddc10b","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","name":"91e9ad61-8d67-4b77-a5a2-fd1657278248","tags":[],"resourceType":"GMSpriteFrame",},
-  ],
-  "sequence": {
-    "spriteId": {"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},
-    "timeUnits": 1,
-    "playback": 1,
-    "playbackSpeed": 50.0,
-    "playbackSpeedType": 0,
-    "autoRecord": true,
-    "volume": 1.0,
-    "length": 4.0,
-    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
-    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
-    "tracks": [
-      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"c22a3d98-1501-4f45-967e-31b3b52c64fd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"55171f99-793a-45e1-a3ad-4235cbd02698","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"85920841-0083-4758-9962-d0c73b06bab0","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"23324d60-330b-45e2-8add-0d4dc27c17e3","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"94eb811b-83aa-4fd2-80ec-1c2c411c4e40","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0e22985f-c93d-41b6-8778-bc58d1256abb","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"7f53b22c-8159-430a-8a06-9cac01009f7f","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"91e9ad61-8d67-4b77-a5a2-fd1657278248","path":"sprites/s_momijiup/s_momijiup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-          ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
-    ],
-    "visibleRange": null,
-    "lockOrigin": false,
-    "showBackdrop": true,
-    "showBackdropImage": false,
-    "backdropImagePath": "",
-    "backdropImageOpacity": 0.5,
-    "backdropWidth": 1366,
-    "backdropHeight": 768,
-    "backdropXOffset": 0.0,
-    "backdropYOffset": 0.0,
-    "xorigin": 16,
-    "yorigin": 16,
-    "eventToFunction": {},
-    "eventStubScript": null,
-    "parent": {"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},
-    "resourceVersion": "1.3",
-    "name": "s_momijiup",
-    "tags": [],
-    "resourceType": "GMSequence",
-  },
-  "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"435f8b7b-618a-4baf-a455-7772f7ddc10b","tags":[],"resourceType":"GMImageLayer",},
-  ],
-  "nineSlice": null,
-  "parent": {
-    "name": "momiji",
-    "path": "folders/Sprites/momiji.yy",
-  },
-  "resourceVersion": "1.0",
-  "name": "s_momijiup",
-  "tags": [],
-  "resourceType": "GMSprite",
-}