diff --git a/ReadMe.md b/ReadMe.md index 8ab96ef5c..acd02e26c 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -25,6 +25,7 @@ - Assets: Includes New Dolphin Animations: [M3gamanZ3r0 Battle (By RogueMaster)] - Assets: Includes New Dolphin Animations: [OP G3ar 4 (By RogueMaster)] - Assets: Includes New Dolphin Animations: [Kirbs (By RogueMaster)] +- Assets: Includes New Dolphin Animations: [Kirbs Confused (By RogueMaster)]
TO DO
@@ -102,7 +103,7 @@ $ ./fbt plugin_dist FIRMWARE_APP_SET=ext_apps - Archive: FAPs are now launchable from Archive [By RogueMaster], thanks xMasterX for the suggestion - Assets: Includes a NFC Level 50 Gan0n Amiibo - Assets: Includes a NFC Rick Roll link -- Assets: Includes New Dolphin Animations: [Rick Roll, Matrix & Swim animations (By qqMajiKpp)], [Rukamon 2x and Agumon animations (By Syrius)], [Mew (By Arkaivos)], [Eye of the Flipper (By Kuronons)], [Shodan (By qqMajiKpp)], [Sirene & The Witch (By Haseo)], [Dino & A New Hope (By Haseo)], [Earth Arcadia (By Kuronons)], [Kuronons Black Flags Collection (21 Animations)(By Kuronons)], [D.Va (By Haseo)], [GITS (By Haseo)], [Slayers (By qqMajiKpp)], [P0liwhirl (By Panzer00Z)], [RogueMaster CFW Animation (By Kuronons)], [Nyan Cat (By Haseo)], [L (By Kuronons)], [Laughing Man (By Kuronons)], [B0ws3r (By Haseo)], [Kuronons Black Flags Collection VOL 2 (9 Animations)(By Kuronons)], [Thanks for all the fish (By qqMajiKpp)], [OCP, Skynet and Weyland (By Kuronons)], [Mario (By Haseo)], [Umbrella (By Haseo)], [Trioptimum (By qqMajiKpp)], [Tyrell & Cyberdyne (By Kuronons)], [Allen & Maha (By Haseo)], [Starfield (By qqMajiKpp)], [DJ (By ut1s)], [Fireplace (By Friend of xMasterX)], [Akira & Mad Scientist (By qqMajiKpp)], [Shar!ngan (By Haseo)], [Lions Roar (By qqMajiKpp)], [0ne Pi3ce (By Haseo)], [Calcifier & Last Unicorn (By NeonKodama)], [Jiji Milk (By NeonKodama)] & [Kam3Ham3Ha, Kirbs, M3gamanZ3r0 Battle & OP G3ar 4 (By RogueMaster)] +- Assets: Includes New Dolphin Animations: [Rick Roll, Matrix & Swim animations (By qqMajiKpp)], [Rukamon 2x and Agumon animations (By Syrius)], [Mew (By Arkaivos)], [Eye of the Flipper (By Kuronons)], [Shodan (By qqMajiKpp)], [Sirene & The Witch (By Haseo)], [Dino & A New Hope (By Haseo)], [Earth Arcadia (By Kuronons)], [Kuronons Black Flags Collection (21 Animations)(By Kuronons)], [D.Va (By Haseo)], [GITS (By Haseo)], [Slayers (By qqMajiKpp)], [P0liwhirl (By Panzer00Z)], [RogueMaster CFW Animation (By Kuronons)], [Nyan Cat (By Haseo)], [L (By Kuronons)], [Laughing Man (By Kuronons)], [B0ws3r (By Haseo)], [Kuronons Black Flags Collection VOL 2 (9 Animations)(By Kuronons)], [Thanks for all the fish (By qqMajiKpp)], [OCP, Skynet and Weyland (By Kuronons)], [Mario (By Haseo)], [Umbrella (By Haseo)], [Trioptimum (By qqMajiKpp)], [Tyrell & Cyberdyne (By Kuronons)], [Allen & Maha (By Haseo)], [Starfield (By qqMajiKpp)], [DJ (By ut1s)], [Fireplace (By Friend of xMasterX)], [Akira & Mad Scientist (By qqMajiKpp)], [Shar!ngan (By Haseo)], [Lions Roar (By qqMajiKpp)], [0ne Pi3ce (By Haseo)], [Calcifier & Last Unicorn (By NeonKodama)], [Jiji Milk (By NeonKodama)] & [Kam3Ham3Ha, Kirbs, Kirbs Confused, M3gamanZ3r0 Battle & OP G3ar 4 (By RogueMaster)] - Assets: Includes sample Music Player tunes - Assets: Includes sample SubGHz assets for Crosswalk, Handicap Doors, Sextoys, Tesla Charge Port, and Unitree Go1 Robot Dog - Assets: Includes Sonic Screw Driver sound for the Wav Player diff --git a/assets/resources/dolphin/RM_Kam3ham3ha_128x64/meta.txt b/assets/resources/dolphin/RM_Kam3ham3ha_128x64/meta.txt index 0d26de258..1b2c52406 100644 --- a/assets/resources/dolphin/RM_Kam3ham3ha_128x64/meta.txt +++ b/assets/resources/dolphin/RM_Kam3ham3ha_128x64/meta.txt @@ -9,6 +9,6 @@ Frames order: 0 0 0 1 1 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 21 Active cycles: 1 Frame rate: 9 Duration: 3600 -Active cooldown: 0 +Active cooldown: 1 Bubble slots: 0 diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_0.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_0.bm new file mode 100644 index 000000000..5e91ef15a Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_0.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_1.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_1.bm new file mode 100644 index 000000000..3604d84f8 Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_1.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_10.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_10.bm new file mode 100644 index 000000000..6d2e1bf24 Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_10.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_11.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_11.bm new file mode 100644 index 000000000..18855f99e Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_11.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_12.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_12.bm new file mode 100644 index 000000000..c3a851af9 Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_12.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_13.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_13.bm new file mode 100644 index 000000000..83e830cdd Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_13.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_14.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_14.bm new file mode 100644 index 000000000..c5cd3da76 Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_14.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_15.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_15.bm new file mode 100644 index 000000000..e49fdc9ab Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_15.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_16.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_16.bm new file mode 100644 index 000000000..2b3a47384 Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_16.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_17.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_17.bm new file mode 100644 index 000000000..0dcca119b Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_17.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_18.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_18.bm new file mode 100644 index 000000000..80b25c446 Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_18.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_19.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_19.bm new file mode 100644 index 000000000..02368d1dc Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_19.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_2.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_2.bm new file mode 100644 index 000000000..606f14b4a Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_2.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_3.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_3.bm new file mode 100644 index 000000000..201c277b5 Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_3.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_4.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_4.bm new file mode 100644 index 000000000..c20f911d7 Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_4.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_5.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_5.bm new file mode 100644 index 000000000..ca58139db Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_5.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_6.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_6.bm new file mode 100644 index 000000000..6d3df34c6 Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_6.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_7.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_7.bm new file mode 100644 index 000000000..6f5534c4d Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_7.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_8.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_8.bm new file mode 100644 index 000000000..f15e99ba6 Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_8.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_9.bm b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_9.bm new file mode 100644 index 000000000..2a52368f3 Binary files /dev/null and b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/frame_9.bm differ diff --git a/assets/resources/dolphin/RM_Kirbs_Confused_128x64/meta.txt b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/meta.txt new file mode 100644 index 000000000..64adc896a --- /dev/null +++ b/assets/resources/dolphin/RM_Kirbs_Confused_128x64/meta.txt @@ -0,0 +1,14 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 9 +Active frames: 11 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 +Active cycles: 1 +Frame rate: 4 +Duration: 3600 +Active cooldown: 5 + +Bubble slots: 0 diff --git a/assets/resources/dolphin/RM_M3gamanZ3r0_Battle_128x64/meta.txt b/assets/resources/dolphin/RM_M3gamanZ3r0_Battle_128x64/meta.txt index e6ae00ba1..8a91a1fec 100644 --- a/assets/resources/dolphin/RM_M3gamanZ3r0_Battle_128x64/meta.txt +++ b/assets/resources/dolphin/RM_M3gamanZ3r0_Battle_128x64/meta.txt @@ -9,6 +9,6 @@ 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 2 Active cycles: 1 Frame rate: 4 Duration: 3600 -Active cooldown: 1 +Active cooldown: 7 Bubble slots: 0 diff --git a/assets/resources/dolphin/manifest.txt b/assets/resources/dolphin/manifest.txt index 5fe202d4c..a51d8502d 100644 --- a/assets/resources/dolphin/manifest.txt +++ b/assets/resources/dolphin/manifest.txt @@ -1,6 +1,13 @@ Filetype: Flipper Animation Manifest Version: 1 +Name: RM_Kirbs_Confused_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 7 + Name: RM_Kirbs_128x64 Min butthurt: 0 Max butthurt: 14