Added player movement and bomb/hyper logic

thpj3/objects/obj_dialogue/Create_0.gml

@@ -2,53 +2,17 @@ dialogue_mode = false;
 
 textspew = "";
 texttarget = "";
-actor_left = "";
-actor_left_emote = 0;
-actor_right = "";
-actor_right_emote = 0;
 spewlength = 0;
-last_active = 0;
+actor_left = "";
-text_advance_ready = -1;
+actor_left_emote = EMOTE_NEUTRAL;
+actor_right = "";
+actor_right_emote = EMOTE_NEUTRAL;
+last_active = LEFT;
+text_advance_ready = TEXT_LOADING;
 
 name_test = ds_queue_create();
 text_test = ds_queue_create();
 active_test = ds_queue_create();
 emote_test = ds_queue_create();
 
-loopdoop = 0;
+loopdoop = 0;
-
-//ds_queue_enqueue(name_test, 
-//		"", "",
-//		"Wriggle", "Mystia",
-//		"Wriggle", "Mystia",
-//		"Wriggle", "Mystia",
-//		"Wriggle", "Mystia",
-//		"Wriggle", "Mystia"
-//	);
-//ds_queue_enqueue(text_test,
-//		"",
-//		"So, what are you up to?",
-//		"on this fine day of Tuesday",
-//		"not much my good binch",
-//		"just drinking my soup",
-//		"cool cool"
-//	);
-//ds_queue_enqueue(active_test,
-//		0,
-//		0,
-//		0,
-//		1,
-//		1,
-//		0
-//	);
-//	
-//ds_queue_enqueue(emote_test,
-//		3, 2,
-//		3, 2,
-//		1, 2,
-//		1, 2,
-//		1, 2,
-//		1, 5
-//	);
-
-scr_dialogue_start( "dialogue_test.txt" );

thpj3/objects/obj_dialogue/Draw_0.gml

