Merge branch 'master' of https://git.touhou.dev/shaun_chaky/eastern-flames

2022-08-22 14:10:44 -04:00 · 2022-08-22 14:10:44 -04:00 · 2fe1377473
parent c36dc3fd2d 8e30d7fa7e
commit 2fe1377473
39 changed files with 889 additions and 35 deletions
--- a/flames/eastern
+++ b/flames/eastern
@ -14,6 +14,7 @@
    {"id":{"name":"c_getstats","path":"scripts/c_getstats/c_getstats.yy",},"order":16,},
    {"id":{"name":"stat","path":"scripts/stat/stat.yy",},"order":3,},
    {"id":{"name":"vlambeer","path":"scripts/vlambeer/vlambeer.yy",},"order":1,},
+    {"id":{"name":"da_title","path":"rooms/da_title/da_title.yy",},"order":1,},
    {"id":{"name":"x_unitsetup","path":"scripts/x_unitsetup/x_unitsetup.yy",},"order":0,},
    {"id":{"name":"x_skillstuff","path":"scripts/x_skillstuff/x_skillstuff.yy",},"order":12,},
    {"id":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"order":1,},
@ -21,8 +22,9 @@
    {"id":{"name":"c_decolor","path":"scripts/c_decolor/c_decolor.yy",},"order":10,},
    {"id":{"name":"s_spacetext15","path":"sprites/s_spacetext15/s_spacetext15.yy",},"order":8,},
    {"id":{"name":"c_errorstring","path":"scripts/c_errorstring/c_errorstring.yy",},"order":31,},
-    {"id":{"name":"s_guy","path":"sprites/s_guy/s_guy.yy",},"order":0,},
+    {"id":{"name":"s_guy","path":"sprites/s_guy/s_guy.yy",},"order":1,},
    {"id":{"name":"easing","path":"scripts/easing/easing.yy",},"order":4,},
+    {"id":{"name":"o_title","path":"objects/o_title/o_title.yy",},"order":3,},
    {"id":{"name":"bint_sort","path":"scripts/bint_sort/bint_sort.yy",},"order":0,},
    {"id":{"name":"st_enemyturn","path":"scripts/st_enemyturn/st_enemyturn.yy",},"order":28,},
    {"id":{"name":"vec2","path":"scripts/vec2/vec2.yy",},"order":0,},
@ -81,18 +83,19 @@
    {"id":{"name":"log","path":"scripts/log/log.yy",},"order":10,},
    {"id":{"name":"c_fulleval","path":"scripts/c_fulleval/c_fulleval.yy",},"order":18,},
    {"id":{"name":"keyboard_check_advanced","path":"scripts/keyboard_check_advanced/keyboard_check_advanced.yy",},"order":8,},
-    {"id":{"name":"s_spacetext","path":"sprites/s_spacetext/s_spacetext.yy",},"order":6,},
+    {"id":{"name":"s_spacetext","path":"sprites/s_spacetext/s_spacetext.yy",},"order":7,},
    {"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":"msglang","path":"scripts/msglang/msglang.yy",},"order":4,},
    {"id":{"name":"lb_auto","path":"scripts/lb_auto/lb_auto.yy",},"order":32,},
    {"id":{"name":"x_units","path":"scripts/x_units/x_units.yy",},"order":19,},
    {"id":{"name":"c_2dto3d","path":"scripts/c_2dto3d/c_2dto3d.yy",},"order":20,},
-    {"id":{"name":"s_guy2","path":"sprites/s_guy2/s_guy2.yy",},"order":1,},
+    {"id":{"name":"s_guy2","path":"sprites/s_guy2/s_guy2.yy",},"order":2,},
+    {"id":{"name":"s_aya","path":"sprites/s_aya/s_aya.yy",},"order":0,},
    {"id":{"name":"s_reisenup","path":"sprites/s_reisenup/s_reisenup.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":"s_null","path":"sprites/s_null/s_null.yy",},"order":4,},
+    {"id":{"name":"s_null","path":"sprites/s_null/s_null.yy",},"order":5,},
    {"id":{"name":"se_null","path":"sounds/se_null/se_null.yy",},"order":0,},
    {"id":{"name":"tag","path":"scripts/tag/tag.yy",},"order":6,},
    {"id":{"name":"instance_create","path":"scripts/instance_create/instance_create.yy",},"order":6,},
@ -110,6 +113,7 @@
    {"id":{"name":"point_me","path":"scripts/point_me/point_me.yy",},"order":15,},
    {"id":{"name":"c_badpractice","path":"scripts/c_badpractice/c_badpractice.yy",},"order":0,},
    {"id":{"name":"draw_hitbox","path":"scripts/draw_hitbox/draw_hitbox.yy",},"order":4,},
+    {"id":{"name":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},"order":12,},
    {"id":{"name":"textline_next","path":"scripts/textline_next/textline_next.yy",},"order":8,},
    {"id":{"name":"ARTICULATOR","path":"objects/ARTICULATOR/ARTICULATOR.yy",},"order":0,},
    {"id":{"name":"txt_test","path":"scripts/txt_test/txt_test.yy",},"order":30,},
