diff --git a/Makefile b/Makefile index b538fba7..e3ff72dd 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,8 @@ LIBS = -lvorbisfile -lvorbis -logg -lftpvita -lvita2d -lpng -ljpeg -lz -lm -lc - -lSceHttp_stub -lSceMusicExport_stub -lSceNet_stub -lSceNetCtl_stub \ -lSceSsl_stub -lSceSysmodule_stub -lScePhotoExport_stub -lScePower_stub \ -lScePgf_stub libpromoter/libScePromoterUtil_stub.a \ - -lSceAudio_stub -lSceAudiodec_stub -lSceTouch_stub -lSceShellSvc_stub + -lSceAudio_stub -lSceAudiodec_stub -lSceTouch_stub -lSceShellSvc_stub \ + -lHENkaku_stub PREFIX = arm-vita-eabi CC = $(PREFIX)-gcc diff --git a/henkaku_config.h b/henkaku_config.h index cda5fd7e..91506e33 100644 --- a/henkaku_config.h +++ b/henkaku_config.h @@ -22,7 +22,7 @@ #define HENKAKU_CONFIG_MAGIC 0x4C434C4D #define HENKAKU_VERSION 8 -#define HENKAKU_DEFAULT_VERSION_STRING "3.61" +#define HENKAKU_DEFAULT_VERSION_STRING "3.63" typedef struct { int magic; diff --git a/init.c b/init.c index a5ed6022..58196e42 100644 --- a/init.c +++ b/init.c @@ -22,9 +22,8 @@ #include "package_installer.h" #include "utils.h" - INCLUDE_EXTERN_RESOURCE(changeinfo_txt); - +/* INCLUDE_EXTERN_RESOURCE(vita_game_card_png); INCLUDE_EXTERN_RESOURCE(vita_game_card_storage_png); INCLUDE_EXTERN_RESOURCE(memory_card_png); @@ -50,8 +49,7 @@ INCLUDE_EXTERN_RESOURCE(txt_file_png); INCLUDE_EXTERN_RESOURCE(music_file_png); INCLUDE_EXTERN_RESOURCE(title_bar_bg_png); INCLUDE_EXTERN_RESOURCE(updir_png); - - +*/ INCLUDE_EXTERN_RESOURCE(folder_icon_png); INCLUDE_EXTERN_RESOURCE(file_icon_png); INCLUDE_EXTERN_RESOURCE(archive_icon_png); @@ -80,7 +78,7 @@ INCLUDE_EXTERN_RESOURCE(english_us_txt); static DefaultFile default_files[] = { DEFAULT_FILE("ux0:VitaShell/language/english_us.txt", english_us_txt), - +/* DEFAULT_FILE("ux0:VitaShell/theme/Default/vita_game_card.png", vita_game_card_png), DEFAULT_FILE("ux0:VitaShell/theme/Default/vita_game_card_storage.png", vita_game_card_storage_png), DEFAULT_FILE("ux0:VitaShell/theme/Default/memory_card.png", memory_card_png), @@ -106,7 +104,7 @@ static DefaultFile default_files[] = { DEFAULT_FILE("ux0:VitaShell/theme/Default/music_file.png", music_file_png), DEFAULT_FILE("ux0:VitaShell/theme/Default/title_bar_bg.png", title_bar_bg_png), DEFAULT_FILE("ux0:VitaShell/theme/Default/updir.png", updir_png), - +*/ DEFAULT_FILE("ux0:VitaShell/theme/theme.txt", theme_txt), DEFAULT_FILE("ux0:VitaShell/theme/Default/colors.txt", colors_txt), DEFAULT_FILE("ux0:VitaShell/theme/Default/folder_icon.png", folder_icon_png), diff --git a/settings.c b/settings.c index c0ed3dff..35638ac2 100644 --- a/settings.c +++ b/settings.c @@ -215,6 +215,8 @@ void closeSettingsMenu() { henkaku_config.version = HENKAKU_VERSION; WriteFile(henkaku_config_path, &henkaku_config, sizeof(HENkakuConfig)); + + henkaku_reload_config(); } saveSettingsConfig(); diff --git a/theme.c b/theme.c index d9b4a594..c9e8767c 100644 --- a/theme.c +++ b/theme.c @@ -24,7 +24,7 @@ INCLUDE_EXTERN_RESOURCE(colors_txt); INCLUDE_EXTERN_RESOURCE(colors_txt_size); - +/* INCLUDE_EXTERN_RESOURCE(vita_game_card_png); INCLUDE_EXTERN_RESOURCE(vita_game_card_storage_png); INCLUDE_EXTERN_RESOURCE(memory_card_png); @@ -50,7 +50,7 @@ INCLUDE_EXTERN_RESOURCE(txt_file_png); INCLUDE_EXTERN_RESOURCE(music_file_png); INCLUDE_EXTERN_RESOURCE(title_bar_bg_png); INCLUDE_EXTERN_RESOURCE(updir_png); - +*/ INCLUDE_EXTERN_RESOURCE(folder_icon_png); INCLUDE_EXTERN_RESOURCE(file_icon_png); INCLUDE_EXTERN_RESOURCE(archive_icon_png); @@ -190,7 +190,7 @@ ThemeImage theme_images[] = { { "fastforward.png", &_binary_resources_fastforward_png_start, &fastforward_image }, { "fastrewind.png", &_binary_resources_fastrewind_png_start, &fastrewind_image }, { "wallpaper.png", NULL, &wallpaper_image }, - + /* { "bg_wallpaper.png", &_binary_resources_bg_wallpaper_png_start, &default_wallpaper }, { "vita_game_card.png", &_binary_resources_vita_game_card_png_start, &game_card_image }, { "vita_game_card_storage.png", &_binary_resources_vita_game_card_storage_png_start, &game_card_storage_image }, @@ -214,6 +214,7 @@ ThemeImage theme_images[] = { { "txt_file.png", &_binary_resources_txt_file_png_start, &txt_file_image }, { "title_bar_bg.png", &_binary_resources_title_bar_bg_png_start, &title_bar_bg_image }, { "updir.png", &_binary_resources_updir_png_start, &updir_image }, + */ }; #define N_THEME_IMAGES (sizeof(theme_images) / sizeof(ThemeImage))