From e677b9ed5bebe9ced29e3c615bd8819d013b0182 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Thu, 11 Aug 2022 23:58:24 -0400 Subject: [PATCH] wacca: io is now part of mercuryhook.dll --- Package.mk | 1 - mercuryhook/io4.c | 2 +- mercuryio/meson.build | 9 --------- platform/misc.c | 10 ++++++++++ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Package.mk b/Package.mk index 85f6b80..53fd832 100644 --- a/Package.mk +++ b/Package.mk @@ -34,7 +34,6 @@ $(BUILD_DIR_ZIP)/mercury.zip: $(V)mkdir -p $(BUILD_DIR_ZIP)/mercury/DEVICE $(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \ $(BUILD_DIR_64)/mercuryhook/mercuryhook.dll \ - $(BUILD_DIR_64)/mercuryio/mercuryio.dll \ $(DIST_DIR)/mercury/segatools.ini \ $(DIST_DIR)/mercury/start.bat \ $(BUILD_DIR_ZIP)/mercury diff --git a/mercuryhook/io4.c b/mercuryhook/io4.c index 876a81e..092a037 100644 --- a/mercuryhook/io4.c +++ b/mercuryhook/io4.c @@ -64,7 +64,7 @@ static HRESULT mercury_io4_poll(void *ctx, struct io4_state *state) } 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) { diff --git a/mercuryio/meson.build b/mercuryio/meson.build index 4e6c0eb..2970fa9 100644 --- a/mercuryio/meson.build +++ b/mercuryio/meson.build @@ -10,13 +10,4 @@ mercuryio_lib = static_library( 'config.c', 'config.h', ], -) - -shared_library( - 'mercuryio', - name_prefix : '', - vs_module_defs : 'mercuryio.def', - link_with : [ - mercuryio_lib, - ], ) \ No newline at end of file diff --git a/platform/misc.c b/platform/misc.c index f4bc87d..040a249 100644 --- a/platform/misc.c +++ b/platform/misc.c @@ -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_warning(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[] = { { @@ -65,6 +66,10 @@ static const struct reg_hook_val misc_static_keys[] = { .name = L"PlatformId", .read = misc_read_platform_id, .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); } + +static HRESULT misc_read_platform_name(void *bytes, uint32_t *nbytes) +{ + return reg_hook_read_wstr(bytes, nbytes, L"ALLS MX2.1"); // TODO: Dynamic +}