@ -119,6 +123,7 @@
    {"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":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},"order":11,},
    {"id":{"name":"c_dewait","path":"scripts/c_dewait/c_dewait.yy",},"order":21,},
    {"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,},
@ -144,6 +149,7 @@
    "children": [],
  },
  "RoomOrderNodes": [
+    {"roomId":{"name":"da_title","path":"rooms/da_title/da_title.yy",},},
    {"roomId":{"name":"da_game","path":"rooms/da_game/da_game.yy",},},
  ],
  "Folders": [
@ -164,10 +170,10 @@
    {"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",},
-    {"folderPath":"folders/Sprites/wabbit.yy","order":3,"resourceVersion":"1.0","name":"wabbit","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/momiji.yy","order":3,"resourceVersion":"1.0","name":"momiji","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/wabbit.yy","order":4,"resourceVersion":"1.0","name":"wabbit","tags":[],"resourceType":"GMFolder",},
    {"folderPath":"folders/Scripts/3d.yy","order":19,"resourceVersion":"1.0","name":"3d","tags":[],"resourceType":"GMFolder",},
-    {"folderPath":"folders/Sprites/rei'sen.yy","order":5,"resourceVersion":"1.0","name":"rei'sen","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/rei'sen.yy","order":6,"resourceVersion":"1.0","name":"rei'sen","tags":[],"resourceType":"GMFolder",},
    {"folderPath":"folders/Fonts.yy","order":8,"resourceVersion":"1.0","name":"Fonts","tags":[],"resourceType":"GMFolder",},
    {"folderPath":"folders/Textbox.yy","order":9,"resourceVersion":"1.0","name":"Textbox","tags":[],"resourceType":"GMFolder",},
  ],
