diff --git a/Assets/dll/faust.wbx.zst b/Assets/dll/faust.wbx.zst index b860c8d01c..bf95e04b27 100644 Binary files a/Assets/dll/faust.wbx.zst and b/Assets/dll/faust.wbx.zst differ diff --git a/Assets/dll/hyper.wbx.zst b/Assets/dll/hyper.wbx.zst index 49a169e765..4672e2183e 100644 Binary files a/Assets/dll/hyper.wbx.zst and b/Assets/dll/hyper.wbx.zst differ diff --git a/Assets/dll/ngp.wbx.zst b/Assets/dll/ngp.wbx.zst index ee50e0a5b3..d7243cbcd3 100644 Binary files a/Assets/dll/ngp.wbx.zst and b/Assets/dll/ngp.wbx.zst differ diff --git a/Assets/dll/pcfx.wbx.zst b/Assets/dll/pcfx.wbx.zst index 2697638378..dfbe8549f2 100644 Binary files a/Assets/dll/pcfx.wbx.zst and b/Assets/dll/pcfx.wbx.zst differ diff --git a/Assets/dll/shock.wbx.zst b/Assets/dll/shock.wbx.zst index 232c89ef17..64842682bd 100644 Binary files a/Assets/dll/shock.wbx.zst and b/Assets/dll/shock.wbx.zst differ diff --git a/Assets/dll/ss.wbx.zst b/Assets/dll/ss.wbx.zst index 2b05dad457..3a47be5069 100644 Binary files a/Assets/dll/ss.wbx.zst and b/Assets/dll/ss.wbx.zst differ diff --git a/Assets/dll/turbo.wbx.zst b/Assets/dll/turbo.wbx.zst index 28256c8956..324f4b2518 100644 Binary files a/Assets/dll/turbo.wbx.zst and b/Assets/dll/turbo.wbx.zst differ diff --git a/Assets/dll/vb.wbx.zst b/Assets/dll/vb.wbx.zst index c8cb7ea5ce..606150d16e 100644 Binary files a/Assets/dll/vb.wbx.zst and b/Assets/dll/vb.wbx.zst differ diff --git a/waterbox/nyma/Interfaces.cpp b/waterbox/nyma/Interfaces.cpp index 27d00b70f0..4932ead95c 100644 --- a/waterbox/nyma/Interfaces.cpp +++ b/waterbox/nyma/Interfaces.cpp @@ -204,9 +204,18 @@ namespace Mednafen } std::vector MDFN_GetSettingMultiUI(const char *name) { - // only used in some saturn debug code, not needed + // only used in some demo code it seems? return std::vector(); } + std::vector MDFN_GetSettingMultiI(const char *name) + { + // not used for anything it seems? + return std::vector(); + } + uint64 MDFN_GetSettingMultiM(const char *name) + { + return MDFN_GetSettingUI(name); + } void MDFNMP_Init(uint32 ps, uint32 numpages) {} void MDFNMP_AddRAM(uint32 size, uint32 address, uint8 *RAM, bool use_in_search) // Deprecated diff --git a/waterbox/nyma/NymaCore.cpp b/waterbox/nyma/NymaCore.cpp index 058618e343..94493644e8 100644 --- a/waterbox/nyma/NymaCore.cpp +++ b/waterbox/nyma/NymaCore.cpp @@ -68,12 +68,13 @@ ECL_EXPORT bool InitRom(const InitData& data) GameFile gf({ &NVFS, "", + data.FileNameFull, gamestream.get(), data.FileNameExt, data.FileNameBase, - &NVFS, + {&NVFS, "", - data.FileNameBase + data.FileNameBase} }); Game->Load(&gf); diff --git a/waterbox/nyma/common.mak b/waterbox/nyma/common.mak index ea5c3fb0fa..d8bab76457 100644 --- a/waterbox/nyma/common.mak +++ b/waterbox/nyma/common.mak @@ -2,7 +2,7 @@ MEDNAFLAGS := \ -Imednafen -Icommon -Imednafen/src/trio \ - -DHAVE_CONFIG_H=1 -DMDFN_DISABLE_NO_OPT_ERRWARN=1 \ + -DHAVE_CONFIG_H=1 -DMDFN_DISABLE_NO_OPT_ERRWARN=1 -DMDFN_PSS_STYLE=1 \ -fwrapv \ -fno-strict-aliasing \ -fomit-frame-pointer \ diff --git a/waterbox/nyma/mednafen b/waterbox/nyma/mednafen index 704467f260..66c482b516 160000 --- a/waterbox/nyma/mednafen +++ b/waterbox/nyma/mednafen @@ -1 +1 @@ -Subproject commit 704467f260c83506e17621141ae1f5aa33b0d364 +Subproject commit 66c482b516f3b37927a9f51522f2e6cc9dd0aed0 diff --git a/waterbox/nyma/pcfx.cpp b/waterbox/nyma/pcfx.cpp index 89404bdfb3..9f3b313fdd 100644 --- a/waterbox/nyma/pcfx.cpp +++ b/waterbox/nyma/pcfx.cpp @@ -16,7 +16,7 @@ void SetupMDFNGameInfo() namespace MDFN_IEN_PCFX { extern uint8 BackupRAM[0x8000]; - extern uint8 ExBackupRAM[0x8000]; + extern uint8 ExBackupRAM[0x20000]; extern uint8 *BIOSROM; // 1MB extern uint8 *RAM; // 2MB extern uint8 *FXSCSIROM; // 512KiB