diff --git a/PLAYGROUND b/PLAYGROUND index 26ace449..5282e8ef 160000 --- a/PLAYGROUND +++ b/PLAYGROUND @@ -1 +1 @@ -Subproject commit 26ace449341eb4fc47d8d2ee7518b0afdfabb8a7 +Subproject commit 5282e8ef53b617acfe5167781fc6a5b246332ffa diff --git a/dolphin-RMselect/L1_New_year_128x64/frame_0.bm b/dolphin-RMselect/L1_New_year_128x64/frame_0.bm new file mode 100644 index 00000000..17f53095 Binary files /dev/null and b/dolphin-RMselect/L1_New_year_128x64/frame_0.bm differ diff --git a/dolphin-RMselect/L1_New_year_128x64/frame_1.bm b/dolphin-RMselect/L1_New_year_128x64/frame_1.bm new file mode 100644 index 00000000..a8c1277f Binary files /dev/null and b/dolphin-RMselect/L1_New_year_128x64/frame_1.bm differ diff --git a/dolphin-RMselect/L1_New_year_128x64/frame_2.bm b/dolphin-RMselect/L1_New_year_128x64/frame_2.bm new file mode 100644 index 00000000..ca1fa852 Binary files /dev/null and b/dolphin-RMselect/L1_New_year_128x64/frame_2.bm differ diff --git a/dolphin-RMselect/L1_New_year_128x64/frame_3.bm b/dolphin-RMselect/L1_New_year_128x64/frame_3.bm new file mode 100644 index 00000000..4b89c67a Binary files /dev/null and b/dolphin-RMselect/L1_New_year_128x64/frame_3.bm differ diff --git a/dolphin-RMselect/L1_New_year_128x64/meta.txt b/dolphin-RMselect/L1_New_year_128x64/meta.txt new file mode 100644 index 00000000..542392c1 --- /dev/null +++ b/dolphin-RMselect/L1_New_year_128x64/meta.txt @@ -0,0 +1,14 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 4 +Active frames: 0 +Frames order: 0 1 2 3 +Active cycles: 0 +Frame rate: 2 +Duration: 3600 +Active cooldown: 0 + +Bubble slots: 0 diff --git a/dolphin-RMselect/Sasquach_CloudG0ku_128x64/meta.txt b/dolphin-RMselect/Sasquach_CloudG0ku_128x64/meta.txt index dcbf7070..cb006d0e 100644 --- a/dolphin-RMselect/Sasquach_CloudG0ku_128x64/meta.txt +++ b/dolphin-RMselect/Sasquach_CloudG0ku_128x64/meta.txt @@ -6,9 +6,9 @@ Height: 64 Passive frames: 47 Active frames: 0 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 -Active cycles: 1 +Active cycles: 0 Frame rate: 5 Duration: 3600 -Active cooldown: 1 +Active cooldown: 0 Bubble slots: 0 diff --git a/dolphin-RMselect/manifest.txt b/dolphin-RMselect/manifest.txt index 74ec1ecb..9253e6fc 100644 --- a/dolphin-RMselect/manifest.txt +++ b/dolphin-RMselect/manifest.txt @@ -225,6 +225,13 @@ Min level: 1 Max level: 30 Weight: 7 +Name: L1_New_year_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 14 + Name: FelixTwoTone_Veemon_128x64 Min butthurt: 0 Max butthurt: 14 diff --git a/dolphin-minimal/L1_New_year_128x64/frame_0.bm b/dolphin-minimal/L1_New_year_128x64/frame_0.bm new file mode 100644 index 00000000..17f53095 Binary files /dev/null and b/dolphin-minimal/L1_New_year_128x64/frame_0.bm differ diff --git a/dolphin-minimal/L1_New_year_128x64/frame_1.bm b/dolphin-minimal/L1_New_year_128x64/frame_1.bm new file mode 100644 index 00000000..a8c1277f Binary files /dev/null and b/dolphin-minimal/L1_New_year_128x64/frame_1.bm differ diff --git a/dolphin-minimal/L1_New_year_128x64/frame_2.bm b/dolphin-minimal/L1_New_year_128x64/frame_2.bm new file mode 100644 index 00000000..ca1fa852 Binary files /dev/null and b/dolphin-minimal/L1_New_year_128x64/frame_2.bm differ diff --git a/dolphin-minimal/L1_New_year_128x64/frame_3.bm b/dolphin-minimal/L1_New_year_128x64/frame_3.bm new file mode 100644 index 00000000..4b89c67a Binary files /dev/null and b/dolphin-minimal/L1_New_year_128x64/frame_3.bm differ diff --git a/dolphin-minimal/L1_New_year_128x64/meta.txt b/dolphin-minimal/L1_New_year_128x64/meta.txt new file mode 100644 index 00000000..542392c1 --- /dev/null +++ b/dolphin-minimal/L1_New_year_128x64/meta.txt @@ -0,0 +1,14 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 4 +Active frames: 0 +Frames order: 0 1 2 3 +Active cycles: 0 +Frame rate: 2 +Duration: 3600 +Active cooldown: 0 + +Bubble slots: 0 diff --git a/dolphin-minimal/Sasquach_CloudG0ku_128x64/meta.txt b/dolphin-minimal/Sasquach_CloudG0ku_128x64/meta.txt index dcbf7070..cb006d0e 100644 --- a/dolphin-minimal/Sasquach_CloudG0ku_128x64/meta.txt +++ b/dolphin-minimal/Sasquach_CloudG0ku_128x64/meta.txt @@ -6,9 +6,9 @@ Height: 64 Passive frames: 47 Active frames: 0 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 -Active cycles: 1 +Active cycles: 0 Frame rate: 5 Duration: 3600 -Active cooldown: 1 +Active cooldown: 0 Bubble slots: 0 diff --git a/dolphin-minimal/manifest.txt b/dolphin-minimal/manifest.txt index 0b3022d9..3a7af660 100644 --- a/dolphin-minimal/manifest.txt +++ b/dolphin-minimal/manifest.txt @@ -50,6 +50,13 @@ Min level: 1 Max level: 30 Weight: 7 +Name: L1_New_year_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 14 + Name: L2_FlipperCity_128x64 Min butthurt: 0 Max butthurt: 14 @@ -57,6 +64,13 @@ Min level: 2 Max level: 30 Weight: 7 +Name: L3_FlipperMustache_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 3 +Max level: 30 +Weight: 7 + Name: L3_Fireplace_128x64 Min butthurt: 0 Max butthurt: 14 diff --git a/fw/OFW b/fw/OFW index 2a6a3a1b..e40376bc 160000 --- a/fw/OFW +++ b/fw/OFW @@ -1 +1 @@ -Subproject commit 2a6a3a1bf7ba1ecb42b8cbfc1b1856a54f2878b7 +Subproject commit e40376bc630baf5119c3633546f995637451dd84 diff --git a/fw/RogueMasterWApps b/fw/RogueMasterWApps index 6077b433..cf03e952 160000 --- a/fw/RogueMasterWApps +++ b/fw/RogueMasterWApps @@ -1 +1 @@ -Subproject commit 6077b433f3dcad6d255948032de749b9108a171e +Subproject commit cf03e952a54fd152dffc7145cad7955763c92fb9 diff --git a/fw/unleashed b/fw/unleashed index 0ed29016..dfbd9784 160000 --- a/fw/unleashed +++ b/fw/unleashed @@ -1 +1 @@ -Subproject commit 0ed290161d466a06ce1aea16c5432af06f437b84 +Subproject commit dfbd978466d54bbc4929bbc23d13ed3a50dc5021 diff --git a/infrared b/infrared index 5f40e6c0..e9bb94fb 160000 --- a/infrared +++ b/infrared @@ -1 +1 @@ -Subproject commit 5f40e6c0f430ea673b7c7495a858229f5bacf4ec +Subproject commit e9bb94fba6e797cb24270d1854fe0cd5cdd3e249 diff --git a/nfc/Amiibo b/nfc/Amiibo index eedd9af7..04adaafb 160000 --- a/nfc/Amiibo +++ b/nfc/Amiibo @@ -1 +1 @@ -Subproject commit eedd9af784ddd549bd7fe9d988c4f9ffd653b263 +Subproject commit 04adaafbdfea15fd6ab765d86b4305612781ecac