@ -180,12 +186,21 @@
  "IncludedFiles": [
    {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing tex.png","resourceType":"GMIncludedFile",},
    {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing.dat","resourceType":"GMIncludedFile",},
-    {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.dat","resourceType":"GMIncludedFile",},
-    {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.size","resourceType":"GMIncludedFile",},
-    {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"mapatlas.png","resourceType":"GMIncludedFile",},
    {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.dat","resourceType":"GMIncludedFile",},
    {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.size","resourceType":"GMIncludedFile",},
    {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatestatlas.png","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.dat","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.size","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"mapatlas.png","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/forestbattle","resourceVersion":"1.0","name":"forestatlas.png","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"water.dat","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/forestbattle","resourceVersion":"1.0","name":"forestbattle.dat","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"water.size","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"mapriver.png","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/plainsbattle","resourceVersion":"1.0","name":"plainsatlas.png","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/forestbattle","resourceVersion":"1.0","name":"forestbattle.size","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/plainsbattle","resourceVersion":"1.0","name":"plainsbattle.dat","resourceType":"GMIncludedFile",},
+    {"CopyToMask":-1,"filePath":"datafiles/plainsbattle","resourceVersion":"1.0","name":"plainsbattle.size","resourceType":"GMIncludedFile",},
  ],
  "MetaData": {
    "IDEVersion": "2.3.3.574",
--- a/flames/objects/o_title/Create_0.gml
+++ b/flames/objects/o_title/Create_0.gml
@ -0,0 +1,2 @@
+dir = DIR.UP;
+draw_set_font(ft_chiaro);
--- a/flames/objects/o_title/Draw_0.gml
+++ b/flames/objects/o_title/Draw_0.gml
@ -0,0 +1,24 @@
+draw_set_halign(fa_center);
+draw_text(320, 40, "CRESCENT INCURSION");
+draw_text(320, 180-40, msglang("START", "始まる"));
+draw_text(320-60, 180, msglang("ENG", "英語"));
+draw_text(320+60, 180, msglang("JP", "日本語"));
+draw_text(320, 180+40, msglang("EXIT", "終わる"));
+draw_set_halign(fa_left);
+switch dir {
+	case DIR.LEFT:
+		draw_text(320, 180, "<");
+		break;
+	case DIR.DOWN:
+		draw_text(320, 180, "v");
+		break;
+	case DIR.UP:
+		draw_text(320, 180, "^");
+		break;
+	case DIR.RIGHT:
+		draw_text(320, 180, ">");
+		break;
+	default:
+		draw_text(320, 180, ".");
+		break;
+}
--- a/flames/objects/o_title/Step_0.gml
+++ b/flames/objects/o_title/Step_0.gml
@ -0,0 +1,20 @@
+c_input();
+
+if leftp dir = DIR.LEFT;
+if downp dir = DIR.DOWN;
+if upp dir = DIR.UP;
+if rightp dir = DIR.RIGHT;
+if select switch dir {
+	case DIR.LEFT:
+		global.lang = LANGUAGE.ENGLISH;
+		break;
+	case DIR.DOWN:
+		game_end();
+		break;
+	case DIR.UP:
+		room_goto(da_game);
+		break;
+	case DIR.RIGHT:
+		global.lang = LANGUAGE.JAPANESE
+		break;	
+}
--- a/flames/objects/o_title/o_title.yy
+++ b/flames/objects/o_title/o_title.yy
@ -0,0 +1,35 @@
+{
+  "spriteId": null,
+  "solid": false,
+  "visible": true,
+  "spriteMaskId": null,
+  "persistent": false,
+  "parentObjectId": null,
+  "physicsObject": false,
+  "physicsSensor": false,
+  "physicsShape": 1,
+  "physicsGroup": 1,
+  "physicsDensity": 0.5,
+  "physicsRestitution": 0.1,
+  "physicsLinearDamping": 0.1,
+  "physicsAngularDamping": 0.1,
+  "physicsFriction": 0.2,
+  "physicsStartAwake": true,
+  "physicsKinematic": false,
+  "physicsShapePoints": [],
+  "eventList": [
+    {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+    {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+    {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+  ],
+  "properties": [],
+  "overriddenProperties": [],
+  "parent": {
+    "name": "Objects",
+    "path": "folders/Objects.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "o_title",
+  "tags": [],
+  "resourceType": "GMObject",
+}
--- a/flames/rooms/da_title/da_game.yy
+++ b/flames/rooms/da_title/da_game.yy
@ -0,0 +1,55 @@
+{
+  "isDnd": false,
+  "volume": 1.0,
+  "parentRoom": null,
+  "views": [
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+  ],
+  "layers": [
+    {"instances":[
+        {"properties":[],"isDnd":false,"objectId":{"name":"ARTICULATOR","path":"objects/ARTICULATOR/ARTICULATOR.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":256.0,"y":192.0,"resourceVersion":"1.0","name":"inst_54131ADF","tags":[],"resourceType":"GMRInstance",},
+      ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"instances","tags":[],"resourceType":"GMRInstanceLayer",},
+  ],
+  "inheritLayers": false,
+  "creationCodeFile": "",
+  "inheritCode": false,
+  "instanceCreationOrder": [
+    {"name":"inst_54131ADF","path":"rooms/da_game/da_game.yy",},
+  ],
+  "inheritCreationOrder": false,
+  "sequenceId": null,
+  "roomSettings": {
+    "inheritRoomSettings": false,
+    "Width": 640,
+    "Height": 360,
+    "persistent": false,
+  },
+  "viewSettings": {
+    "inheritViewSettings": false,
+    "enableViews": false,
+    "clearViewBackground": false,
+    "clearDisplayBuffer": true,
+  },
+  "physicsSettings": {
+    "inheritPhysicsSettings": false,
+    "PhysicsWorld": false,
+    "PhysicsWorldGravityX": 0.0,
+    "PhysicsWorldGravityY": 10.0,
+    "PhysicsWorldPixToMetres": 0.1,
+  },
+  "parent": {
+    "name": "Rooms",
+    "path": "folders/Rooms.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "da_game",
+  "tags": [],
+  "resourceType": "GMRoom",
+}
--- a/flames/rooms/da_title/da_title.yy
+++ b/flames/rooms/da_title/da_title.yy
@ -0,0 +1,55 @@
+{
+  "isDnd": false,
+  "volume": 1.0,
+  "parentRoom": null,
+  "views": [
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+  ],
+  "layers": [
+    {"instances":[
+        {"properties":[],"isDnd":false,"objectId":{"name":"o_title","path":"objects/o_title/o_title.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":96.0,"y":160.0,"resourceVersion":"1.0","name":"inst_35C72036","tags":[],"resourceType":"GMRInstance",},
+      ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"instances","tags":[],"resourceType":"GMRInstanceLayer",},
+  ],
+  "inheritLayers": false,
+  "creationCodeFile": "",
+  "inheritCode": false,
+  "instanceCreationOrder": [
+    {"name":"inst_35C72036","path":"rooms/da_title/da_title.yy",},
+  ],
+  "inheritCreationOrder": false,
+  "sequenceId": null,
+  "roomSettings": {
+    "inheritRoomSettings": false,
+    "Width": 640,
+    "Height": 360,
+    "persistent": false,
+  },
+  "viewSettings": {
+    "inheritViewSettings": false,
+    "enableViews": false,
+    "clearViewBackground": false,
+    "clearDisplayBuffer": true,
+  },
+  "physicsSettings": {
+    "inheritPhysicsSettings": false,
+    "PhysicsWorld": false,
+    "PhysicsWorldGravityX": 0.0,
+    "PhysicsWorldGravityY": 10.0,
+    "PhysicsWorldPixToMetres": 0.1,
+  },
+  "parent": {
+    "name": "Rooms",
+    "path": "folders/Rooms.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "da_title",
+  "tags": [],
+  "resourceType": "GMRoom",
+}
--- a/flames/scripts/c_loadstageone/c_loadstageone.gml
+++ b/flames/scripts/c_loadstageone/c_loadstageone.gml
@ -4,47 +4,47 @@ function c_loadstageone() {
 	c_addweapon(chara, wp[$"iron sword"], true);
 	var kris = c_inheritunit(10, 5, un.kris, ARMY.THEM);
 	c_addweapon(kris, wp[$"iron sword"], true, true);*/
-	var momiji = c_inheritunit(5, 9, un.momiji, ARMY.US);
+	var momiji = c_inheritunit(5, 9, un.Momiji, ARMY.US);
 	c_addweapon(momiji, wp[$"iron sword"], true);
-	var nitori = c_inheritunit(4, 10, un.nitori, ARMY.US);
+	var nitori = c_inheritunit(4, 10, un.Nitori, ARMY.US);
 	c_addweapon(nitori, wp[$"iron sword"], true);
 	
 	
-	bunny = c_inheritunit(19, 3, un.bunny, ARMY.THEM);
+	var bunny = c_inheritunit(19, 3, un[$"Bunny Buddy"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
-	bunny = c_inheritunit(17, 2, un.bunny, ARMY.THEM);
+	bunny = c_inheritunit(17, 2, un[$"Final Bunny"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
 	
-	var bunny = c_inheritunit(8, 2, un.bunny, ARMY.THEM);
+	bunny = c_inheritunit(8, 2, un[$"Forest Bunny"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
-	bunny = c_inheritunit(10, 3, un.bunny, ARMY.THEM);
+	bunny = c_inheritunit(10, 3, un[$"Plains Bunny"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
-	bunny = c_inheritunit(12, 4, un.bunny, ARMY.THEM);
+	bunny = c_inheritunit(12, 4, un[$"Mountain Bunny"], ARMY.THEM);
 	
 	c_addweapon(bunny, wp[$"iron sword"], true);
-	bunny = c_inheritunit(9, 10, un.bunny, ARMY.THEM);
+	bunny = c_inheritunit(9, 10, un[$"Bunny Forerunner"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
-	bunny = c_inheritunit(10, 8, un.bunny, ARMY.THEM);
+	bunny = c_inheritunit(10, 8, un[$"Bold Bunny"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
-	bunny = c_inheritunit(12, 10, un.bunny, ARMY.THEM);
+	bunny = c_inheritunit(12, 10, un[$"Admiring Bunny"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
-	bunny = c_inheritunit(13, 7, un.bunny, ARMY.THEM);
+	bunny = c_inheritunit(13, 7, un[$"Bunny in the Middle"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
 	
-	bunny = c_inheritunit(16, 12, un.bunny, ARMY.THEM);
+	bunny = c_inheritunit(16, 12, un.Bnuuy, ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
 	
-	bunny = c_inheritunit(16, 5, un.bunnyguard, ARMY.THEM);
+	bunny = c_inheritunit(16, 5, un[$"Bored Bunny"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
-	bunny = c_inheritunit(17, 6, un.bunnyguard, ARMY.THEM);
+	bunny = c_inheritunit(17, 6, un[$"Veteran Bunny"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
-	bunny = c_inheritunit(18, 7, un.bunnyguard, ARMY.THEM);
+	bunny = c_inheritunit(18, 7, un[$"Rabbit"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
 	
-	bunny = c_inheritunit(19, 13, un.bunnythief, ARMY.THEM);
+	bunny = c_inheritunit(19, 13, un[$"Sneaky Bunny"], ARMY.THEM);
 	c_addweapon(bunny, wp[$"iron sword"], true);
 	
 	
-	var reisen = c_inheritunit(19, 1, un[$"rei'sen"], true, ARMY.THEM);
+	var reisen = c_inheritunit(19, 1, un[$"Rei'sen"], true, ARMY.THEM);
 	c_addweapon(reisen, wp[$"iron sword"], true);
 }
--- a/flames/scripts/c_moveunit/c_moveunit.gml
+++ b/flames/scripts/c_moveunit/c_moveunit.gml
@ -1,7 +1,8 @@
 function c_moveunit(targetunit, destination) {
-	array_remove(c_gettile(targetunit.pos.x, targetunit.pos.y).contents, targetunit);
+	var theguy = c_gettile(targetunit.pos.x, targetunit.pos.y);
+	array_remove(theguy.contents, targetunit);
 	array_push(destination.contents, targetunit);
 	targetunit.pos.x = destination.x;
 	targetunit.pos.y = destination.y;
-	
+	theguy.event();
 }
--- a/flames/scripts/tiledata/tiledata.gml
+++ b/flames/scripts/tiledata/tiledata.gml
@ -1,5 +1,6 @@
 var forest123456 = function() {return new tiledata(u, u, [], [new statmod(st.def, 5, add)])}
 var block1234567 = function() {return new tiledata(false, u, [])}
+var recruit_tile = function() {return new tiledata(u, u, u, u, function() {})}
 global.map = c_mapgen([
 [block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), block1234567(), block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()],
 [block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), forest123456(), new tiledata(), new tiledata(), block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()],
@ -27,11 +28,12 @@ function c_informtiles() {
 c_informtiles();
 global.tilesize = new vec2(20, 20);

-function tiledata(passable_=true, contents_=[], overlays_=[], statmods=[]) constructor {
+function tiledata(passable_=true, contents_=[], overlays_=[], statmods=[], event_=c_null) constructor {
 	passable = passable_;
 	contents = contents_;
 	overlays = overlays_;
 	modifiers = {};
+	event = event_;
 	var i;
 	for (i=0; i<array_length(statmods); i++) {
 		modifiers[$statmods[i].name] = statmods[i];
--- a/flames/scripts/weapon/weapon.gml
+++ b/flames/scripts/weapon/weapon.gml
@ -35,6 +35,19 @@ nu weapon("nothing", "it's literally nothing", WPTYPE.NULL);
 nu weapon("knife", "bleed, bleed", WPTYPE.SWORD, [new statmod(st.str, 20, add), new statmod(st.hit, 100, add)]);
 nu weapon("iron sword", "made of a cringe material", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);

+nu weapon("Blade", "it's blade.", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
+
+
+nu weapon("Maple Leaf", "eh? not going for true end?", WPTYPE.SWORD, [new statmod(st.str, 5, add), new statmod(st.hit, 95, add)]);
+nu weapon("Microlaser", "special science laser instead of magic!", WPTYPE.SWORD, [new statmod(st.str, 4, add), new statmod(st.hit, 90, add)]);
+nu weapon("Wrench", "a wrench of a common material", WPTYPE.SWORD, [new statmod(st.str, 9, add), new statmod(st.hit, 60, add)]);
+
+nu weapon("Bayonet", "it's out of ammo...", WPTYPE.SWORD, [new statmod(st.str, 9, add), new statmod(st.hit, 80, add)]);
+nu weapon("Rifle", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
+nu weapon("", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
+nu weapon("", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
+nu weapon("", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
+
 function c_modifierreset(target) {
 	var dudes = variable_struct_get_names(target.data);
 	var lads = variable_struct_get_names(st);
--- a/flames/scripts/x_units/x_units.gml
+++ b/flames/scripts/x_units/x_units.gml
@ -29,7 +29,7 @@ mydata = {
 nu unit(mydata, mydata, [st.hp.add(110), st.str.add(20), st.def.add(10), st.spd.add(5), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);

 mydata = {
-	name: "momiji",
+	name: "Momiji",
 	desc: "",
 	skills: [],
 	idle: s_momiji,
@ -39,7 +39,7 @@ mydata = {
 }
 nu unit(mydata, mydata, [st.hp.add(30), st.str.add(12), st.def.add(8), st.spd.add(10), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
 mydata = {
-	name: "nitori",
+	name: "Nitori",
 	desc: "",
 	skills: [],
 	idle: s_bunny,
@ -60,8 +60,100 @@ mydata = {
 	aitype: AI.KILLER,
 }
 nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+
 mydata = {
-	name: "bunnyguard",
+	name: "Bunny Forerunner",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Bold Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Admiring Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Bunny in the Middle",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Forest Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Plains Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Mountain Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Bunny Buddy",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Final Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.KILLER,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+
+mydata = {
+	name: "Bored Bunny",
 	desc: "",
 	skills: [],
 	idle: s_bunny,
@ -71,7 +163,37 @@ mydata = {
 }
 nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
 mydata = {
-	name: "bunnythief",
+	name: "Veteran Bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.WAITER,
+}
+nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Rabbit",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.WAITER,
+}
+nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Bnuuy",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+	aitype: AI.WAITER,
+}
+nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
+mydata = {
+	name: "Sneaky Bunny",
 	desc: "",
 	skills: [],
 	idle: s_bunny,
@ -83,7 +205,7 @@ nu unit(mydata, mydata, [st.hp.add(20), st.str.add(6), st.def.add(4), st.spd.add


 mydata = {
-	name: "rei'sen",
+	name: "Rei'sen",
 	desc: "",
 	skills: [],
 	idle: s_reisen,
--- a/flames/sprites/s_aya/01c64486-3222-41b3-b60b-2bf60928a6e7.png
+++ b/flames/sprites/s_aya/01c64486-3222-41b3-b60b-2bf60928a6e7.png
--- a/flames/sprites/s_aya/6486e93f-e986-4d5e-9d23-ac6ffb23ca0f.png
+++ b/flames/sprites/s_aya/6486e93f-e986-4d5e-9d23-ac6ffb23ca0f.png
--- a/flames/sprites/s_aya/b5408d73-91ea-408d-a3a4-f037583bb763.png
+++ b/flames/sprites/s_aya/b5408d73-91ea-408d-a3a4-f037583bb763.png
--- a/flames/sprites/s_aya/layers/01c64486-3222-41b3-b60b-2bf60928a6e7/dc3e0dc6-f041-44a1-93ae-680468cccc84.png
+++ b/flames/sprites/s_aya/layers/01c64486-3222-41b3-b60b-2bf60928a6e7/dc3e0dc6-f041-44a1-93ae-680468cccc84.png
--- a/flames/sprites/s_aya/layers/6486e93f-e986-4d5e-9d23-ac6ffb23ca0f/dc3e0dc6-f041-44a1-93ae-680468cccc84.png
+++ b/flames/sprites/s_aya/layers/6486e93f-e986-4d5e-9d23-ac6ffb23ca0f/dc3e0dc6-f041-44a1-93ae-680468cccc84.png
--- a/flames/sprites/s_aya/layers/b5408d73-91ea-408d-a3a4-f037583bb763/b8ac93fb-0521-4217-8fb7-c0015b1f6a66.png
+++ b/flames/sprites/s_aya/layers/b5408d73-91ea-408d-a3a4-f037583bb763/b8ac93fb-0521-4217-8fb7-c0015b1f6a66.png
--- a/flames/sprites/s_aya/s_aya.yy
+++ b/flames/sprites/s_aya/s_aya.yy
@ -0,0 +1,83 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 9,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 7,
+  "bbox_right": 26,
+  "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":"01c64486-3222-41b3-b60b-2bf60928a6e7","path":"sprites/s_aya/s_aya.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"01c64486-3222-41b3-b60b-2bf60928a6e7","path":"sprites/s_aya/s_aya.yy",},"LayerId":{"name":"dc3e0dc6-f041-44a1-93ae-680468cccc84","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_aya","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"01c64486-3222-41b3-b60b-2bf60928a6e7","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","path":"sprites/s_aya/s_aya.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","path":"sprites/s_aya/s_aya.yy",},"LayerId":{"name":"dc3e0dc6-f041-44a1-93ae-680468cccc84","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_aya","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"s_aya","path":"sprites/s_aya/s_aya.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":"45134918-12b3-4b19-902a-cbd2125d3ed1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"01c64486-3222-41b3-b60b-2bf60928a6e7","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"ffcf155c-21f8-4a16-be3d-4f3290c432b1","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","path":"sprites/s_aya/s_aya.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": 27,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"s_aya","path":"sprites/s_aya/s_aya.yy",},
+    "resourceVersion": "1.3",
+    "name": "s_aya",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"dc3e0dc6-f041-44a1-93ae-680468cccc84","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "Sprites",
+    "path": "folders/Sprites.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "s_aya",
+  "tags": [],
+  "resourceType": "GMSprite",
+}
--- a/flames/sprites/s_ayadown/30fb6869-766e-45a9-a5c2-7b5377367372.png
+++ b/flames/sprites/s_ayadown/30fb6869-766e-45a9-a5c2-7b5377367372.png
--- a/flames/sprites/s_ayadown/b5408d73-91ea-408d-a3a4-f037583bb763.png
+++ b/flames/sprites/s_ayadown/b5408d73-91ea-408d-a3a4-f037583bb763.png
--- a/flames/sprites/s_ayadown/fa663491-c899-4179-9026-d84f2c564311.png
+++ b/flames/sprites/s_ayadown/fa663491-c899-4179-9026-d84f2c564311.png
--- a/flames/sprites/s_ayadown/layers/30fb6869-766e-45a9-a5c2-7b5377367372/ea6843da-30d5-48ce-b017-b515849ed014.png
+++ b/flames/sprites/s_ayadown/layers/30fb6869-766e-45a9-a5c2-7b5377367372/ea6843da-30d5-48ce-b017-b515849ed014.png
--- a/flames/sprites/s_ayadown/s_aya.yy
+++ b/flames/sprites/s_ayadown/s_aya.yy
@ -0,0 +1,83 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 4,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 7,
+  "bbox_right": 26,
+  "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":"01c64486-3222-41b3-b60b-2bf60928a6e7","path":"sprites/s_aya/s_aya.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"01c64486-3222-41b3-b60b-2bf60928a6e7","path":"sprites/s_aya/s_aya.yy",},"LayerId":{"name":"dc3e0dc6-f041-44a1-93ae-680468cccc84","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_aya","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"01c64486-3222-41b3-b60b-2bf60928a6e7","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","path":"sprites/s_aya/s_aya.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","path":"sprites/s_aya/s_aya.yy",},"LayerId":{"name":"dc3e0dc6-f041-44a1-93ae-680468cccc84","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_aya","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"s_aya","path":"sprites/s_aya/s_aya.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":"45134918-12b3-4b19-902a-cbd2125d3ed1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"01c64486-3222-41b3-b60b-2bf60928a6e7","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"ffcf155c-21f8-4a16-be3d-4f3290c432b1","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","path":"sprites/s_aya/s_aya.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_aya","path":"sprites/s_aya/s_aya.yy",},
+    "resourceVersion": "1.3",
+    "name": "s_aya",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"dc3e0dc6-f041-44a1-93ae-680468cccc84","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "Sprites",
+    "path": "folders/Sprites.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "s_aya",
+  "tags": [],
+  "resourceType": "GMSprite",
+}
--- a/flames/sprites/s_ayadown/s_ayadown.yy
+++ b/flames/sprites/s_ayadown/s_ayadown.yy
@ -0,0 +1,79 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 9,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 7,
+  "bbox_right": 122,
+  "bbox_top": 4,
+  "bbox_bottom": 28,
+  "HTile": false,
+  "VTile": false,
+  "For3D": false,
+  "width": 128,
+  "height": 32,
+  "textureGroupId": {
+    "name": "Default",
+    "path": "texturegroups/Default",
+  },
+  "swatchColours": null,
+  "gridX": 0,
+  "gridY": 0,
+  "frames": [
+    {"compositeImage":{"FrameId":{"name":"30fb6869-766e-45a9-a5c2-7b5377367372","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"30fb6869-766e-45a9-a5c2-7b5377367372","path":"sprites/s_ayadown/s_ayadown.yy",},"LayerId":{"name":"ea6843da-30d5-48ce-b017-b515849ed014","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},"resourceVersion":"1.0","name":"30fb6869-766e-45a9-a5c2-7b5377367372","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},
+    "timeUnits": 1,
+    "playback": 1,
+    "playbackSpeed": 30.0,
+    "playbackSpeedType": 0,
+    "autoRecord": true,
+    "volume": 1.0,
+    "length": 1.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":"28659646-7cc5-4922-9987-c21e6607fa2f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"30fb6869-766e-45a9-a5c2-7b5377367372","path":"sprites/s_ayadown/s_ayadown.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": 27,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"s_ayadown","path":"sprites/s_ayadown/s_ayadown.yy",},
+    "resourceVersion": "1.3",
+    "name": "s_ayadown",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ea6843da-30d5-48ce-b017-b515849ed014","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "Sprites",
+    "path": "folders/Sprites.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "s_ayadown",
+  "tags": [],
+  "resourceType": "GMSprite",
+}
--- a/flames/sprites/s_ayadown/s_ayaup.yy
+++ b/flames/sprites/s_ayadown/s_ayaup.yy
@ -0,0 +1,91 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 9,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 5,
+  "bbox_right": 26,
+  "bbox_top": 4,
+  "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":"f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":{"name":"76577217-6af7-4e67-959b-501fc21c04f7","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"def655c5-13a4-4aaf-bfcf-8333b71acc37","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"def655c5-13a4-4aaf-bfcf-8333b71acc37","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":{"name":"76577217-6af7-4e67-959b-501fc21c04f7","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"def655c5-13a4-4aaf-bfcf-8333b71acc37","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"fa5af3bd-b849-45cb-b356-f8aeffd71239","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"fa5af3bd-b849-45cb-b356-f8aeffd71239","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":{"name":"76577217-6af7-4e67-959b-501fc21c04f7","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"fa5af3bd-b849-45cb-b356-f8aeffd71239","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"0a3edb49-d4ad-4f0c-baa8-2484c1090b15","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"0a3edb49-d4ad-4f0c-baa8-2484c1090b15","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":{"name":"76577217-6af7-4e67-959b-501fc21c04f7","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"0a3edb49-d4ad-4f0c-baa8-2484c1090b15","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},
+    "timeUnits": 1,
+    "playback": 1,
+    "playbackSpeed": 30.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":"fc443bf9-2b62-4855-8917-a1080b2cfa52","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"622231f3-e73d-4225-9b83-1306d294d79c","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"def655c5-13a4-4aaf-bfcf-8333b71acc37","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"cd4ad48b-8205-4f04-80ba-debe3682eb70","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fa5af3bd-b849-45cb-b356-f8aeffd71239","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"13206276-3c9d-45d9-b213-56c774517534","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0a3edb49-d4ad-4f0c-baa8-2484c1090b15","path":"sprites/s_ayaup/s_ayaup.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": 27,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},
+    "resourceVersion": "1.3",
+    "name": "s_ayaup",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"76577217-6af7-4e67-959b-501fc21c04f7","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "Sprites",
+    "path": "folders/Sprites.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "s_ayaup",
+  "tags": [],
+  "resourceType": "GMSprite",
+}
--- a/flames/sprites/s_ayaup/0a3edb49-d4ad-4f0c-baa8-2484c1090b15.png
+++ b/flames/sprites/s_ayaup/0a3edb49-d4ad-4f0c-baa8-2484c1090b15.png
--- a/flames/sprites/s_ayaup/b5408d73-91ea-408d-a3a4-f037583bb763.png
+++ b/flames/sprites/s_ayaup/b5408d73-91ea-408d-a3a4-f037583bb763.png
--- a/flames/sprites/s_ayaup/def655c5-13a4-4aaf-bfcf-8333b71acc37.png
+++ b/flames/sprites/s_ayaup/def655c5-13a4-4aaf-bfcf-8333b71acc37.png
--- a/flames/sprites/s_ayaup/f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b.png
+++ b/flames/sprites/s_ayaup/f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b.png
--- a/flames/sprites/s_ayaup/fa5af3bd-b849-45cb-b356-f8aeffd71239.png
+++ b/flames/sprites/s_ayaup/fa5af3bd-b849-45cb-b356-f8aeffd71239.png
--- a/flames/sprites/s_ayaup/fa663491-c899-4179-9026-d84f2c564311.png
+++ b/flames/sprites/s_ayaup/fa663491-c899-4179-9026-d84f2c564311.png
--- a/flames/sprites/s_ayaup/layers/0a3edb49-d4ad-4f0c-baa8-2484c1090b15/76577217-6af7-4e67-959b-501fc21c04f7.png
+++ b/flames/sprites/s_ayaup/layers/0a3edb49-d4ad-4f0c-baa8-2484c1090b15/76577217-6af7-4e67-959b-501fc21c04f7.png
--- a/flames/sprites/s_ayaup/layers/def655c5-13a4-4aaf-bfcf-8333b71acc37/76577217-6af7-4e67-959b-501fc21c04f7.png
+++ b/flames/sprites/s_ayaup/layers/def655c5-13a4-4aaf-bfcf-8333b71acc37/76577217-6af7-4e67-959b-501fc21c04f7.png
--- a/flames/sprites/s_ayaup/layers/f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b/76577217-6af7-4e67-959b-501fc21c04f7.png
+++ b/flames/sprites/s_ayaup/layers/f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b/76577217-6af7-4e67-959b-501fc21c04f7.png
--- a/flames/sprites/s_ayaup/layers/fa5af3bd-b849-45cb-b356-f8aeffd71239/76577217-6af7-4e67-959b-501fc21c04f7.png
+++ b/flames/sprites/s_ayaup/layers/fa5af3bd-b849-45cb-b356-f8aeffd71239/76577217-6af7-4e67-959b-501fc21c04f7.png
--- a/flames/sprites/s_ayaup/layers/fa663491-c899-4179-9026-d84f2c564311/bc09eb79-b5f1-4f4b-aa86-b48bd9b82f0d.png
+++ b/flames/sprites/s_ayaup/layers/fa663491-c899-4179-9026-d84f2c564311/bc09eb79-b5f1-4f4b-aa86-b48bd9b82f0d.png
--- a/flames/sprites/s_ayaup/s_aya.yy
+++ b/flames/sprites/s_ayaup/s_aya.yy
@ -0,0 +1,83 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 4,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 7,
+  "bbox_right": 26,
+  "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":"01c64486-3222-41b3-b60b-2bf60928a6e7","path":"sprites/s_aya/s_aya.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"01c64486-3222-41b3-b60b-2bf60928a6e7","path":"sprites/s_aya/s_aya.yy",},"LayerId":{"name":"dc3e0dc6-f041-44a1-93ae-680468cccc84","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_aya","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"01c64486-3222-41b3-b60b-2bf60928a6e7","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","path":"sprites/s_aya/s_aya.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","path":"sprites/s_aya/s_aya.yy",},"LayerId":{"name":"dc3e0dc6-f041-44a1-93ae-680468cccc84","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_aya","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"s_aya","path":"sprites/s_aya/s_aya.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":"45134918-12b3-4b19-902a-cbd2125d3ed1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"01c64486-3222-41b3-b60b-2bf60928a6e7","path":"sprites/s_aya/s_aya.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"ffcf155c-21f8-4a16-be3d-4f3290c432b1","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6486e93f-e986-4d5e-9d23-ac6ffb23ca0f","path":"sprites/s_aya/s_aya.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_aya","path":"sprites/s_aya/s_aya.yy",},
+    "resourceVersion": "1.3",
+    "name": "s_aya",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"dc3e0dc6-f041-44a1-93ae-680468cccc84","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "Sprites",
+    "path": "folders/Sprites.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "s_aya",
+  "tags": [],
+  "resourceType": "GMSprite",
+}
--- a/flames/sprites/s_ayaup/s_ayaup.yy
+++ b/flames/sprites/s_ayaup/s_ayaup.yy
@ -0,0 +1,91 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 9,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 5,
+  "bbox_right": 26,
+  "bbox_top": 4,
+  "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":"f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":{"name":"76577217-6af7-4e67-959b-501fc21c04f7","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"def655c5-13a4-4aaf-bfcf-8333b71acc37","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"def655c5-13a4-4aaf-bfcf-8333b71acc37","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":{"name":"76577217-6af7-4e67-959b-501fc21c04f7","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"def655c5-13a4-4aaf-bfcf-8333b71acc37","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"fa5af3bd-b849-45cb-b356-f8aeffd71239","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"fa5af3bd-b849-45cb-b356-f8aeffd71239","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":{"name":"76577217-6af7-4e67-959b-501fc21c04f7","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"fa5af3bd-b849-45cb-b356-f8aeffd71239","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"0a3edb49-d4ad-4f0c-baa8-2484c1090b15","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"0a3edb49-d4ad-4f0c-baa8-2484c1090b15","path":"sprites/s_ayaup/s_ayaup.yy",},"LayerId":{"name":"76577217-6af7-4e67-959b-501fc21c04f7","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","name":"0a3edb49-d4ad-4f0c-baa8-2484c1090b15","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},
+    "timeUnits": 1,
+    "playback": 1,
+    "playbackSpeed": 30.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":"fc443bf9-2b62-4855-8917-a1080b2cfa52","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f3cd1e8e-fe7c-439e-a4fa-87b88ccc8f3b","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"622231f3-e73d-4225-9b83-1306d294d79c","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"def655c5-13a4-4aaf-bfcf-8333b71acc37","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"cd4ad48b-8205-4f04-80ba-debe3682eb70","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fa5af3bd-b849-45cb-b356-f8aeffd71239","path":"sprites/s_ayaup/s_ayaup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"13206276-3c9d-45d9-b213-56c774517534","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0a3edb49-d4ad-4f0c-baa8-2484c1090b15","path":"sprites/s_ayaup/s_ayaup.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": 27,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"s_ayaup","path":"sprites/s_ayaup/s_ayaup.yy",},
+    "resourceVersion": "1.3",
+    "name": "s_ayaup",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"76577217-6af7-4e67-959b-501fc21c04f7","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "Sprites",
+    "path": "folders/Sprites.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "s_ayaup",
+  "tags": [],
+  "resourceType": "GMSprite",
+}