Skip to content

Commit

Permalink
webMAN MOD 1.47.44
Browse files Browse the repository at this point in the history
- Uninstall webMAN now also deletes /dev_hdd0/tmp/gameboot folder
- Removed boot_mamba.pkg / boot_fake_ofw.pkg from addons to prevent issues installing the wrong payload
- Moved multi gameboot paths to paths.h
- Added PS2 config for SuperLite 2000 Vol. 16: UNO Game, fixed by mrjaredbeta
"Ensures DMA transfers are finished to avoid graphical flickering and freezes."
  • Loading branch information
aldostools committed Mar 6, 2023
1 parent 6f78074 commit d217866
Show file tree
Hide file tree
Showing 29 changed files with 50 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ if not exist mamba md mamba

:: Change these for your application / manual...
set CID=CUSTOM-INSTALLER_00-0000000000000000
set PKG_DIR=./mamba/
set PKG_NAME=boot_mamba.pkg
set PKG_DIR=./mamba_48x/
set PKG_NAME=boot_mamba_48x.pkg

..\updater\pkg_custom.exe --contentid %CID% %PKG_DIR% %PKG_NAME%

Expand Down
16 changes: 16 additions & 0 deletions _Projects_/boot_mamba/make_mamba_490.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@ECHO OFF
title make_package_custom
if not exist mamba md mamba

:: ----------------------------------------------
:: Simple script to build a PKG (by CaptainCPS-X)
:: ----------------------------------------------

:: Change these for your application / manual...
set CID=CUSTOM-INSTALLER_00-0000000000000000
set PKG_DIR=./mamba_490/
set PKG_NAME=boot_mamba_490.pkg

..\updater\pkg_custom.exe --contentid %CID% %PKG_DIR% %PKG_NAME%

