Jolty and headache billy sprite

Sylveondev · Oct 30, 2023 · 31aa403 · 31aa403
1 parent 53d0b43
commit 31aa403
Show file tree

Hide file tree

Showing 13 changed files with 696 additions and 7,054 deletions.
diff --git a/art/animate/RECOVER_vaporeon.fla b/art/animate/RECOVER_vaporeon.fla
diff --git a/art/animate/jolteon.fla b/art/animate/jolteon.fla
diff --git a/art/animate/vaporeon2.fla b/art/animate/vaporeon2.fla
diff --git a/assets/preload/characters/jolteon.json b/assets/preload/characters/jolteon.json
@@ -1,66 +1,67 @@
 {
 	"animations": [
 		{
-			"loop": false,
 			"offsets": [
 				-40,
 				-70
 			],
-			"anim": "idle",
+			"loop": false,
 			"fps": 24,
-			"name": "idle",
-			"indices": []
+			"anim": "idle",
+			"indices": [],
+			"name": "idle"
 		},
 		{
+			"loop": false,
 			"offsets": [
-				-51,
-				-81
+				-96,
+				-83
 			],
-			"indices": [],
-			"fps": 24,
 			"anim": "singRIGHT",
-			"loop": false,
-			"name": "right0"
+			"fps": 24,
+			"name": "right0",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
-				-6,
-				-50
+				-85,
+				-36
 			],
-			"indices": [],
-			"fps": 24,
 			"anim": "singUP",
-			"loop": false,
-			"name": "up0"
+			"fps": 24,
+			"name": "up0",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
-				17,
-				-62
+				-45,
+				-85
 			],
-			"indices": [],
-			"fps": 24,
 			"anim": "singDOWN",
-			"loop": false,
-			"name": "down0"
+			"fps": 24,
+			"name": "down0",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
-				42,
-				-62
+				1,
+				-69
 			],
-			"indices": [],
-			"fps": 24,
 			"anim": "singLEFT",
-			"loop": false,
-			"name": "left0"
+			"fps": 24,
+			"name": "left0",
+			"indices": []
 		}
 	],
 	"no_antialiasing": false,
 	"image": "characters/jolteon",
+	"isPlayable": false,
 	"position": [
-		100,
-		230
+		0,
+		180
 	],
 	"healthicon": "jolteon",
 	"flip_x": false,
@@ -70,9 +71,9 @@
 		73
 	],
 	"camera_position": [
-		-125,
-		0
+		-5,
+		120
 	],
 	"sing_duration": 4,
-	"scale": 1.55
+	"scale": 1.05
 }
diff --git a/assets/preload/characters/vaporeon-hurt.json b/assets/preload/characters/vaporeon-hurt.json
@@ -1,99 +1,100 @@
 {
 	"animations": [
 		{
-			"loop": false,
 			"offsets": [
 				0,
 				-20
 			],
-			"anim": "idle",
-			"fps": 24,
-			"name": "idle",
-			"indices": []
-		},
-		{
-			"offsets": [
-				36,
-				-20
-			],
 			"loop": false,
 			"fps": 24,
-			"anim": "faint",
+			"anim": "idle",
 			"indices": [],
-			"name": "fainting"
+			"name": "idle"
 		},
 		{
+			"loop": false,
 			"offsets": [
 				0,
-				-87
+				-24
 			],
-			"indices": [],
+			"anim": "singDOWN",
 			"fps": 24,
-			"anim": "headache",
-			"loop": false,
-			"name": "headache"
+			"name": "down0",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
-				0,
-				-170
+				3,
+				-20
 			],
-			"indices": [],
+			"anim": "singLEFT",
 			"fps": 24,
-			"anim": "faintLoop",
-			"loop": true,
-			"name": "faintLoop"
+			"name": "left0",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
-				-1,
-				-70
+				18,
+				-9
 			],
-			"indices": [],
+			"anim": "singUP",
 			"fps": 24,
-			"anim": "singDOWN",
-			"loop": false,
-			"name": "down0"
+			"name": "up0",
+			"indices": []
 		},
 		{
+			"loop": false,
 			"offsets": [
-				19,
+				-7,
 				-20
 			],
-			"indices": [],
+			"anim": "singRIGHT",
 			"fps": 24,
-			"anim": "singLEFT",
-			"loop": false,
-			"name": "left0"
+			"name": "right0",
+			"indices": []
 		},
 		{
 			"offsets": [
-				-1,
-				-8
+				0,
+				-24
 			],
-			"indices": [],
+			"loop": false,
 			"fps": 24,
-			"anim": "singUP",
+			"anim": "headache",
+			"indices": [],
+			"name": "high"
+		},
+		{
 			"loop": false,
-			"name": "up0"
+			"offsets": [
+				54,
+				-20
+			],
+			"anim": "faint",
+			"fps": 24,
+			"name": "faint0",
+			"indices": []
 		},
 		{
 			"offsets": [
-				-4,
+				54,
 				-20
 			],
 			"indices": [],
 			"fps": 24,
-			"anim": "singRIGHT",
+			"anim": "idle-alt",
 			"loop": false,
-			"name": "right0"
+			"name": "faintLoop"
 		}
 	],
 	"no_antialiasing": false,
 	"image": "characters/vaporeon2",
+	"isPlayable": true,
 	"position": [
 		0,
-		290
+		300
 	],
 	"healthicon": "vaporeon",
 	"flip_x": false,
@@ -107,5 +108,5 @@
 		100
 	],
 	"sing_duration": 4,
-	"scale": 1.05
+	"scale": 1.25
 }
diff --git a/assets/preload/data/headache/events.json b/assets/preload/data/headache/events.json
@@ -919,6 +919,13 @@
 						"Play Animation",
 						"faint",
 						"dad"
+					],
+					[
+						172392.857142857,
+						-1,
+						"Alt Idle Animation",
+						"dad",
+						"-alt"
 					]
 				],
 				"bpm": 0,
@@ -929,15 +936,16 @@
 				"lengthInSteps": 16,
 				"altAnim": false,
 				"typeOfSection": 0,
-				"sectionNotes": [
-					[
-						174214.285714286,
-						-1,
-						"Play Animation",
-						"faintLoop",
-						"dad"
-					]
-				],
+				"sectionNotes": [],
+				"bpm": 0,
+				"changeBPM": false,
+				"mustHitSection": false
+			},
+			{
+				"lengthInSteps": 16,
+				"altAnim": false,
+				"typeOfSection": 0,
+				"sectionNotes": [],
 				"bpm": 0,
 				"changeBPM": false,
 				"mustHitSection": false
@@ -954,7 +962,6 @@
 		],
 		"splashSkin": null,
 		"forceMiddlescroll": false,
-		"validScore": false,
 		"timebarColor": [
 			"0xFF1A3B75",
 			"0xFF55A1C2"