muskit/spice2x.github.io
0
0
Fork 0
mirror of https://github.com/spice2x/spice2x.github.io.git synced 2026-08-01 22:30:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "iidx, sdvx: bi2x hook fix" (#500)

Browse Source 
Reverts spice2x/spice2x.github.io#496
This commit is contained in:
bicarus
2026-01-04 17:50:21 -08:00
committed by GitHub
parent bf7666939a
commit e745cdcac8
2 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spice2x/games/iidx/bi2x_hook.cpp
+6 -18
View File
@@ -30,14 +30,6 @@ namespace games::iidx {
uint8_t dummy1[0x9A0]; uint8_t dummy1[0x9A0];
}; };
// add padding before and after as the game will try to deref an offset
// from the address returned by aioNMgrIob2_Create
struct AIO_NMGR_IOB2_PTR {
uint8_t dummy0[0x100];
AIO_NMGR_IOB2 *iob2;
uint8_t dummy1[0x400 - sizeof(AIO_NMGR_IOB2 *)];
};
struct AIO_IOB2_BI2X_TDJ { struct AIO_IOB2_BI2X_TDJ {
// who knows // who knows
uint8_t data[0x13F8]; uint8_t data[0x13F8];
@@ -120,7 +112,7 @@ namespace games::iidx {
AIO_IOB2_BI2X_TDJ *custom_node = nullptr; AIO_IOB2_BI2X_TDJ *custom_node = nullptr;
AC_HNDLIF *acHndlif = nullptr; AC_HNDLIF *acHndlif = nullptr;
AIO_NMGR_IOB2_PTR *aioNmgrIob2 = nullptr; AIO_NMGR_IOB2 *aioNmgrIob2 = nullptr;
/* /*
* implementations * implementations
@@ -466,16 +458,12 @@ namespace games::iidx {
static AIO_NMGR_IOB2** __fastcall aioNMgrIob2_Create(AC_HNDLIF *a1, unsigned int a2) { static AIO_NMGR_IOB2** __fastcall aioNMgrIob2_Create(AC_HNDLIF *a1, unsigned int a2) {
if (aioNmgrIob2 == nullptr) { if (aioNmgrIob2 == nullptr) {
aioNmgrIob2 = new AIO_NMGR_IOB2_PTR{}; aioNmgrIob2 = new AIO_NMGR_IOB2;
aioNmgrIob2->iob2 = new AIO_NMGR_IOB2{}; memset(aioNmgrIob2, 0x0, sizeof(AIO_NMGR_IOB2));
aioNmgrIob2->iob2->pAIO_NMGR_IOB_BeginManage = AIO_NMGR_IOB_BeginManageStub; aioNmgrIob2->pAIO_NMGR_IOB_BeginManage = AIO_NMGR_IOB_BeginManageStub;
} }
log_info("bi2x_hook", "aioNMgrIob2_Create");
log_info("bi2x_hook", "aioNMgrIob2_Create returned {}, padded size=0x{:x}, IOB2 @ {}, size=0x{:x}", return &aioNmgrIob2;
fmt::ptr(&aioNmgrIob2->iob2), sizeof(*aioNmgrIob2),
fmt::ptr(aioNmgrIob2->iob2), sizeof(*aioNmgrIob2->iob2));
return &aioNmgrIob2->iob2;
} }
static int64_t __fastcall aioIob2Bi2x_WriteFirmGetState(int64_t a1) { static int64_t __fastcall aioIob2Bi2x_WriteFirmGetState(int64_t a1) {
src/spice2x/games/sdvx/bi2x_hook.cpp
+6 -17
View File
@@ -32,14 +32,6 @@ namespace games::sdvx {
uint8_t dummy1[0x9A0]; uint8_t dummy1[0x9A0];
}; };
// add padding before and after as the game will try to deref an offset
// from the address returned by aioNMgrIob2_Create
struct AIO_NMGR_IOB2_PTR {
uint8_t dummy0[0x100];
AIO_NMGR_IOB2 *iob2;
uint8_t dummy1[0x400 - sizeof(AIO_NMGR_IOB2 *)];
};
struct AIO_IOB2_BI2X_UFC { struct AIO_IOB2_BI2X_UFC {
// who knows // who knows
uint8_t data[0x13F8]; uint8_t data[0x13F8];
@@ -102,7 +94,7 @@ namespace games::sdvx {
AIO_IOB2_BI2X_UFC *custom_node = nullptr; AIO_IOB2_BI2X_UFC *custom_node = nullptr;
AC_HNDLIF *acHndlif = nullptr; AC_HNDLIF *acHndlif = nullptr;
AIO_NMGR_IOB2_PTR* aioNmgrIob2 = nullptr; AIO_NMGR_IOB2 *aioNmgrIob2 = nullptr;
// state // state
static uint8_t count = 0; static uint8_t count = 0;
static uint16_t VOL_L = 0; static uint16_t VOL_L = 0;
@@ -355,14 +347,11 @@ namespace games::sdvx {
static AIO_NMGR_IOB2** __fastcall aioNMgrIob2_Create(AC_HNDLIF *a1, unsigned int a2) { static AIO_NMGR_IOB2** __fastcall aioNMgrIob2_Create(AC_HNDLIF *a1, unsigned int a2) {
if (aioNmgrIob2 == nullptr) { if (aioNmgrIob2 == nullptr) {
aioNmgrIob2 = new AIO_NMGR_IOB2_PTR{}; aioNmgrIob2 = new AIO_NMGR_IOB2;
aioNmgrIob2->iob2 = new AIO_NMGR_IOB2{}; memset(aioNmgrIob2, 0x0, sizeof(AIO_NMGR_IOB2));
aioNmgrIob2->iob2->pAIO_NMGR_IOB_BeginManage = AIO_NMGR_IOB_BeginManageStub; aioNmgrIob2->pAIO_NMGR_IOB_BeginManage = AIO_NMGR_IOB_BeginManageStub;
} }
log_info("bi2x_hook", "aioNMgrIob2_Create returned {}, padded size=0x{:x}, IOB2 @ {}, size=0x{:x}", log_info("bi2x_hook", "aioNMgrIob2_Create");
fmt::ptr(&aioNmgrIob2->iob2), sizeof(*aioNmgrIob2),
fmt::ptr(aioNmgrIob2->iob2), sizeof(*aioNmgrIob2->iob2));
BI2X_INITIALIZED = true; BI2X_INITIALIZED = true;
// enable hack to make PIN pad work for KFC in BI2X mode // enable hack to make PIN pad work for KFC in BI2X mode
@@ -370,7 +359,7 @@ namespace games::sdvx {
// (as opposed to just doing a check for "isValkyrieCabMode?") // (as opposed to just doing a check for "isValkyrieCabMode?")
// because there are hex edits that allow you to use legacy (KFC/BIO2) IO while in Valk mode // because there are hex edits that allow you to use legacy (KFC/BIO2) IO while in Valk mode
acioemu::ICCA_DEVICE_HACK = true; acioemu::ICCA_DEVICE_HACK = true;
return &aioNmgrIob2->iob2; return &aioNmgrIob2;
} }
static int64_t __fastcall aioIob2Bi2x_WriteFirmGetState(int64_t a1) { static int64_t __fastcall aioIob2Bi2x_WriteFirmGetState(int64_t a1) {