Kayori/segatools
1
0
Fork 0
forked from Dniel97/segatools
Code Pull Requests Activity

wacca: io is now part of mercuryhook.dll

Browse Source
This commit is contained in:
Hay1tsme 2022-08-11 23:58:24 -04:00 committed by Hay1tsme
parent 729a7ec280
commit 929ea862ca
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Package.mk
View File

@ -34,7 +34,6 @@ $(BUILD_DIR_ZIP)/mercury.zip:
$(V)mkdir -p $(BUILD_DIR_ZIP)/mercury/DEVICE $(V)mkdir -p $(BUILD_DIR_ZIP)/mercury/DEVICE
$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \ $(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
$(BUILD_DIR_64)/mercuryhook/mercuryhook.dll \ $(BUILD_DIR_64)/mercuryhook/mercuryhook.dll \
$(BUILD_DIR_64)/mercuryio/mercuryio.dll \
$(DIST_DIR)/mercury/segatools.ini \ $(DIST_DIR)/mercury/segatools.ini \
$(DIST_DIR)/mercury/start.bat \ $(DIST_DIR)/mercury/start.bat \
$(BUILD_DIR_ZIP)/mercury $(BUILD_DIR_ZIP)/mercury

2
mercuryhook/io4.c
View File

@ -64,7 +64,7 @@ static HRESULT mercury_io4_poll(void *ctx, struct io4_state *state)
} }
if (opbtn & MERCURY_IO_OPBTN_COIN) { if (opbtn & MERCURY_IO_OPBTN_COIN) {
state->chutes[0] += 256; // TODO: Test state->chutes[0] += 1 << 8; // FIXME: Inserts 1 credit on press, then 15 on release...
} }
if (gamebtn & MERCURY_IO_GAMEBTN_VOL_UP) { if (gamebtn & MERCURY_IO_GAMEBTN_VOL_UP) {

9
mercuryio/meson.build
View File

@ -11,12 +11,3 @@ mercuryio_lib = static_library(
'config.h', 'config.h',
], ],
) )
shared_library(
'mercuryio',
name_prefix : '',
vs_module_defs : 'mercuryio.def',
link_with : [
mercuryio_lib,
],
)

10
platform/misc.c
View File

@ -20,6 +20,7 @@ static HRESULT misc_read_app_loader_count(void *bytes, uint32_t *nbytes);
static HRESULT misc_read_cpu_temp_error(void *bytes, uint32_t *nbytes); static HRESULT misc_read_cpu_temp_error(void *bytes, uint32_t *nbytes);
static HRESULT misc_read_cpu_temp_warning(void *bytes, uint32_t *nbytes); static HRESULT misc_read_cpu_temp_warning(void *bytes, uint32_t *nbytes);
static HRESULT misc_read_platform_id(void *bytes, uint32_t *nbytes); static HRESULT misc_read_platform_id(void *bytes, uint32_t *nbytes);
static HRESULT misc_read_platform_name(void *bytes, uint32_t *nbytes);
static const struct hook_symbol misc_syms[] = { static const struct hook_symbol misc_syms[] = {
{ {
@ -65,6 +66,10 @@ static const struct reg_hook_val misc_static_keys[] = {
.name = L"PlatformId", .name = L"PlatformId",
.read = misc_read_platform_id, .read = misc_read_platform_id,
.type = REG_SZ, .type = REG_SZ,
}, {
.name = L"PlatformName",
.read = misc_read_platform_name,
.type = REG_SZ,
} }
}; };
@ -160,3 +165,8 @@ static HRESULT misc_read_platform_id(void *bytes, uint32_t *nbytes)
{ {
return reg_hook_read_wstr(bytes, nbytes, misc_platform_id); return reg_hook_read_wstr(bytes, nbytes, misc_platform_id);
} }
static HRESULT misc_read_platform_name(void *bytes, uint32_t *nbytes)
{
return reg_hook_read_wstr(bytes, nbytes, L"ALLS MX2.1"); // TODO: Dynamic
}