scan ps1 vmp cards and saves

CMakeLists.txt

@@ -17,7 +17,7 @@ if(APOLLO_ENABLE_LOGGING)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DAPOLLO_ENABLE_LOGGING")
 endif()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11 -G0")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 include_directories(

README.md

@@ -104,6 +104,8 @@ The Online Database project aims to [add more save-games](https://github.com/buc
 * [Dnawrkshp](https://github.com/Dnawrkshp/): [Artemis PS3](https://github.com/Dnawrkshp/ArtemisPS3)
 * [Berion](https://www.psx-place.com/members/berion.1431/): GUI design
 * [flatz](https://github.com/flatz): [SFO tools](https://github.com/bucanero/pfd_sfo_tools/)
+* Draan/[Proxima](https://github.com/ProximaV): [KIRK engine](https://github.com/ProximaV/kirk-engine-full)
+* [ShendoXT](https://github.com/ShendoXT): [MemcardRex](https://github.com/ShendoXT/memcardrex)
 * [aldostools](https://aldostools.org/): [Bruteforce Save Data](https://bruteforcesavedata.forumms.net/)
 * [PiNk/abyss](http://amigascne.org/abyss/pink/index.html): [Background music track](https://github.com/bucanero/apollo-ps2/blob/main/data/inside.ahx)
 

include/kirk_engine.h

@@ -202,10 +202,9 @@ int kirk_CMD10(u8* inbuff, int insize);
 int kirk_CMD11(u8* outbuff, u8* inbuff, int size);
 int kirk_CMD14(u8* outbuff, int outsize);
 
-int kirk_init(); //CMD 0xF?
+int kirk_init(void); //CMD 0xF?
 
 //sce-like funcs
-int sceUtilsSetFuseID(u8*fuse);
 int sceUtilsBufferCopyWithRange(u8* outbuff, int outsize, u8* inbuff, int insize, int cmd);
 
 #endif

include/menu.h

@@ -13,7 +13,7 @@ extern SDL_Renderer* renderer;
 enum menu_screen_ids
 {
 	MENU_MAIN_SCREEN,		/* 0 - Main Menu */
-	MENU_TROPHIES,			/* 1 - Trophies */
+	MENU_VMC_SAVES,			/* 1 - PS1 VMP Menu */
 	MENU_USB_SAVES,			/* 2 - USB Menu (User List) */
 	MENU_HDD_SAVES,			/* 3 - HDD Menu (User List) */
 	MENU_ONLINE_DB,			/* 4 - Online Menu (Online List) */
@@ -70,7 +70,7 @@ enum texture_index
 	tag_own_png_index,
 	tag_pce_png_index,
 	tag_ps1_png_index,
-	tag_ps2_png_index,
+	tag_vmc_png_index,
 	tag_psp_png_index,
 	tag_warning_png_index,
 	tag_transfer_png_index,
@@ -245,6 +245,7 @@ extern void Draw_MainMenu_Ani(void);
 extern void Draw_HexEditor(const hexedit_data_t* hex);
 extern void Draw_HexEditor_Ani(const hexedit_data_t* hex);
 int LoadMenuTexture(const char* path, int idx);
+void LoadRawTexture(int idx, void* data, int width, int height);
 void initMenuOptions(void);
 
 void drawScene(void);

include/saves.h

@@ -16,6 +16,8 @@
 #define USER_PATH_HDD           "PSP/SAVEDATA/"
 
 #define PSP_SAVES_PATH_USB      "APOLLO/SAVEDATA/"
+#define PS1_SAVES_PATH_USB      "PS1/SAVEDATA/"
+#define PS3_SAVES_PATH_USB      "PS3/EXPORT/PSV/"
 #define PS1_SAVES_PATH_HDD      APOLLO_PATH "PS1/"
 #define PSP_SAVES_PATH_HDD      USB_PATH USER_PATH_HDD
 
@@ -75,11 +77,14 @@ enum cmd_code_enum
     CMD_EXP_VMP2MCR,
     CMD_EXP_PSPKEY,
     CMD_DUMP_PSPKEY,
+    CMD_EXP_VMCSAVE,
+    CMD_EXP_SAVES_VMC,
+    CMD_EXP_ALL_SAVES_VMC,
 
 // Import commands
     CMD_CONV_CSO2ISO,
-    CMD_IMP_MCR2VMP0,
-    CMD_IMP_MCR2VMP1,
+    CMD_IMP_MCR2VMP,
+    CMD_IMP_VMCSAVE,
     CMD_EXTRACT_ARCHIVE,
     CMD_URL_DOWNLOAD,
     CMD_NET_WEBSERVER,
@@ -96,7 +101,7 @@ enum cmd_code_enum
 #define SAVE_FLAG_SELECTED      2
 #define SAVE_FLAG_ZIP           4
 #define SAVE_FLAG_PS1           8
-#define SAVE_FLAG_PS2           16
+#define SAVE_FLAG_VMC           16
 #define SAVE_FLAG_PSP           32
 #define SAVE_FLAG_ISO           64
 #define SAVE_FLAG_CSO           128
@@ -105,7 +110,7 @@ enum cmd_code_enum
 enum save_type_enum
 {
     FILE_TYPE_NULL,
-    FILE_TYPE_PSV,
+    FILE_TYPE_PS1,
     FILE_TYPE_MENU,
     FILE_TYPE_PSP,
 
@@ -115,7 +120,7 @@ enum save_type_enum
     // License Files
     FILE_TYPE_PRX,
     FILE_TYPE_NET,
-    FILE_TYPE_ACT,
+    FILE_TYPE_VMC,
 
     // ISO Files
     FILE_TYPE_ISO,
@@ -126,7 +131,7 @@ enum char_flag_enum
 {
     CHAR_TAG_NULL,
     CHAR_TAG_PS1,
-    CHAR_TAG_PS2,
+    CHAR_TAG_VMC,
     CHAR_TAG_UNUSED1,
     CHAR_TAG_PSP,
     CHAR_TAG_UNUSED2,
@@ -189,14 +194,14 @@ list_t * ReadUsbList(const char* userPath);
 list_t * ReadUserList(const char* userPath);
 list_t * ReadOnlineList(const char* urlPath);
 list_t * ReadBackupList(const char* userPath);
-list_t * ReadTrophyList(const char* userPath);
+list_t * ReadVmcList(const char* userPath);
 void UnloadGameList(list_t * list);
 char * readTextFile(const char * path, long* size);
 int sortSaveList_Compare(const void* A, const void* B);
 int sortSaveList_Compare_TitleID(const void* A, const void* B);
 int sortCodeList_Compare(const void* A, const void* B);
 int ReadCodes(save_entry_t * save);
-int ReadTrophies(save_entry_t * game);
+int ReadVmcCodes(save_entry_t * game);
 int ReadOnlineSaves(save_entry_t * game);
 int ReadBackupCodes(save_entry_t * bup);
 
@@ -235,3 +240,5 @@ int vmp_resign(const char *src_vmp);
 int psv_resign(const char *src_psv);
 int ps1_mcr2vmp(const char* mcrfile, const char* vmp_path);
 int ps1_vmp2mcr(const char* vmpfile, const char* mcr_path);
+
+char* sjis2utf8(char* input);