update

CHANGELOG.md

@@ -4,6 +4,32 @@ All notable changes to the `apollo-ps3` project will be documented in this file.
 
 ## [Unreleased]()
 
+## [v2.0.2](https://github.com/bucanero/apollo-ps3/releases/tag/v2.0.2) - 2024-11-23
+
+### Added
+
+* Delete PS3 saves from USB
+* PS2 Virtual Memory Card images (VMC)
+  - Support additional import formats: `.XPS`, `.CBS`, `.MAX`, `.SPS`
+* Online DB: show PS1 icons
+* User Tools:
+  - Convert PS1/PS2 saves to `.PSV` format
+  - Convert `.PSV` saves to `.MCS`/`.PSU` formats
+  - Re-sign `.PSV` saves
+
+### Fixed
+
+* "Copy to HDD" option now only available when browsing USB saves
+
+### Misc
+
+* Updated Apollo Patch Engine to v1.1.2
+  - Fixed SW Code search bug when bytes are not found
+* Option to launch an external app
+  - (L1 + START) executes `/dev_hdd0/game/NP0APOLLO/USRDIR/EXTRA.SELF`
+
+---
+
 ## [v2.0.0](https://github.com/bucanero/apollo-ps3/releases/tag/v2.0.0) - 2024-04-10
 
 ### Added
@@ -27,7 +53,7 @@ All notable changes to the `apollo-ps3` project will be documented in this file.
   - FIFA 18
   - FIFA 19
 
-### Fixes
+### Fixed
 
 * Patch Code fixes
   - Metal Gear Solid 5: The Phantom Pain

README.md

@@ -53,14 +53,16 @@ This homebrew application allows you to download, unlock, patch and resign save-
 
 * **VMC saves management:** quick access to all save files on Virtual Memory Cards images.
   - Supported PS1 VMC formats: `.VMP`, `.MCR`, `.VM1`, `.BIN`, `.VMC`, `.GME`, `.VGS`, `.SRM`, `.MCD`
-* **VMC saves import/export:** allows the user export saves on VMC images to `.MCS`/`.PSV`/`.PSX` formats, and import saves to VMCs from other tools and consoles (`.MCS`, `.PSV`, `.PSX`, `.PS1`, `.MCB`, `.PDA` supported).
+* **Import PS1 saves:** import saves to PS1 VMCs from other systems and consoles (`.MCS`, `.PSV`, `.PSX`, `.PS1`, `.MCB`, `.PDA` supported).
+* **Export PS1 saves:** allows the user export saves on VMC images to `.MCS`/`.PSV`/`.PSX` formats.
 
 ## PS2 Virtual Memory Card Management
 
 * **VMC saves management:** quick access to all save files on Virtual Memory Cards images.
   - Supported PS2 VMC formats: `.VM2`, `.VME`, `.BIN`, `.VMC`
-  - Supports ECC and non-ECC images, PS2 Classics encryption
-* **VMC saves import/export:** allows the user export saves on VMC images to `.PSU`, `.PSV` formats, and import saves to VMCs from other tools and consoles (`.PSU`, `.PSV` supported).
+  - Supports ECC and non-ECC images, and PS2 Classics encryption
+* **Import PS2 saves:** import saves to PS2 VMCs from other systems and consoles (`.PSU`, `.PSV`, `.XPS`, `.CBS`, `.MAX`, `.SPS` supported).
+* **Export PS2 saves:** allows the user export saves on VMC images to `.PSU` and `.PSV` formats.
 
 # Download
 

docs/README.md

@@ -10,7 +10,7 @@ This homebrew application allows you to download, unlock, patch and resign save-
 
 ![image](./screenshots/screenshot_main.png)
 