pause
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/dev_hdd0/plugins/kernel/mamba_490C.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/dev_hdd0/plugins/kernel/mamba_490D.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/dev_hdd0/plugins/webftp_server.sprx
1 change: 1 addition & 0 deletions _Projects_/boot_mamba/mamba_490/dev_hdd0/tmp/wm_request
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/popup.ps3?Boot Mamba Installed%0ADisable Cobra & reboot...&icon=29&snd=7
Binary file not shown.
Binary file not shown.
4 changes: 3 additions & 1 deletion _Projects_/updater/PS2CONFIG/USRDIR/CONFIG/ps2config.html
Original file line number Diff line number Diff line change
Expand Up @@ -1172,6 +1172,7 @@ <h1>
<tr><td>CUSTOM<td>SLES_511.43<td>Summoner 2</tr>
<tr><td>CUSTOM<td>SLES_512.75<td>Summoner 2</tr>
<tr><td>CUSTOM<td>SCCS_400.10<td>Super Puzzle Bobble 2</tr>
<tr><td>CUSTOM<td>SLPM_624.71<TD>SuperLite 2000 Vol. 16: UNO Game</tr>
<tr><td>CUSTOM<td>SLUS_200.95<td>SSX</tr>
<tr><td>CUSTOM<td>SLES_500.30<td>SSX</tr>
<tr><td>CUSTOM<td title="Enables pressure sensitive controls required for Dragon Flute song + disabled smoothing">SLUS_204.88<td>Star Ocean 3: Till the End of Time [Disc1of2]</tr>
Expand Down Expand Up @@ -4517,6 +4518,7 @@ <h1>
<tr><td>ENC<td>SLUS_212.72<td>Super Monkey Ball Adventure</tr>
<tr><td>ENC<td>SLES_537.01<td>Super Monkey Ball Adventure</tr>
<tr><td>ENC<td>SCCS_400.10<td>Super Puzzle Bobble 2</tr>
<tr><td>ENC<td>SLPM_624.71<TD>SuperLite 2000 Vol. 16: UNO Game</tr>
<tr><td>ENC<td>SLUS_214.34<td>Superman Returns: The Video Game</tr>
<tr><td>ENC<td>SLES_537.46<td>Superman Returns</tr>
<tr><td>ENC<td>SLES_543.48<td>Superman Returns</tr>
Expand Down Expand Up @@ -4861,7 +4863,7 @@ <h1>
var table = $("dbTable");
var tbody = table.getElementsByTagName('tbody')[0];
var tr = tbody.getElementsByTagName('tr');
var i = 2642, count = tr.length, classics = i;
var i = 2643, count = tr.length, classics = i;
for (; i < count; i++) {
cols = tr[i].children;
if(cols[0].innerText=="ENC") {classics = i; break;}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx
Binary file not shown.
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx
Binary file not shown.
Binary file not shown.
24 changes: 12 additions & 12 deletions _Projects_/updater/pkgfiles/USRDIR/xml/wm_apps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
<A>
<T key="app001_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/prepISO_1.30.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/prepISO_1.30.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/prepISO_1.30.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/prepISO_1.30.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>UP0001-BLES80616_00-0000000000000000</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/package.png</></P>
Expand All @@ -106,8 +106,8 @@
<A>
<T key="app002_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/PS2CONFIG_20230304.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/PS2CONFIG_20230304.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/PS2CONFIG_20230306.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/PS2CONFIG_20230306.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>CUSTOM-PS2CONFIG_00-0000000000000000</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/package.png</></P>
Expand All @@ -123,8 +123,8 @@
<A>
<T key="app003_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/PS2_Classics_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/PS2_Classics_Launcher.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/PS2_Classics_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/PS2_Classics_Launcher.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>2P0001-PS2U10000_00-0000111122223333</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/webman.png</></P>
Expand All @@ -140,8 +140,8 @@
<A>
<T key="app004_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/PSP_Minis_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/PSP_Minis_Launcher.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/PSP_Minis_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/PSP_Minis_Launcher.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>UP0001-PSPM66820_00-0000111122223333</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/package.png</></P>
Expand All @@ -157,8 +157,8 @@
<A>
<T key="app005_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/PSP_Remasters_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/PSP_Remasters_Launcher.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/PSP_Remasters_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/PSP_Remasters_Launcher.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>UP0001-PSPC66820_00-0000111122223333</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/package.png</></P>
Expand Down Expand Up @@ -327,8 +327,8 @@
<A>
<T key="app015_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/webMAN_MOD_1.47.43_Installer.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.43/webMAN_MOD_1.47.43_Installer.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/webMAN_MOD_1.47.44_Installer.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.44/webMAN_MOD_1.47.44_Installer.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>EP0001-UPDWEBMOD_00-0000000000000000</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/webman.png</></P>
Expand Down
Binary file not shown.
Binary file modified _Projects_/updater/update/dev_hdd0/plugins/webftp_server.sprx
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions include/file/file_delete.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ static void uninstall(char *param)
del(HTML_BASE_PATH, RECURSIVE_DELETE);
del(VSH_MENU_IMAGES, RECURSIVE_DELETE);
del(PS2CONFIG_PATH, RECURSIVE_DELETE);
del(WM_GAMEBOOT_PATH, RECURSIVE_DELETE);
#endif

restore_fan(SYSCON_MODE);
Expand Down
5 changes: 5 additions & 0 deletions include/init/paths.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
#define ORG_GAME_EXT_PATH "/dev_flash/vsh/module/game_ext_plugin.sprx"
#define NEW_GAME_EXT_PATH "/./dev_hdd0/tmp/gameboot/game_ext_plugin.sprx"

#define CUSTOM_RENDER_PLUGIN_RCO "/dev_flash/vsh/resource/custom_render_plugin.rco"
#define GAMEBOOT_MULTI_AC3 "/dev_flash/vsh/resource/gameboot_multi.ac3"
#define GAMEBOOT_STEREO_AC3 "/dev_flash/vsh/resource/gameboot_stereo.ac3"

#define ORG_LIBAUDIO_PATH "/dev_flash/sys/external/libaudio.sprx"
#define NEW_LIBAUDIO_PATH "/./dev_hdd0/tmp/libaudio.sprx"

Expand Down Expand Up @@ -53,6 +57,7 @@
#define WM_ICONS_PATH TMP_DIR "/wm_icons" // webMAN icons folder
#define WM_COMBO_PATH TMP_DIR "/wm_combo" // webMAN custom combos folder
#define WM_INGAME_PATH TMP_DIR "/wm_ingame" // webMAN ingame scripts
#define WM_GAMEBOOT_PATH TMP_DIR "/gameboot" // gameboot animations per console emulator

#define WM_CONFIG_FILE TMP_DIR "/wm_config.bin" // webMAN config file
#define WM_NOSCAN_FILE TMP_DIR "/wm_noscan" // webMAN config file to skip on boot
Expand Down
14 changes: 7 additions & 7 deletions include/mount/patch_gameboot.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ static void patch_gameboot(u8 boot_type)
{
if(is_patching_gameboot) return;

if(IS_ON_XMB && (file_size("/dev_flash/vsh/resource/custom_render_plugin.rco") >= MIN_RCO_SIZE))
if(IS_ON_XMB && (file_size(CUSTOM_RENDER_PLUGIN_RCO) >= MIN_RCO_SIZE))
{
is_patching_gameboot = true;

Expand Down Expand Up @@ -73,15 +73,15 @@ static void patch_gameboot(u8 boot_type)
}

char path[48];
if(isDir("/dev_hdd0/tmp/gameboot"))
if(isDir(WM_GAMEBOOT_PATH))
{
map_patched_modules();

sprintf(path, "%s/%s_boot_stereo.ac3", "/dev_hdd0/tmp/gameboot", id);
sprintf(path, "%s/%s_boot_stereo.ac3", WM_GAMEBOOT_PATH, id);

const char *snd = file_exists(path) ? path : NULL;
sys_map_path("/dev_flash/vsh/resource/gameboot_multi.ac3", snd);
sys_map_path("/dev_flash/vsh/resource/gameboot_stereo.ac3", snd);
sys_map_path(GAMEBOOT_MULTI_AC3, snd);
sys_map_path(GAMEBOOT_STEREO_AC3, snd);

const char *media[6] = {"PIC0.PNG", "PIC1.PNG", "PIC2.PNG", "SND0.AT3", "ICON1.PAM", "ICON0.PNG"};
for(u8 i = 0; i < 6; i++)
Expand All @@ -90,7 +90,7 @@ static void patch_gameboot(u8 boot_type)
if(not_exists(path))
{
char src_path[40];
sprintf(src_path, "%s/%s_%s", "/dev_hdd0/tmp/gameboot", id, media[i]);
sprintf(src_path, "%s/%s_%s", WM_GAMEBOOT_PATH, id, media[i]);
file_copy(src_path, path);
}
}
Expand All @@ -104,7 +104,7 @@ static void patch_gameboot(u8 boot_type)
static void patch_gameboot_by_type(const char *path) // called only by set_mount_type
{
// customize gameboot per console emulator using DeViL303's custom_render_plugin.rco
if(IS_ON_XMB && (file_size("/dev_flash/vsh/resource/custom_render_plugin.rco") >= MIN_RCO_SIZE))
if(IS_ON_XMB && (file_size(CUSTOM_RENDER_PLUGIN_RCO) >= MIN_RCO_SIZE))
{
if(mount_unk == EMU_PSX)
patch_gameboot(1); // PS1
Expand Down

0 comments on commit d217866

Please sign in to comment.