Temporarily backport app updates from apps repo

This commit is contained in:
Willy-JL
2023-11-12 11:06:02 +00:00
parent 79e7f491fe
commit e309fa8a88
1498 changed files with 1325977 additions and 20227 deletions

View File

@@ -6,6 +6,8 @@ App(
cdefines=["APP_TAMA_P1"],
requires=["gui", "storage"],
stack_size=2 * 1024,
fap_icon="tamaIcon.png",
order=215,
fap_file_assets="files"
fap_icon="tamaIcon4.png",
fap_category="Games",
)

Binary file not shown.

View File

@@ -4,7 +4,7 @@
#include "tamalib/tamalib.h"
#define TAG "TamaP1"
#define TAMA_ROM_PATH APP_DATA_PATH("rom.bin")
#define TAMA_ROM_PATH APP_ASSETS_PATH("rom.bin")
#define TAMA_SCREEN_SCALE_FACTOR 2
#define TAMA_LCD_ICON_SIZE 14
#define TAMA_LCD_ICON_MARGIN 1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@@ -8,7 +8,6 @@
#include "tamalib/tamalib.h"
#include "tama.h"
#include "compiled/assets_icons.h"
#include <assets_icons.h>
TamaApp* g_ctx;
FuriMutex* g_state_mutex;
@@ -837,9 +836,9 @@ int32_t tama_p1_app(void* p) {
btn_state_t tama_btn_state = 0; // BTN_STATE_RELEASED is 0
if(in_menu) {
// if(menu_cursor == 2 &&
// (event.input.key == InputKeyUp || event.input.key == InputKeyDown)) {
// tama_btn_state = BTN_STATE_RELEASED;
// if(menu_cursor >= 2 &&
// (event.input.key == InputKeyUp || event.input.key == InputKeyDown)) {
// tama_btn_state = BTN_STATE_RELEASED;
// }
if(event.input.key == InputKeyBack) {
tama_btn_state = BTN_STATE_RELEASED;
@@ -1135,7 +1134,7 @@ int32_t tama_p1_app(void* p) {
break;
}
}
} else { // out of menu // TODO: clean up code -.-
} else { // out of menu
if(event.input.key == InputKeyBack && event.input.type == InputTypeLong) {
if(speed != 1) {
speed = 1;