-**Comments, ideas, suggestions?** You can contact [me](https://github.com/bucanero/) on [Twitter](https://twitter.com/dparrino) and on [my website](http://www.bucanero.com.ar/).
+**Comments, ideas, suggestions?** You can [contact me](https://github.com/bucanero/) on [Twitter](https://twitter.com/dparrino) and on [my website](http://www.bucanero.com.ar/).
 
 # Features
 
@@ -39,7 +39,7 @@ This homebrew application allows you to download, unlock, patch and resign save-
 
 * **Account activation:** create fake Account ID and generate offline PS3 activation (`act.dat`)
 * **License exporting:** easy backup of user licenses to `.zip` and `.rap` formats.
-* **License importing:** allows to import `.rap` files to user `.rif` licenses.
+* **License importing:** allows to import `.rap` files and generate user `.rif` licenses.
 
 ## PS2 Classics Management
 
@@ -49,6 +49,21 @@ This homebrew application allows you to download, unlock, patch and resign save-
 * **CONFIG importing:** import PS2 `.CONFIG` files to `.ENC` encrypted format.
 * **BIN.ENC exporting:** decrypt and export `BIN.ENC` images to `.ISO`.
 
+## PS1 Virtual Memory Card Management
+
+* **VMC saves management:** quick access to all save files on Virtual Memory Cards images.
+  - Supported PS1 VMC formats: `.VMP`, `.MCR`, `.VM1`, `.BIN`, `.VMC`, `.GME`, `.VGS`, `.SRM`, `.MCD`
+* **Import PS1 saves:** import saves to PS1 VMCs from other systems and consoles (`.MCS`, `.PSV`, `.PSX`, `.PS1`, `.MCB`, `.PDA` supported).
+* **Export PS1 saves:** allows the user export saves on VMC images to `.MCS`/`.PSV`/`.PSX` formats.
+
+## PS2 Virtual Memory Card Management
+
+* **VMC saves management:** quick access to all save files on Virtual Memory Cards images.
+  - Supported PS2 VMC formats: `.VM2`, `.VME`, `.BIN`, `.VMC`
+  - Supports ECC and non-ECC images, and PS2 Classics encryption
+* **Import PS2 saves:** import saves to PS2 VMCs from other systems and consoles (`.PSU`, `.PSV`, `.XPS`, `.CBS`, `.MAX`, `.SPS` supported).
+* **Export PS2 saves:** allows the user export saves on VMC images to `.PSU` and `.PSV` formats.
+
 # Download
 
 Get the [latest version here][app_latest].
@@ -82,7 +97,7 @@ On first run, the application will detect and setup the required user settings.
 | PS2 | Folder |
 |-----|--------|
 | **USB saves** | `/dev_usb00x/PS2/SAVEDATA/` (`*.xps`, `*.max`, `*.psu`, `*.cbs`, `*.sps`) |
-| **VMC cards** | `/dev_usb00x/PS2/VMC/` (`*.vmc`) |
+| **VMC cards** | `/dev_usb00x/PS2/VMC/` (`*.vmc`, `*.vme`, `*.vm2`, `*.bin`) |
 | **VME cards** | `/dev_usb00x/PS3/EXPORT/PS2SD/` |
 | **PSV saves** | `/dev_usb00x/PS3/EXPORT/PSV/` |
 | **HDD VME cards** | `/dev_hdd0/home/000000XX/ps2emu2_savedata/`, where `XX` is the current `User ID`. |
@@ -97,6 +112,7 @@ On first run, the application will detect and setup the required user settings.
 | **USB saves** | `/dev_usb00x/PS1/SAVEDATA/` (`*.mcs`, `*.psx`) |
 | **PSV saves** | `/dev_usb00x/PS3/EXPORT/PSV/` |
 | **HDD VM1 cards** | `/dev_hdd0/savedata/vmc/` |
+| **USB VMC cards** | `/dev_usb00x/PS1/VMC/` (`*.mcr`, `*.vmp`, `*.bin`, `*.vmc`, `*.gme`, `*.vgs`, `*.srm`, `*.mcd`) |
 
 # Usage
 
@@ -177,6 +193,8 @@ Currently, the list of available games and files is limited, but the project aim
 * [flatz](https://github.com/flatz): [SFO/PFD tools](https://github.com/bucanero/pfd_sfo_tools/)
 * [aldostools](https://aldostools.org/): [Bruteforce Save Data](https://bruteforcesavedata.forumms.net/)
 * [darkautism](https://darkautism.blogspot.com/): [PS3TrophyIsGood](https://github.com/darkautism/PS3TrophyIsGood)
+* [jimmikaelkael](https://github.com/jimmikaelkael): ps3mca tool
+* [ShendoXT](https://github.com/ShendoXT): [MemcardRex](https://github.com/ShendoXT/memcardrex)
 * [Nobody/Wild Light](https://github.com/nobodo): [S3M music track](https://github.com/bucanero/apollo-ps3/blob/master/data/haiku.s3m)
 
 # Building
@@ -205,7 +223,7 @@ UDP multicast address `239.255.0.100:30000`. To receive them you can use [socat]
 
 # License
 
-[Apollo Save Tool](https://github.com/bucanero/apollo-ps3/) (PS3) - Copyright (C) 2020-2022  [Damian Parrino](https://twitter.com/dparrino)
+[Apollo Save Tool](https://github.com/bucanero/apollo-ps3/) (PS3) - Copyright (C) 2020-2024 [Damian Parrino](https://twitter.com/dparrino)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the [GNU General Public License][app_license] as published by

source/exec_cmd.c

@@ -1627,15 +1627,15 @@ static void import_save2vmc(const char* src, int type)
 		break;
 
 	case FILE_TYPE_CBS:
-		ret = (ps2_cbs2psv(src, NULL) && vmc_import_psv(APOLLO_TMP_PATH "tmp.psv"));
+		ret = (ps2_cbs2psv(src, NULL) && vmc_import_psv(APOLLO_LOCAL_CACHE "tmp.psv"));
 		break;
 
 	case FILE_TYPE_XPS:
-		ret = (ps2_xps2psv(src, NULL) && vmc_import_psv(APOLLO_TMP_PATH "tmp.psv"));
+		ret = (ps2_xps2psv(src, NULL) && vmc_import_psv(APOLLO_LOCAL_CACHE "tmp.psv"));
 		break;
 
 	case FILE_TYPE_MAX:
-		ret = (ps2_max2psv(src, NULL) && vmc_import_psv(APOLLO_TMP_PATH "tmp.psv"));
+		ret = (ps2_max2psv(src, NULL) && vmc_import_psv(APOLLO_LOCAL_CACHE "tmp.psv"));
 		break;
 
 	default:

source/menu_main.c

@@ -585,7 +585,7 @@ static void doMainMenu(void)
 		else if (paddata[0].BTN_CROSS)
 			SetMenu(menu_sel+1);
 
-		else if (paddata[0].BTN_L1 && paddata[0].BTN_START && file_exists(APOLLO_PATH "EXTRA.SELF"))
+		else if (paddata[0].BTN_L1 && paddata[0].BTN_START && (file_exists(APOLLO_PATH "EXTRA.SELF") == SUCCESS))
 			sysProcessExitSpawn2(APOLLO_PATH "EXTRA.SELF", NULL, NULL, NULL, 0, 1001, SYS_PROCESS_SPAWN_STACK_SIZE_1M);
 
 		else if(paddata[0].BTN_CIRCLE && show_dialog(DIALOG_TYPE_YESNO, "Exit to XMB?"))

source/psv_resign.c

@@ -214,7 +214,7 @@ void get_psv_filename(char* psvName, const char* path, const char* dirName)
 
 	if (!path)
 	{
-		strcpy(psvName, "/dev_hdd0/tmp/apollo/tmp.psv");
+		strcpy(psvName, "/dev_hdd0/game/NP0APOLLO/USRDIR/CACHE/tmp.psv");
 		return;
 	}
 

source/saves.c

@@ -1029,7 +1029,7 @@ list_t * ReadBackupList(const char* userPath)
 		item->type = FILE_TYPE_PS2;
 		list_append(list, item);
 
-		item = _createSaveEntry(SAVE_FLAG_PS2, CHAR_ICON_COPY " Convert/Resign PSV saves");
+		item = _createSaveEntry(SAVE_FLAG_PS2, CHAR_ICON_COPY " Convert/Resign .PSV saves");
 		asprintf(&item->path, USB_PATH, i);
 		asprintf(&item->title_id, "USB %d", i);
 		item->type = FILE_TYPE_PSV;