@@ -12,7 +12,7 @@ if (dialogue_mode) {
 	
 //TODO: Draw current active character's name
 	draw_set_alpha(1);
-	if ( last_active == 0 ) {
+	if ( last_active == LEFT ) {
 		draw_set_alpha(.5);		
 	}
 	draw_set_halign( fa_right );
@@ -20,7 +20,7 @@ if (dialogue_mode) {
 	draw_set_halign( fa_left );
 	
 	draw_set_alpha(1);
-	if ( last_active == 1 ) {
+	if ( last_active == RIGHT ) {
 		draw_set_alpha(.5);
 	}
 	draw_text( 128, 640, actor_left );
@@ -31,7 +31,7 @@ if (dialogue_mode) {
 	draw_text( 128, 480, textspew );
 	
 //TODO: If the current text has reached completion, draw an arrow in the corner
-	if (text_advance_ready == 1) {
+	if (text_advance_ready == TEXT_READY) {
 		loopdoop++;
 		draw_sprite( spr_text_arrow, round((loopdoop % 160) / 20), 1088, 608 ); 
 	}

thpj3/objects/obj_dialogue/Step_0.gml

@@ -1,6 +1,6 @@
 if (dialogue_mode) {
-	if (text_advance_ready == -1 && !ds_queue_empty(name_test) && !ds_queue_empty(name_test) && !ds_queue_empty(active_test) && !ds_queue_empty(emote_test)) {
+	if (text_advance_ready == TEXT_LOADING && !ds_queue_empty(name_test) && !ds_queue_empty(name_test) && !ds_queue_empty(active_test) && !ds_queue_empty(emote_test)) {
-		text_advance_ready = 0;
+		text_advance_ready = TEXT_TYPING;
 		actor_left = ds_queue_dequeue(name_test);
 		actor_left_emote = ds_queue_dequeue(emote_test);
 		actor_right = "";
@@ -14,7 +14,7 @@ if (dialogue_mode) {
 		last_active = ds_queue_dequeue(active_test);
 	} 
 	
-	if (text_advance_ready == 0 ) {
+	if (text_advance_ready == TEXT_TYPING ) {
 		textspew += string_char_at(texttarget, spewlength);
 		spewlength++;
 		if (keyboard_check_pressed( ord("Z") ) ) {
@@ -22,13 +22,13 @@ if (dialogue_mode) {
 			keyboard_clear(ord("Z"));
 		}
 		if (textspew == texttarget) {
-			text_advance_ready = 1;
+			text_advance_ready = TEXT_READY;
 		}
 	}
 	
-	if (text_advance_ready == 1) {
+	if (text_advance_ready == TEXT_READY) {
 		if (keyboard_check_pressed( ord("Z") ) ) {
-			text_advance_ready = -1;
+			text_advance_ready = TEXT_LOADING;
 			if (ds_queue_empty(name_test) || ds_queue_empty(text_test) || ds_queue_empty(active_test) || ds_queue_empty(emote_test)) {
 				dialogue_mode = false;
 			}

thpj3/objects/obj_dialogue/obj_dialogue.yy

@@ -28,8 +28,8 @@
   "properties": [],
   "overriddenProperties": [],
   "parent": {
-    "name": "thpj3",
+    "name": "dialogue",
-    "path": "thpj3.yyp",
+    "path": "folders/dialogue.yy",
   },
   "resourceVersion": "1.0",
   "name": "obj_dialogue",

thpj3/objects/obj_title_text/Step_0.gml

@@ -1,3 +1,3 @@
 if (keyboard_check(vk_anykey)) {
-	
+	room_goto_next();
 }

thpj3/objects/obj_wriggle/Create_0.gml

@@ -0,0 +1,15 @@
+lives_current = LIVES_INIT;
+bombs_current = BOMBS_INIT;
+hyper_current = HYPER_INIT;
+
+face_dir = RIGHT;
+
+hitbox_rotator = 0;
+bombing = 0;
+invuln = 0;
+recovery = 0;
+emergency = 0;
+hyper_time = 0;
+hyper_tier = 0;
+h_move = 0;
+v_move = 0;

thpj3/objects/obj_wriggle/Draw_0.gml

@@ -0,0 +1,4 @@
+draw_sprite_ext( spr_wriggle, image_index, x, y, -1 + (2 * face_dir), 1, 0, c_white, 1 * ( max( 1, recovery ) % 3 ) );
+
+draw_sprite_ext( spr_wriggle_hitbox, 0, x, y, 2, 2, hitbox_rotator, c_white, .75);
+draw_sprite_ext( spr_wriggle_hitbox, 0, x, y, 1, 1, -hitbox_rotator, c_white, 1);

thpj3/objects/obj_wriggle/Step_0.gml

@@ -0,0 +1,112 @@
+hitbox_rotator++;
+bombing--;
+invuln--;
+recovery--;
+emergency--;
+hyper_time--;
+h_move = 0;
+v_move = 0;
+
+input_up = keyboard_check( vk_up );
+input_down = keyboard_check( vk_down );
+input_left = keyboard_check( vk_left );
+input_right = keyboard_check( vk_right );
+input_shot_left = keyboard_check( ord( "Z" ) );
+input_shot_right = keyboard_check( ord( "C" ) );
+input_focus = keyboard_check( vk_shift );
+input_bomb = keyboard_check_pressed( ord("X") );
+
+if ( hyper_time <= 0 ) {
+	hyper_tier = HYPER_INACTIVE;
+}
+
+//bomb logic
+if ( input_bomb && !bombing && !recovery) {
+	//death bomb	
+	if ( emergency ) {
+		if ( hyper_current >= HYPER_COST && hyper_tier == HYPER_INACTIVE ) {
+			hyper_current -= hyper_current;			//costs all hyper gauges, tier = maximum
+			bombing = 60;
+			invuln = 60;
+			hyper_time = 420;
+			hyper_tier = HYPER_TIER_3;
+		} else if (bombs_current > 0 ) {
+			bombs_current = 0;						//costs all bombs
+			bombing = 300;
+			invuln = 360;
+//TODO: create death bomb object
+			//instance_create
+		}
+	} else {
+		if ( hyper_current >= HYPER_COST && hyper_tier == HYPER_INACTIVE ) {
+			hyper_time = 240;
+			while ( hyper_current >= HYPER_COST ) {	//costs all filled hyper gauges, tier = expended gauges
+				hyper_current -= HYPER_COST;
+				hyper_time += 60;
+				hyper_tier += 1;
+			}
+			bombing = 60;
+			invuln = 60;
+		} else if ( bombs_current > 0 ) {
+			bombs_current -= 1;						//costs 1 bomb
+			bombing = 180;
+			invuln = 180;
+//TODO: create bomb object
+			//instance_create
+		}
+	}
+}
+	
+//movement logic
+if ( !emergency && !recovery ) {
+	//convert input bools to directions
+	if ( input_up ) {
+		v_move--;
+	}
+	if ( input_down ) {
+		v_move++;
+	}
+	if ( input_left ) {
+		h_move--;
+	}
+	if ( input_right ) {
+		h_move++;
+	}
+	//move
+	if ( h_move != 0 || v_move != 0 ) {
+		if ( input_focus ) {
+			x += lengthdir_x( FOCUS_SPEED, point_direction(0, 0, h_move, v_move) );
+			y += lengthdir_y( FOCUS_SPEED, point_direction(0, 0, h_move, v_move) );
+		} else {
+			x += lengthdir_x( UNFOC_SPEED, point_direction(0, 0, h_move, v_move) );
+			y += lengthdir_y( UNFOC_SPEED, point_direction(0, 0, h_move, v_move) );
+		}
+	}
+	//enforce screen border
+	if ( x > BOUNDARY_RIGHT ) {
+		x = BOUNDARY_RIGHT;
+	}
+	if ( x < BOUNDARY_LEFT ) {
+		x = BOUNDARY_LEFT;
+	}
+	if ( y > BOUNDARY_BOTTOM ) {
+		y = BOUNDARY_BOTTOM;
+	}
+	if ( y < BOUNDARY_TOP ) {
+		y = BOUNDARY_TOP;
+	}
+}
+
+//shot and facing logic
+if ( !emergency && !recovery ) {
+	//change directions if only one is held
+	if ( input_shot_left && !input_shot_right ) {
+		face_dir = LEFT;		
+	}
+	if ( !input_shot_left && input_shot_right ) {
+		face_dir = RIGHT;
+	}
+	if ( input_shot_left || input_shot_right ) {
+//TODO: shoot in facing direction
+	}
+}

thpj3/objects/obj_wriggle/obj_wriggle.yy

@@ -0,0 +1,38 @@
+{
+  "spriteId": {
+    "name": "spr_wriggle",
+    "path": "sprites/spr_wriggle/spr_wriggle.yy",
+  },
+  "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":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+    {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+  ],
+  "properties": [],
+  "overriddenProperties": [],
+  "parent": {
+    "name": "thpj3",
+    "path": "thpj3.yyp",
+  },
+  "resourceVersion": "1.0",
+  "name": "obj_wriggle",
+  "tags": [],
+  "resourceType": "GMObject",
+}

thpj3/options/linux/options_linux.yy

@@ -1,9 +1,9 @@
 {
-  "option_linux_display_name": "Created with GameMaker Studio 2",
+  "option_linux_display_name": "wriggle's imperishable night [preview]",
   "option_linux_version": "1.0.0.0",
-  "option_linux_maintainer_email": "",
+  "option_linux_maintainer_email": "jmhogueison@outlook.com",
-  "option_linux_homepage": "http://www.yoyogames.com",
+  "option_linux_homepage": "https://git.fenny.space/magicalfeyfenny/touhou-pride-jam-2021",
-  "option_linux_short_desc": "",
+  "option_linux_short_desc": "a touhou fangame",
   "option_linux_long_desc": "",
   "option_linux_splash_screen": "${base_options_dir}/linux/splash/splash.png",
   "option_linux_display_splash": false,
@@ -11,7 +11,7 @@
   "option_linux_start_fullscreen": false,
   "option_linux_allow_fullscreen": false,
   "option_linux_interpolate_pixels": true,
-  "option_linux_display_cursor": true,
+  "option_linux_display_cursor": false,
   "option_linux_sync": false,
   "option_linux_resize_window": false,
   "option_linux_scale": 0,

thpj3/rooms/Room3/Room3.yy

@@ -15,6 +15,7 @@
   "layers": [
     {"instances":[
         {"properties":[],"isDnd":false,"objectId":{"name":"obj_dialogue","path":"objects/obj_dialogue/obj_dialogue.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":448.0,"resourceVersion":"1.0","name":"inst_1ED821BC","tags":[],"resourceType":"GMRInstance",},
+        {"properties":[],"isDnd":false,"objectId":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.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":128.0,"resourceVersion":"1.0","name":"inst_61D7FC1F","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",},
     {"spriteId":null,"colour":4278190080,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",},
   ],
@@ -23,6 +24,7 @@
   "inheritCode": false,
   "instanceCreationOrder": [
     {"name":"inst_1ED821BC","path":"rooms/Room3/Room3.yy",},
+    {"name":"inst_61D7FC1F","path":"rooms/Room3/Room3.yy",},
   ],
   "inheritCreationOrder": false,
   "sequenceId": null,

thpj3/rooms/rm_title/RoomCreationCode.gml

@@ -1 +1 @@
-randomize();
+scr_initialize();

thpj3/scripts/scr_dialogue_start/scr_dialogue_start.gml

@@ -51,10 +51,10 @@ function scr_dialogue_start( _filename ) {
 	obj_dialogue.textspew = "";
 	obj_dialogue.texttarget = "";
 	obj_dialogue.actor_left = "";
-	obj_dialogue.actor_left_emote = 0;
+	obj_dialogue.actor_left_emote = EMOTE_NEUTRAL;
 	obj_dialogue.actor_right = "";
-	obj_dialogue.actor_right_emote = 0;
+	obj_dialogue.actor_right_emote = EMOTE_NEUTRAL;
 	obj_dialogue.spewlength = 0;
-	obj_dialogue.last_active = 0;
+	obj_dialogue.last_active = LEFT;
-	obj_dialogue.text_advance_ready = -1;
+	obj_dialogue.text_advance_ready = TEXT_LOADING;
 }

thpj3/scripts/scr_initialize/scr_initialize.gml

@@ -0,0 +1,41 @@
+/// @function							scr_initialize();
+
+//define global constants
+#macro TEXT_LOADING -1
+#macro TEXT_TYPING 0
+#macro TEXT_READY 1
+#macro EMOTE_NEUTRAL 0
+#macro EMOTE_HAPPY 1
+#macro EMOTE_SAD 2
+#macro EMOTE_CONFUSED 3
+#macro EMOTE_ANGRY 4
+#macro EMOTE_OUCH 5
+
+#macro LEFT 0
+#macro RIGHT 1
+#macro LIVES_INIT 3
+#macro LIVES_MAX 5
+#macro BOMBS_INIT 3
+#macro BOMBS_MAX 5
+#macro HYPER_INIT 0
+#macro HYPER_COST 100
+#macro HYPER_MAX 300
+
+#macro FOCUS_SPEED 2
+#macro UNFOC_SPEED 5
+
+#macro HYPER_INACTIVE 0
+#macro HYPER_TIER_1 1
+#macro HYPER_TIER_2 2
+#macro HYPER_TIER_3 3
+
+#macro BOUNDARY_LEFT 32
+#macro BOUNDARY_RIGHT 1248
+#macro BOUNDARY_TOP 32
+#macro BOUNDARY_BOTTOM 688
+
+
+
+function scr_initialize() {
+	randomize();
+}

thpj3/scripts/scr_initialize/scr_initialize.yy

@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "thpj3",
+    "path": "thpj3.yyp",
+  },
+  "resourceVersion": "1.0",
+  "name": "scr_initialize",
+  "tags": [],
+  "resourceType": "GMScript",
+}

thpj3/sprites/spr_text_arrow/spr_text_arrow.yy

@@ -97,8 +97,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "thpj3",
+    "name": "dialogue",
-    "path": "thpj3.yyp",
+    "path": "folders/dialogue.yy",
   },
   "resourceVersion": "1.0",
   "name": "spr_text_arrow",

thpj3/sprites/spr_text_box/spr_text_box.yy

@@ -71,8 +71,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "thpj3",
+    "name": "dialogue",
-    "path": "thpj3.yyp",
+    "path": "folders/dialogue.yy",
   },
   "resourceVersion": "1.0",
   "name": "spr_text_box",

thpj3/sprites/spr_wriggle/spr_wriggle.yy

@@ -0,0 +1,79 @@
+{
+  "bboxMode": 2,
+  "collisionKind": 2,
+  "type": 0,
+  "origin": 9,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 29,
+  "bbox_right": 34,
+  "bbox_top": 21,
+  "bbox_bottom": 26,
+  "HTile": false,
+  "VTile": false,
+  "For3D": false,
+  "width": 64,
+  "height": 64,
+  "textureGroupId": {
+    "name": "Default",
+    "path": "texturegroups/Default",
+  },
+  "swatchColours": null,
+  "gridX": 0,
+  "gridY": 0,
+  "frames": [
+    {"compositeImage":{"FrameId":{"name":"68066b04-ff45-4bd8-a2cb-d8d36df51faa","path":"sprites/spr_wriggle/spr_wriggle.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"68066b04-ff45-4bd8-a2cb-d8d36df51faa","path":"sprites/spr_wriggle/spr_wriggle.yy",},"LayerId":{"name":"10a3f643-2de7-444e-b563-07d9d088eff2","path":"sprites/spr_wriggle/spr_wriggle.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.yy",},"resourceVersion":"1.0","name":"68066b04-ff45-4bd8-a2cb-d8d36df51faa","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.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":"d163ddcf-05f6-4987-8aeb-08d511f18573","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"68066b04-ff45-4bd8-a2cb-d8d36df51faa","path":"sprites/spr_wriggle/spr_wriggle.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": 32,
+    "yorigin": 24,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.yy",},
+    "resourceVersion": "1.3",
+    "name": "spr_wriggle",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"10a3f643-2de7-444e-b563-07d9d088eff2","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "thpj3",
+    "path": "thpj3.yyp",
+  },
+  "resourceVersion": "1.0",
+  "name": "spr_wriggle",
+  "tags": [],
+  "resourceType": "GMSprite",
+}

thpj3/sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy

@@ -2,20 +2,20 @@
   "bboxMode": 0,
   "collisionKind": 1,
   "type": 0,
-  "origin": 0,
+  "origin": 4,
   "preMultiplyAlpha": false,
   "edgeFiltering": false,
   "collisionTolerance": 0,
   "swfPrecision": 2.525,
   "bbox_left": 0,
-  "bbox_right": 0,
+  "bbox_right": 7,
   "bbox_top": 0,
-  "bbox_bottom": 0,
+  "bbox_bottom": 7,
   "HTile": false,
   "VTile": false,
   "For3D": false,
-  "width": 64,
+  "width": 8,
-  "height": 64,
+  "height": 8,
   "textureGroupId": {
     "name": "Default",
     "path": "texturegroups/Default",
@@ -24,12 +24,12 @@
   "gridX": 0,
   "gridY": 0,
   "frames": [
-    {"compositeImage":{"FrameId":{"name":"82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1","path":"sprites/Sprite7/Sprite7.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1","path":"sprites/Sprite7/Sprite7.yy",},"LayerId":{"name":"b2046bc7-37f9-401b-b711-c59dc3018c19","path":"sprites/Sprite7/Sprite7.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",},"LayerId":{"name":"b2046bc7-37f9-401b-b711-c59dc3018c19","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"Sprite7","path":"sprites/Sprite7/Sprite7.yy",},"resourceVersion":"1.0","name":"82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"spr_wriggle_hitbox","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",},"resourceVersion":"1.0","name":"82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1","tags":[],"resourceType":"GMSpriteFrame",},
   ],
   "sequence": {
-    "spriteId": {"name":"Sprite7","path":"sprites/Sprite7/Sprite7.yy",},
+    "spriteId": {"name":"spr_wriggle_hitbox","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",},
     "timeUnits": 1,
     "playback": 1,
     "playbackSpeed": 30.0,
@@ -41,7 +41,7 @@
     "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
     "tracks": [
       {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"59a5cd20-6c83-4df3-a73f-1aa6acedc239","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1","path":"sprites/Sprite7/Sprite7.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"59a5cd20-6c83-4df3-a73f-1aa6acedc239","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.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,
@@ -54,13 +54,13 @@
     "backdropHeight": 768,
     "backdropXOffset": 0.0,
     "backdropYOffset": 0.0,
-    "xorigin": 0,
+    "xorigin": 4,
-    "yorigin": 0,
+    "yorigin": 4,
     "eventToFunction": {},
     "eventStubScript": null,
-    "parent": {"name":"Sprite7","path":"sprites/Sprite7/Sprite7.yy",},
+    "parent": {"name":"spr_wriggle_hitbox","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",},
     "resourceVersion": "1.3",
-    "name": "Sprite7",
+    "name": "spr_wriggle_hitbox",
     "tags": [],
     "resourceType": "GMSequence",
   },
@@ -73,7 +73,7 @@
     "path": "thpj3.yyp",
   },
   "resourceVersion": "1.0",
-  "name": "Sprite7",
+  "name": "spr_wriggle_hitbox",
   "tags": [],
   "resourceType": "GMSprite",
 }

thpj3/thpj3.yyp

@@ -3,23 +3,26 @@
     {"id":{"name":"fn_disclaimer","path":"fonts/fn_disclaimer/fn_disclaimer.yy",},"order":1,},
     {"id":{"name":"fn_title_text","path":"fonts/fn_title_text/fn_title_text.yy",},"order":0,},
     {"id":{"name":"obj_disclaimer","path":"objects/obj_disclaimer/obj_disclaimer.yy",},"order":2,},
-    {"id":{"name":"Sprite7","path":"sprites/Sprite7/Sprite7.yy",},"order":9,},
+    {"id":{"name":"spr_wriggle_hitbox","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",},"order":9,},
     {"id":{"name":"obj_title_moon","path":"objects/obj_title_moon/obj_title_moon.yy",},"order":1,},
-    {"id":{"name":"spr_title_star","path":"sprites/spr_title_star/spr_title_star.yy",},"order":8,},
+    {"id":{"name":"spr_title_star","path":"sprites/spr_title_star/spr_title_star.yy",},"order":7,},
     {"id":{"name":"scr_dialogue_start","path":"scripts/scr_dialogue_start/scr_dialogue_start.yy",},"order":10,},
     {"id":{"name":"rm_disclaimer","path":"rooms/rm_disclaimer/rm_disclaimer.yy",},"order":3,},
-    {"id":{"name":"obj_title_text","path":"objects/obj_title_text/obj_title_text.yy",},"order":4,},
+    {"id":{"name":"obj_title_text","path":"objects/obj_title_text/obj_title_text.yy",},"order":3,},
-    {"id":{"name":"spr_title_bg","path":"sprites/spr_title_bg/spr_title_bg.yy",},"order":6,},
+    {"id":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"order":11,},
+    {"id":{"name":"spr_title_bg","path":"sprites/spr_title_bg/spr_title_bg.yy",},"order":5,},
+    {"id":{"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.yy",},"order":14,},
     {"id":{"name":"Room3","path":"rooms/Room3/Room3.yy",},"order":6,},
-    {"id":{"name":"spr_title_title","path":"sprites/spr_title_title/spr_title_title.yy",},"order":9,},
+    {"id":{"name":"spr_title_title","path":"sprites/spr_title_title/spr_title_title.yy",},"order":8,},
-    {"id":{"name":"spr_text_arrow","path":"sprites/spr_text_arrow/spr_text_arrow.yy",},"order":7,},
+    {"id":{"name":"scr_initialize","path":"scripts/scr_initialize/scr_initialize.yy",},"order":12,},
+    {"id":{"name":"spr_text_arrow","path":"sprites/spr_text_arrow/spr_text_arrow.yy",},"order":1,},
     {"id":{"name":"fn_contact","path":"fonts/fn_contact/fn_contact.yy",},"order":0,},
-    {"id":{"name":"spr_title_moon","path":"sprites/spr_title_moon/spr_title_moon.yy",},"order":7,},
+    {"id":{"name":"spr_title_moon","path":"sprites/spr_title_moon/spr_title_moon.yy",},"order":6,},
-    {"id":{"name":"obj_title_star","path":"objects/obj_title_star/obj_title_star.yy",},"order":3,},
+    {"id":{"name":"obj_title_star","path":"objects/obj_title_star/obj_title_star.yy",},"order":2,},
-    {"id":{"name":"spr_text_box","path":"sprites/spr_text_box/spr_text_box.yy",},"order":1,},
+    {"id":{"name":"spr_text_box","path":"sprites/spr_text_box/spr_text_box.yy",},"order":2,},
-    {"id":{"name":"obj_title_title","path":"objects/obj_title_title/obj_title_title.yy",},"order":5,},
+    {"id":{"name":"obj_title_title","path":"objects/obj_title_title/obj_title_title.yy",},"order":4,},
     {"id":{"name":"obj_title_screen","path":"objects/obj_title_screen/obj_title_screen.yy",},"order":5,},
-    {"id":{"name":"obj_dialogue","path":"objects/obj_dialogue/obj_dialogue.yy",},"order":8,},
+    {"id":{"name":"obj_dialogue","path":"objects/obj_dialogue/obj_dialogue.yy",},"order":0,},
     {"id":{"name":"rm_title","path":"rooms/rm_title/rm_title.yy",},"order":0,},
   ],
   "Options": [
@@ -36,13 +39,14 @@
     "children": [],
   },
   "RoomOrderNodes": [
-    {"roomId":{"name":"Room3","path":"rooms/Room3/Room3.yy",},},
     {"roomId":{"name":"rm_disclaimer","path":"rooms/rm_disclaimer/rm_disclaimer.yy",},},
     {"roomId":{"name":"rm_title","path":"rooms/rm_title/rm_title.yy",},},
+    {"roomId":{"name":"Room3","path":"rooms/Room3/Room3.yy",},},
   ],
   "Folders": [
     {"folderPath":"folders/title.yy","order":2,"resourceVersion":"1.0","name":"title","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/disclaimer.yy","order":4,"resourceVersion":"1.0","name":"disclaimer","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/dialogue.yy","order":13,"resourceVersion":"1.0","name":"dialogue","tags":[],"resourceType":"GMFolder",},
   ],
   "AudioGroups": [
     {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",},