diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c index 8cf4619f5..ad4b11c66 100644 --- a/applications/services/desktop/animations/animation_manager.c +++ b/applications/services/desktop/animations/animation_manager.c @@ -15,7 +15,7 @@ #define TAG "AnimationManager" -#define HARDCODED_ANIMATION_NAME "infomercial_128x64" +#define HARDCODED_ANIMATION_NAME "sfw_128x64" #define NO_SD_ANIMATION_NAME "L1_NoSd_128x49" #define BAD_BATTERY_ANIMATION_NAME "L1_BadBattery_128x47" diff --git a/applications/services/desktop/views/desktop_view_lock_menu.c b/applications/services/desktop/views/desktop_view_lock_menu.c index 7f9329bd2..f05fe0c32 100644 --- a/applications/services/desktop/views/desktop_view_lock_menu.c +++ b/applications/services/desktop/views/desktop_view_lock_menu.c @@ -87,9 +87,9 @@ void desktop_lock_menu_draw_callback(Canvas* canvas, void* model) { // str = "Games Mode"; } else if(i == DesktopLockMenuIndexDummy) { if(m->dummy_mode) { - str = "Brainiac Mode"; + str = "NSFW Mode"; } else { - str = "Dummy Mode"; + str = "SFW Mode"; } } diff --git a/applications/services/desktop/views/desktop_view_main.c b/applications/services/desktop/views/desktop_view_main.c index 685a04d35..e3cfc8ad2 100644 --- a/applications/services/desktop/views/desktop_view_main.c +++ b/applications/services/desktop/views/desktop_view_main.c @@ -116,27 +116,18 @@ bool desktop_main_input_callback(InputEvent* event, void* context) { } else { if(event->type == InputTypeShort) { if(event->key == InputKeyOk) { - main_view->callback(DesktopMainEventOpenSnake, main_view->context); // OPENS SNAKE + main_view->callback(DesktopMainEventOpenMenu, main_view->context); } else if(event->key == InputKeyUp) { main_view->callback(DesktopMainEventOpenLockMenu, main_view->context); } else if(event->key == InputKeyDown) { - main_view->callback( - DesktopMainEventOpenTetris, main_view->context); // OPENS Tetris + main_view->callback(DesktopMainEventOpenArchive, main_view->context); } else if(event->key == InputKeyLeft) { - main_view->callback( - DesktopMainEventOpenArkanoid, main_view->context); // OPENS Arkanoid - } - } else if(event->type == InputTypeLong) { - if(event->key == InputKeyOk) { - main_view->callback(DesktopAnimationEventNewIdleAnimation, main_view->context); - } else if(event->key == InputKeyUp) { - main_view->callback(DesktopMainEventOpenDOOM, main_view->context); // OPENS DOOM - } else if(event->key == InputKeyDown) { - main_view->callback( - DesktopMainEventOpenZombiez, main_view->context); // OPENS Zombiez - } else if(event->key == InputKeyLeft) { - main_view->callback( - DesktopMainEventOpenHeap, main_view->context); // OPENS Heap Defence + main_view->callback(DesktopMainEventOpenClock, main_view->context); // OPENS Clock + } else if(event->key == InputKeyRight) { + // Right key is handled by animation manager + // GOES TO PASSPORT NO MATTER WHAT + // THIS DOESNT WORK, PASSPORT WILL ONLY OPEN ON REGULAR RIGHT, NOTHING CAN GET ASSIGNED HERE + main_view->callback(DesktopMainEventOpenPassport, main_view->context); } } } diff --git a/assets/dolphin/internal/infomercial_128x64/frame_0.png b/assets/dolphin/internal/infomercial_128x64/frame_0.png deleted file mode 100644 index e9ece83af..000000000 Binary files a/assets/dolphin/internal/infomercial_128x64/frame_0.png and /dev/null differ diff --git a/assets/dolphin/internal/infomercial_128x64/frame_1.png b/assets/dolphin/internal/infomercial_128x64/frame_1.png deleted file mode 100644 index e9ece83af..000000000 Binary files a/assets/dolphin/internal/infomercial_128x64/frame_1.png and /dev/null differ diff --git a/assets/dolphin/internal/infomercial_128x64/meta.txt b/assets/dolphin/internal/infomercial_128x64/meta.txt deleted file mode 100644 index 81e278d4b..000000000 --- a/assets/dolphin/internal/infomercial_128x64/meta.txt +++ /dev/null @@ -1,14 +0,0 @@ -Filetype: Flipper Animation -Version: 1 - -Width: 128 -Height: 64 -Passive frames: 2 -Active frames: 0 -Frames order: 0 1 -Active cycles: 0 -Frame rate: 2 -Duration: 3600 -Active cooldown: 0 - -Bubble slots: 0 \ No newline at end of file diff --git a/assets/dolphin/internal/manifest.txt b/assets/dolphin/internal/manifest.txt index ecd3ac5a4..46f873a84 100644 --- a/assets/dolphin/internal/manifest.txt +++ b/assets/dolphin/internal/manifest.txt @@ -2,7 +2,7 @@ Filetype: Flipper Animation Manifest Version: 1 # Animation 1 -Name: infomercial_128x64 +Name: sfw_128x64 Min butthurt: 0 Max butthurt: 14 Min level: 1 diff --git a/assets/dolphin/internal/sfw_128x64/frame_0.png b/assets/dolphin/internal/sfw_128x64/frame_0.png new file mode 100644 index 000000000..5273ad9f4 Binary files /dev/null and b/assets/dolphin/internal/sfw_128x64/frame_0.png differ diff --git a/assets/dolphin/internal/sfw_128x64/frame_1.png b/assets/dolphin/internal/sfw_128x64/frame_1.png new file mode 100644 index 000000000..57649b861 Binary files /dev/null and b/assets/dolphin/internal/sfw_128x64/frame_1.png differ diff --git a/assets/dolphin/internal/sfw_128x64/frame_10.png b/assets/dolphin/internal/sfw_128x64/frame_10.png new file mode 100644 index 000000000..37d18fd5a Binary files /dev/null and b/assets/dolphin/internal/sfw_128x64/frame_10.png differ diff --git a/assets/dolphin/internal/sfw_128x64/frame_2.png b/assets/dolphin/internal/sfw_128x64/frame_2.png new file mode 100644 index 000000000..df0ee8058 Binary files /dev/null and b/assets/dolphin/internal/sfw_128x64/frame_2.png differ diff --git a/assets/dolphin/internal/sfw_128x64/frame_3.png b/assets/dolphin/internal/sfw_128x64/frame_3.png new file mode 100644 index 000000000..5a2badb34 Binary files /dev/null and b/assets/dolphin/internal/sfw_128x64/frame_3.png differ diff --git a/assets/dolphin/internal/sfw_128x64/frame_4.png b/assets/dolphin/internal/sfw_128x64/frame_4.png new file mode 100644 index 000000000..86b3020a0 Binary files /dev/null and b/assets/dolphin/internal/sfw_128x64/frame_4.png differ diff --git a/assets/dolphin/internal/sfw_128x64/frame_5.png b/assets/dolphin/internal/sfw_128x64/frame_5.png new file mode 100644 index 000000000..57124a3fd Binary files /dev/null and b/assets/dolphin/internal/sfw_128x64/frame_5.png differ diff --git a/assets/dolphin/internal/sfw_128x64/frame_6.png b/assets/dolphin/internal/sfw_128x64/frame_6.png new file mode 100644 index 000000000..91926bb94 Binary files /dev/null and b/assets/dolphin/internal/sfw_128x64/frame_6.png differ diff --git a/assets/dolphin/internal/sfw_128x64/frame_7.png b/assets/dolphin/internal/sfw_128x64/frame_7.png new file mode 100644 index 000000000..a1146ced6 Binary files /dev/null and b/assets/dolphin/internal/sfw_128x64/frame_7.png differ diff --git a/assets/dolphin/internal/sfw_128x64/frame_8.png b/assets/dolphin/internal/sfw_128x64/frame_8.png new file mode 100644 index 000000000..1af0ce93b Binary files /dev/null and b/assets/dolphin/internal/sfw_128x64/frame_8.png differ diff --git a/assets/dolphin/internal/sfw_128x64/frame_9.png b/assets/dolphin/internal/sfw_128x64/frame_9.png new file mode 100644 index 000000000..b8ff0e6fa Binary files /dev/null and b/assets/dolphin/internal/sfw_128x64/frame_9.png differ diff --git a/assets/resources/dolphin/fireplace/meta.txt b/assets/dolphin/internal/sfw_128x64/meta.txt similarity index 67% rename from assets/resources/dolphin/fireplace/meta.txt rename to assets/dolphin/internal/sfw_128x64/meta.txt index 7f4d20a0f..b8a080c97 100644 --- a/assets/resources/dolphin/fireplace/meta.txt +++ b/assets/dolphin/internal/sfw_128x64/meta.txt @@ -3,11 +3,11 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 8 +Passive frames: 11 Active frames: 0 -Frames order: 0 1 2 3 4 5 6 7 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 Active cycles: 0 -Frame rate: 3 +Frame rate: 7 Duration: 3600 Active cooldown: 0 diff --git a/assets/resources/dolphin/Skynet/frame_0.bm b/assets/resources/dolphin/Skynet/frame_0.bm deleted file mode 100644 index 5c55b7cdb..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_0.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_1.bm b/assets/resources/dolphin/Skynet/frame_1.bm deleted file mode 100644 index 1ae586f6b..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_1.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_10.bm b/assets/resources/dolphin/Skynet/frame_10.bm deleted file mode 100644 index b79abd18f..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_10.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_11.bm b/assets/resources/dolphin/Skynet/frame_11.bm deleted file mode 100644 index 635055216..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_11.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_12.bm b/assets/resources/dolphin/Skynet/frame_12.bm deleted file mode 100644 index 604814a0f..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_12.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_13.bm b/assets/resources/dolphin/Skynet/frame_13.bm deleted file mode 100644 index f8cdd4f69..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_13.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_14.bm b/assets/resources/dolphin/Skynet/frame_14.bm deleted file mode 100644 index 5dd74fb55..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_14.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_15.bm b/assets/resources/dolphin/Skynet/frame_15.bm deleted file mode 100644 index 5f2145816..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_15.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_16.bm b/assets/resources/dolphin/Skynet/frame_16.bm deleted file mode 100644 index c427417ed..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_16.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_17.bm b/assets/resources/dolphin/Skynet/frame_17.bm deleted file mode 100644 index a46d0ec08..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_17.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_18.bm b/assets/resources/dolphin/Skynet/frame_18.bm deleted file mode 100644 index 5df1c40f2..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_18.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_19.bm b/assets/resources/dolphin/Skynet/frame_19.bm deleted file mode 100644 index 3a7516202..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_19.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_2.bm b/assets/resources/dolphin/Skynet/frame_2.bm deleted file mode 100644 index 9047776ba..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_2.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_20.bm b/assets/resources/dolphin/Skynet/frame_20.bm deleted file mode 100644 index cbae67bf1..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_20.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_21.bm b/assets/resources/dolphin/Skynet/frame_21.bm deleted file mode 100644 index d07c80c62..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_21.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_22.bm b/assets/resources/dolphin/Skynet/frame_22.bm deleted file mode 100644 index a3d94c368..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_22.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_23.bm b/assets/resources/dolphin/Skynet/frame_23.bm deleted file mode 100644 index 4c4314247..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_23.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_24.bm b/assets/resources/dolphin/Skynet/frame_24.bm deleted file mode 100644 index def0f6e72..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_24.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_25.bm b/assets/resources/dolphin/Skynet/frame_25.bm deleted file mode 100644 index 5888a6036..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_25.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_26.bm b/assets/resources/dolphin/Skynet/frame_26.bm deleted file mode 100644 index cc2b0d44e..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_26.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_27.bm b/assets/resources/dolphin/Skynet/frame_27.bm deleted file mode 100644 index edf23912f..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_27.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_28.bm b/assets/resources/dolphin/Skynet/frame_28.bm deleted file mode 100644 index 0f41c2d36..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_28.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_29.bm b/assets/resources/dolphin/Skynet/frame_29.bm deleted file mode 100644 index ba9815588..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_29.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_3.bm b/assets/resources/dolphin/Skynet/frame_3.bm deleted file mode 100644 index 52fcfde05..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_3.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_30.bm b/assets/resources/dolphin/Skynet/frame_30.bm deleted file mode 100644 index d16564385..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_30.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_4.bm b/assets/resources/dolphin/Skynet/frame_4.bm deleted file mode 100644 index 92c7bbc8d..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_4.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_5.bm b/assets/resources/dolphin/Skynet/frame_5.bm deleted file mode 100644 index bf2e7f118..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_5.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_6.bm b/assets/resources/dolphin/Skynet/frame_6.bm deleted file mode 100644 index ab0ea10ae..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_6.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_7.bm b/assets/resources/dolphin/Skynet/frame_7.bm deleted file mode 100644 index e9d2b83bf..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_7.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_8.bm b/assets/resources/dolphin/Skynet/frame_8.bm deleted file mode 100644 index ce8fe8eca..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_8.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/frame_9.bm b/assets/resources/dolphin/Skynet/frame_9.bm deleted file mode 100644 index cfba8d2a0..000000000 Binary files a/assets/resources/dolphin/Skynet/frame_9.bm and /dev/null differ diff --git a/assets/resources/dolphin/Skynet/meta.txt b/assets/resources/dolphin/Skynet/meta.txt deleted file mode 100644 index 9a46da82d..000000000 --- a/assets/resources/dolphin/Skynet/meta.txt +++ /dev/null @@ -1,14 +0,0 @@ -Filetype: Flipper Animation -Version: 1 - -Width: 128 -Height: 64 -Passive frames: 6 -Active frames: 48 -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 22 23 24 25 26 27 28 29 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 -Active cycles: 1 -Frame rate: 8 -Duration: 3600 -Active cooldown: 1 - -Bubble slots: 0 diff --git a/assets/resources/dolphin/fireplace/frame_0.bm b/assets/resources/dolphin/fireplace/frame_0.bm deleted file mode 100644 index 8d94f351e..000000000 Binary files a/assets/resources/dolphin/fireplace/frame_0.bm and /dev/null differ diff --git a/assets/resources/dolphin/fireplace/frame_1.bm b/assets/resources/dolphin/fireplace/frame_1.bm deleted file mode 100644 index dc81be9b0..000000000 Binary files a/assets/resources/dolphin/fireplace/frame_1.bm and /dev/null differ diff --git a/assets/resources/dolphin/fireplace/frame_2.bm b/assets/resources/dolphin/fireplace/frame_2.bm deleted file mode 100644 index ef880108e..000000000 Binary files a/assets/resources/dolphin/fireplace/frame_2.bm and /dev/null differ diff --git a/assets/resources/dolphin/fireplace/frame_3.bm b/assets/resources/dolphin/fireplace/frame_3.bm deleted file mode 100644 index a3bd736a2..000000000 Binary files a/assets/resources/dolphin/fireplace/frame_3.bm and /dev/null differ diff --git a/assets/resources/dolphin/fireplace/frame_4.bm b/assets/resources/dolphin/fireplace/frame_4.bm deleted file mode 100644 index 0eec932d6..000000000 Binary files a/assets/resources/dolphin/fireplace/frame_4.bm and /dev/null differ diff --git a/assets/resources/dolphin/fireplace/frame_5.bm b/assets/resources/dolphin/fireplace/frame_5.bm deleted file mode 100644 index 91c7773b0..000000000 Binary files a/assets/resources/dolphin/fireplace/frame_5.bm and /dev/null differ diff --git a/assets/resources/dolphin/fireplace/frame_6.bm b/assets/resources/dolphin/fireplace/frame_6.bm deleted file mode 100644 index a0429f7e9..000000000 Binary files a/assets/resources/dolphin/fireplace/frame_6.bm and /dev/null differ diff --git a/assets/resources/dolphin/fireplace/frame_7.bm b/assets/resources/dolphin/fireplace/frame_7.bm deleted file mode 100644 index b2ada57a8..000000000 Binary files a/assets/resources/dolphin/fireplace/frame_7.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_0.bm b/assets/resources/dolphin/mods/frame_0.bm deleted file mode 100644 index eb0435241..000000000 Binary files a/assets/resources/dolphin/mods/frame_0.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_1.bm b/assets/resources/dolphin/mods/frame_1.bm deleted file mode 100644 index 9988e18a0..000000000 Binary files a/assets/resources/dolphin/mods/frame_1.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_10.bm b/assets/resources/dolphin/mods/frame_10.bm deleted file mode 100644 index fdf7d1665..000000000 Binary files a/assets/resources/dolphin/mods/frame_10.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_11.bm b/assets/resources/dolphin/mods/frame_11.bm deleted file mode 100644 index 645703a17..000000000 Binary files a/assets/resources/dolphin/mods/frame_11.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_12.bm b/assets/resources/dolphin/mods/frame_12.bm deleted file mode 100644 index 7ee0db1f8..000000000 Binary files a/assets/resources/dolphin/mods/frame_12.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_13.bm b/assets/resources/dolphin/mods/frame_13.bm deleted file mode 100644 index 2055cd974..000000000 Binary files a/assets/resources/dolphin/mods/frame_13.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_14.bm b/assets/resources/dolphin/mods/frame_14.bm deleted file mode 100644 index f1d511ba6..000000000 Binary files a/assets/resources/dolphin/mods/frame_14.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_15.bm b/assets/resources/dolphin/mods/frame_15.bm deleted file mode 100644 index f108180b8..000000000 Binary files a/assets/resources/dolphin/mods/frame_15.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_16.bm b/assets/resources/dolphin/mods/frame_16.bm deleted file mode 100644 index 9ed1f5520..000000000 Binary files a/assets/resources/dolphin/mods/frame_16.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_17.bm b/assets/resources/dolphin/mods/frame_17.bm deleted file mode 100644 index 2b19f5f25..000000000 Binary files a/assets/resources/dolphin/mods/frame_17.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_18.bm b/assets/resources/dolphin/mods/frame_18.bm deleted file mode 100644 index 43c8c42a0..000000000 Binary files a/assets/resources/dolphin/mods/frame_18.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_19.bm b/assets/resources/dolphin/mods/frame_19.bm deleted file mode 100644 index 554d4cca8..000000000 Binary files a/assets/resources/dolphin/mods/frame_19.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_2.bm b/assets/resources/dolphin/mods/frame_2.bm deleted file mode 100644 index 19c045034..000000000 Binary files a/assets/resources/dolphin/mods/frame_2.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_20.bm b/assets/resources/dolphin/mods/frame_20.bm deleted file mode 100644 index 9af692ea6..000000000 Binary files a/assets/resources/dolphin/mods/frame_20.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_21.bm b/assets/resources/dolphin/mods/frame_21.bm deleted file mode 100644 index a3a91bc35..000000000 Binary files a/assets/resources/dolphin/mods/frame_21.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_22.bm b/assets/resources/dolphin/mods/frame_22.bm deleted file mode 100644 index 6699b7525..000000000 Binary files a/assets/resources/dolphin/mods/frame_22.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_23.bm b/assets/resources/dolphin/mods/frame_23.bm deleted file mode 100644 index 8dc4812d4..000000000 Binary files a/assets/resources/dolphin/mods/frame_23.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_24.bm b/assets/resources/dolphin/mods/frame_24.bm deleted file mode 100644 index 3ef5e556e..000000000 Binary files a/assets/resources/dolphin/mods/frame_24.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_25.bm b/assets/resources/dolphin/mods/frame_25.bm deleted file mode 100644 index 2d48abcda..000000000 Binary files a/assets/resources/dolphin/mods/frame_25.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_26.bm b/assets/resources/dolphin/mods/frame_26.bm deleted file mode 100644 index 2e491d991..000000000 Binary files a/assets/resources/dolphin/mods/frame_26.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_27.bm b/assets/resources/dolphin/mods/frame_27.bm deleted file mode 100644 index 63cf443bc..000000000 Binary files a/assets/resources/dolphin/mods/frame_27.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_28.bm b/assets/resources/dolphin/mods/frame_28.bm deleted file mode 100644 index 23e28db93..000000000 Binary files a/assets/resources/dolphin/mods/frame_28.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_29.bm b/assets/resources/dolphin/mods/frame_29.bm deleted file mode 100644 index db54d6e42..000000000 Binary files a/assets/resources/dolphin/mods/frame_29.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_3.bm b/assets/resources/dolphin/mods/frame_3.bm deleted file mode 100644 index 4c7f7b7de..000000000 Binary files a/assets/resources/dolphin/mods/frame_3.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_30.bm b/assets/resources/dolphin/mods/frame_30.bm deleted file mode 100644 index afda830df..000000000 Binary files a/assets/resources/dolphin/mods/frame_30.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_31.bm b/assets/resources/dolphin/mods/frame_31.bm deleted file mode 100644 index ec9b2c0d0..000000000 Binary files a/assets/resources/dolphin/mods/frame_31.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_32.bm b/assets/resources/dolphin/mods/frame_32.bm deleted file mode 100644 index 0757af4f1..000000000 Binary files a/assets/resources/dolphin/mods/frame_32.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_33.bm b/assets/resources/dolphin/mods/frame_33.bm deleted file mode 100644 index b1411659c..000000000 Binary files a/assets/resources/dolphin/mods/frame_33.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_34.bm b/assets/resources/dolphin/mods/frame_34.bm deleted file mode 100644 index 0f4dd9c27..000000000 Binary files a/assets/resources/dolphin/mods/frame_34.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_35.bm b/assets/resources/dolphin/mods/frame_35.bm deleted file mode 100644 index 3298ab216..000000000 Binary files a/assets/resources/dolphin/mods/frame_35.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_36.bm b/assets/resources/dolphin/mods/frame_36.bm deleted file mode 100644 index 58be4e0d8..000000000 Binary files a/assets/resources/dolphin/mods/frame_36.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_37.bm b/assets/resources/dolphin/mods/frame_37.bm deleted file mode 100644 index cfbe16d18..000000000 Binary files a/assets/resources/dolphin/mods/frame_37.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_38.bm b/assets/resources/dolphin/mods/frame_38.bm deleted file mode 100644 index 14c557d06..000000000 Binary files a/assets/resources/dolphin/mods/frame_38.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_39.bm b/assets/resources/dolphin/mods/frame_39.bm deleted file mode 100644 index 789a82339..000000000 Binary files a/assets/resources/dolphin/mods/frame_39.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_4.bm b/assets/resources/dolphin/mods/frame_4.bm deleted file mode 100644 index 42dd423a8..000000000 Binary files a/assets/resources/dolphin/mods/frame_4.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_40.bm b/assets/resources/dolphin/mods/frame_40.bm deleted file mode 100644 index 376b1b8b2..000000000 Binary files a/assets/resources/dolphin/mods/frame_40.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_5.bm b/assets/resources/dolphin/mods/frame_5.bm deleted file mode 100644 index 4fdfdf8ab..000000000 Binary files a/assets/resources/dolphin/mods/frame_5.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_6.bm b/assets/resources/dolphin/mods/frame_6.bm deleted file mode 100644 index a27687b5d..000000000 Binary files a/assets/resources/dolphin/mods/frame_6.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_7.bm b/assets/resources/dolphin/mods/frame_7.bm deleted file mode 100644 index 248dabbc6..000000000 Binary files a/assets/resources/dolphin/mods/frame_7.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_8.bm b/assets/resources/dolphin/mods/frame_8.bm deleted file mode 100644 index 5a46b96dc..000000000 Binary files a/assets/resources/dolphin/mods/frame_8.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/frame_9.bm b/assets/resources/dolphin/mods/frame_9.bm deleted file mode 100644 index 4fe07c9b1..000000000 Binary files a/assets/resources/dolphin/mods/frame_9.bm and /dev/null differ diff --git a/assets/resources/dolphin/mods/meta.txt b/assets/resources/dolphin/mods/meta.txt deleted file mode 100644 index c9c35ee41..000000000 --- a/assets/resources/dolphin/mods/meta.txt +++ /dev/null @@ -1,14 +0,0 @@ -Filetype: Flipper Animation -Version: 1 - -Width: 128 -Height: 64 -Passive frames: 23 -Active frames: 18 -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 -Active cycles: 1 -Frame rate: 2 -Duration: 3600 -Active cooldown: 7 - -Bubble slots: 0 diff --git a/assets/dolphin/external/no_lvl_up_manifest.txt b/assets/resources/dolphin/no_lvl_up_manifest.txt similarity index 100% rename from assets/dolphin/external/no_lvl_up_manifest.txt rename to assets/resources/dolphin/no_lvl_up_manifest.txt diff --git a/fbt_options.py b/fbt_options.py index 4598cb2ed..c9e400a47 100644 --- a/fbt_options.py +++ b/fbt_options.py @@ -14,7 +14,7 @@ DEBUG = 0 # Suffix to add to files when building distribution # If OS environment has DIST_SUFFIX set, it will be used instead -DIST_SUFFIX = "XFW-0025_12232022" +DIST_SUFFIX = "XFW-0026_12232022" # Coprocessor firmware COPRO_OB_DATA = "scripts/ob.data"