diff --git a/PLAYGROUND b/PLAYGROUND index d534578b..60d65cfd 160000 --- a/PLAYGROUND +++ b/PLAYGROUND @@ -1 +1 @@ -Subproject commit d534578b0ce64fccf62ca5f1a9ee7e8634e60d37 +Subproject commit 60d65cfd4d2f7a5b61ee446966346e41a46d01f4 diff --git a/dolphin/L2_FlipperCity_128x64/frame_0.bm b/dolphin/L2_FlipperCity_128x64/frame_0.bm new file mode 100644 index 00000000..436bc602 Binary files /dev/null and b/dolphin/L2_FlipperCity_128x64/frame_0.bm differ diff --git a/dolphin/L2_FlipperCity_128x64/frame_1.bm b/dolphin/L2_FlipperCity_128x64/frame_1.bm new file mode 100644 index 00000000..33228b8e Binary files /dev/null and b/dolphin/L2_FlipperCity_128x64/frame_1.bm differ diff --git a/dolphin/L2_FlipperCity_128x64/frame_2.bm b/dolphin/L2_FlipperCity_128x64/frame_2.bm new file mode 100644 index 00000000..d2133536 Binary files /dev/null and b/dolphin/L2_FlipperCity_128x64/frame_2.bm differ diff --git a/dolphin/L2_FlipperCity_128x64/frame_3.bm b/dolphin/L2_FlipperCity_128x64/frame_3.bm new file mode 100644 index 00000000..8c0430da Binary files /dev/null and b/dolphin/L2_FlipperCity_128x64/frame_3.bm differ diff --git a/dolphin/L2_FlipperCity_128x64/frame_4.bm b/dolphin/L2_FlipperCity_128x64/frame_4.bm new file mode 100644 index 00000000..78a5862a Binary files /dev/null and b/dolphin/L2_FlipperCity_128x64/frame_4.bm differ diff --git a/dolphin/L2_FlipperCity_128x64/frame_5.bm b/dolphin/L2_FlipperCity_128x64/frame_5.bm new file mode 100644 index 00000000..7702099d Binary files /dev/null and b/dolphin/L2_FlipperCity_128x64/frame_5.bm differ diff --git a/dolphin/L2_FlipperCity_128x64/frame_6.bm b/dolphin/L2_FlipperCity_128x64/frame_6.bm new file mode 100644 index 00000000..cda2e4d0 Binary files /dev/null and b/dolphin/L2_FlipperCity_128x64/frame_6.bm differ diff --git a/dolphin/L2_FlipperCity_128x64/frame_7.bm b/dolphin/L2_FlipperCity_128x64/frame_7.bm new file mode 100644 index 00000000..8c7910c8 Binary files /dev/null and b/dolphin/L2_FlipperCity_128x64/frame_7.bm differ diff --git a/dolphin/L2_FlipperCity_128x64/frame_8.bm b/dolphin/L2_FlipperCity_128x64/frame_8.bm new file mode 100644 index 00000000..9cb48300 Binary files /dev/null and b/dolphin/L2_FlipperCity_128x64/frame_8.bm differ diff --git a/dolphin/L2_FlipperCity_128x64/frame_9.bm b/dolphin/L2_FlipperCity_128x64/frame_9.bm new file mode 100644 index 00000000..538c4edb Binary files /dev/null and b/dolphin/L2_FlipperCity_128x64/frame_9.bm differ diff --git a/dolphin/L2_FlipperCity_128x64/meta.txt b/dolphin/L2_FlipperCity_128x64/meta.txt new file mode 100644 index 00000000..fdddbdb2 --- /dev/null +++ b/dolphin/L2_FlipperCity_128x64/meta.txt @@ -0,0 +1,14 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 10 +Active frames: 0 +Frames order: 0 1 2 3 4 5 6 7 8 9 +Active cycles: 0 +Frame rate: 4 +Duration: 3600 +Active cooldown: 0 + +Bubble slots: 0 diff --git a/dolphin/README.md b/dolphin/README.md index 405ebaa9..cbe88dcb 100644 --- a/dolphin/README.md +++ b/dolphin/README.md @@ -9,6 +9,8 @@ - Assets: Includes New Dolphin Animations: [BulmFlash, G0ku Pat Pat and Sail0rM00n (By RogueMaster)] (hidden) - Assets: Includes New Dolphin Animations: [ChiChi, G0ku Pew and R0shi (By RogueMaster)] - Assets: Includes New Dolphin Animations: [Narut0 (By Sasquach)] +- Assets: Includes New Dolphin Animations: [Blaster (By Sasquach)] +- Assets: Includes New Dolphin Animations: [Flipper City (By Svaarich)] ## REPOSITORIES FOR OTHER ANIMATION CREATORS: ## [Kuronons Flipper Animations](https://github.com/Kuronons/FZ_graphics) diff --git a/dolphin/Sasquach_Blaster_128x64/frame_0.bm b/dolphin/Sasquach_Blaster_128x64/frame_0.bm new file mode 100644 index 00000000..26ceb2a0 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_0.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_1.bm b/dolphin/Sasquach_Blaster_128x64/frame_1.bm new file mode 100644 index 00000000..40a3d0cc Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_1.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_10.bm b/dolphin/Sasquach_Blaster_128x64/frame_10.bm new file mode 100644 index 00000000..725745f2 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_10.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_11.bm b/dolphin/Sasquach_Blaster_128x64/frame_11.bm new file mode 100644 index 00000000..afb3371d Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_11.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_12.bm b/dolphin/Sasquach_Blaster_128x64/frame_12.bm new file mode 100644 index 00000000..f44a8eba Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_12.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_13.bm b/dolphin/Sasquach_Blaster_128x64/frame_13.bm new file mode 100644 index 00000000..56edda3a Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_13.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_14.bm b/dolphin/Sasquach_Blaster_128x64/frame_14.bm new file mode 100644 index 00000000..dda4a03d Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_14.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_15.bm b/dolphin/Sasquach_Blaster_128x64/frame_15.bm new file mode 100644 index 00000000..4cae28ee Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_15.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_16.bm b/dolphin/Sasquach_Blaster_128x64/frame_16.bm new file mode 100644 index 00000000..ed734f97 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_16.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_17.bm b/dolphin/Sasquach_Blaster_128x64/frame_17.bm new file mode 100644 index 00000000..a1b104b6 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_17.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_18.bm b/dolphin/Sasquach_Blaster_128x64/frame_18.bm new file mode 100644 index 00000000..c2b5ccfa Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_18.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_19.bm b/dolphin/Sasquach_Blaster_128x64/frame_19.bm new file mode 100644 index 00000000..4dbe1f5b Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_19.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_2.bm b/dolphin/Sasquach_Blaster_128x64/frame_2.bm new file mode 100644 index 00000000..f648fa70 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_2.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_20.bm b/dolphin/Sasquach_Blaster_128x64/frame_20.bm new file mode 100644 index 00000000..8af9496c Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_20.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_21.bm b/dolphin/Sasquach_Blaster_128x64/frame_21.bm new file mode 100644 index 00000000..d2daa049 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_21.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_22.bm b/dolphin/Sasquach_Blaster_128x64/frame_22.bm new file mode 100644 index 00000000..ce5b37e3 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_22.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_23.bm b/dolphin/Sasquach_Blaster_128x64/frame_23.bm new file mode 100644 index 00000000..f5c3d705 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_23.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_24.bm b/dolphin/Sasquach_Blaster_128x64/frame_24.bm new file mode 100644 index 00000000..f63ce2f6 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_24.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_25.bm b/dolphin/Sasquach_Blaster_128x64/frame_25.bm new file mode 100644 index 00000000..943b552e Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_25.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_26.bm b/dolphin/Sasquach_Blaster_128x64/frame_26.bm new file mode 100644 index 00000000..9ec485d4 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_26.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_27.bm b/dolphin/Sasquach_Blaster_128x64/frame_27.bm new file mode 100644 index 00000000..df5e2342 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_27.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_28.bm b/dolphin/Sasquach_Blaster_128x64/frame_28.bm new file mode 100644 index 00000000..984d2e10 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_28.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_29.bm b/dolphin/Sasquach_Blaster_128x64/frame_29.bm new file mode 100644 index 00000000..06a9fee7 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_29.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_3.bm b/dolphin/Sasquach_Blaster_128x64/frame_3.bm new file mode 100644 index 00000000..1916ff3a Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_3.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_30.bm b/dolphin/Sasquach_Blaster_128x64/frame_30.bm new file mode 100644 index 00000000..8d16733a Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_30.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_31.bm b/dolphin/Sasquach_Blaster_128x64/frame_31.bm new file mode 100644 index 00000000..dba885d7 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_31.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_32.bm b/dolphin/Sasquach_Blaster_128x64/frame_32.bm new file mode 100644 index 00000000..e3d15b3d Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_32.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_33.bm b/dolphin/Sasquach_Blaster_128x64/frame_33.bm new file mode 100644 index 00000000..cd0336c4 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_33.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_34.bm b/dolphin/Sasquach_Blaster_128x64/frame_34.bm new file mode 100644 index 00000000..a8751909 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_34.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_35.bm b/dolphin/Sasquach_Blaster_128x64/frame_35.bm new file mode 100644 index 00000000..47652cf7 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_35.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_36.bm b/dolphin/Sasquach_Blaster_128x64/frame_36.bm new file mode 100644 index 00000000..53297966 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_36.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_37.bm b/dolphin/Sasquach_Blaster_128x64/frame_37.bm new file mode 100644 index 00000000..4dc494c7 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_37.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_38.bm b/dolphin/Sasquach_Blaster_128x64/frame_38.bm new file mode 100644 index 00000000..a6db87dd Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_38.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_39.bm b/dolphin/Sasquach_Blaster_128x64/frame_39.bm new file mode 100644 index 00000000..f6d79cec Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_39.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_4.bm b/dolphin/Sasquach_Blaster_128x64/frame_4.bm new file mode 100644 index 00000000..93274b2a Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_4.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_40.bm b/dolphin/Sasquach_Blaster_128x64/frame_40.bm new file mode 100644 index 00000000..74d91212 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_40.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_41.bm b/dolphin/Sasquach_Blaster_128x64/frame_41.bm new file mode 100644 index 00000000..97bb337b Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_41.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_42.bm b/dolphin/Sasquach_Blaster_128x64/frame_42.bm new file mode 100644 index 00000000..5dcd3304 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_42.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_43.bm b/dolphin/Sasquach_Blaster_128x64/frame_43.bm new file mode 100644 index 00000000..e54cacc1 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_43.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_44.bm b/dolphin/Sasquach_Blaster_128x64/frame_44.bm new file mode 100644 index 00000000..b163792b Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_44.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_45.bm b/dolphin/Sasquach_Blaster_128x64/frame_45.bm new file mode 100644 index 00000000..03af60f5 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_45.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_46.bm b/dolphin/Sasquach_Blaster_128x64/frame_46.bm new file mode 100644 index 00000000..9fc20eda Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_46.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_47.bm b/dolphin/Sasquach_Blaster_128x64/frame_47.bm new file mode 100644 index 00000000..ae965264 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_47.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_48.bm b/dolphin/Sasquach_Blaster_128x64/frame_48.bm new file mode 100644 index 00000000..e9257844 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_48.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_49.bm b/dolphin/Sasquach_Blaster_128x64/frame_49.bm new file mode 100644 index 00000000..815a6b06 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_49.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_5.bm b/dolphin/Sasquach_Blaster_128x64/frame_5.bm new file mode 100644 index 00000000..3d094a31 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_5.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_6.bm b/dolphin/Sasquach_Blaster_128x64/frame_6.bm new file mode 100644 index 00000000..5939bd84 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_6.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_7.bm b/dolphin/Sasquach_Blaster_128x64/frame_7.bm new file mode 100644 index 00000000..07b44007 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_7.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_8.bm b/dolphin/Sasquach_Blaster_128x64/frame_8.bm new file mode 100644 index 00000000..b0708dcb Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_8.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/frame_9.bm b/dolphin/Sasquach_Blaster_128x64/frame_9.bm new file mode 100644 index 00000000..7f6bea16 Binary files /dev/null and b/dolphin/Sasquach_Blaster_128x64/frame_9.bm differ diff --git a/dolphin/Sasquach_Blaster_128x64/meta.txt b/dolphin/Sasquach_Blaster_128x64/meta.txt new file mode 100644 index 00000000..708e0191 --- /dev/null +++ b/dolphin/Sasquach_Blaster_128x64/meta.txt @@ -0,0 +1,14 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 50 +Active frames: 1 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 0 +Active cycles: 1 +Frame rate: 6 +Duration: 3600 +Active cooldown: 1 + +Bubble slots: 0 diff --git a/dolphin/manifest.txt b/dolphin/manifest.txt index 00281b95..18a04003 100644 --- a/dolphin/manifest.txt +++ b/dolphin/manifest.txt @@ -64,6 +64,13 @@ Min level: 18 Max level: 30 Weight: 0 +Name: Sasquach_Blaster_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 7 + Name: Sasquach_Naruto_128x64 Min butthurt: 0 Max butthurt: 5 @@ -293,7 +300,14 @@ Min butthurt: 0 Max butthurt: 13 Min level: 10 Max level: 30 -Weight: 5 +Weight: 7 + +Name: L2_FlipperCity_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 2 +Max level: 30 +Weight: 7 Name: L1_DJ_128x64 Min butthurt: 0 diff --git a/fw/RogueMasterWApps b/fw/RogueMasterWApps index 158e3c69..e5650f8f 160000 --- a/fw/RogueMasterWApps +++ b/fw/RogueMasterWApps @@ -1 +1 @@ -Subproject commit 158e3c69f75fa0103f105d6266106cdb1d60bf14 +Subproject commit e5650f8f4869fd385072a613fef1252729588f0a diff --git a/fw/unleashed b/fw/unleashed index 4b8221d8..016ebd3a 160000 --- a/fw/unleashed +++ b/fw/unleashed @@ -1 +1 @@ -Subproject commit 4b8221d8132628b5c4e813d963e7315887c3a84c +Subproject commit 016ebd3afc466ed5f2d4089e85eb19a8fec4d8b8 diff --git a/infrared b/infrared index f3b81776..767b469c 160000 --- a/infrared +++ b/infrared @@ -1 +1 @@ -Subproject commit f3b81776c3718b134fa2f776a4f7f3300574e9f3 +Subproject commit 767b469c87ea7a14472b7a12cb451bf2281039d8