From e2257a6fa74a7812e777e6e7d707d818636666b2 Mon Sep 17 00:00:00 2001 From: Dniel97 Date: Sun, 4 Jan 2026 10:06:23 +0100 Subject: [PATCH] misc: cleanup --- dist/mercury/launch.bat | 4 +++- dist/mercury/segatools.ini | 4 ++-- games/apm3hook/dllmain.c | 5 ----- games/apm3io/dllmain.c | 3 ++- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dist/mercury/launch.bat b/dist/mercury/launch.bat index 4a64365..7445a6e 100644 --- a/dist/mercury/launch.bat +++ b/dist/mercury/launch.bat @@ -10,4 +10,6 @@ inject -d -k mercuryhook.dll ../WindowsNoEditor/Mercury/Binaries/Win64/Mercury-W taskkill /f /im amdaemon.exe > nul 2>&1 -echo Game processes have terminated \ No newline at end of file +echo. +echo Game processes have terminated +pause \ No newline at end of file diff --git a/dist/mercury/segatools.ini b/dist/mercury/segatools.ini index 0d5f68f..64e11d0 100644 --- a/dist/mercury/segatools.ini +++ b/dist/mercury/segatools.ini @@ -99,8 +99,8 @@ dpiAware=1 [touch] enable=1 -; Hooks related to the LED board (codenamed Elisabeth) -[elisabeth] +; Hooks related to the LED board (codenamed Elizabeth) +[elizabeth] enable=1 ; ----------------------------------------------------------------------------- diff --git a/games/apm3hook/dllmain.c b/games/apm3hook/dllmain.c index ab937e0..49f0c56 100644 --- a/games/apm3hook/dllmain.c +++ b/games/apm3hook/dllmain.c @@ -24,11 +24,6 @@ #include "hooklib/serial.h" #include "hooklib/spike.h" -#include "platform/clock.h" -#include "platform/config.h" -#include "platform/nusec.h" -#include "platform/security.h" - #include "unityhook/hook.h" #include "util/dprintf.h" diff --git a/games/apm3io/dllmain.c b/games/apm3io/dllmain.c index ee14dd2..bf4dff9 100644 --- a/games/apm3io/dllmain.c +++ b/games/apm3io/dllmain.c @@ -13,6 +13,7 @@ #include "util/dprintf.h" #include "util/str.h" +#include "util/env.h" static struct apm3_io_config apm3_io_cfg; static const struct apm3_io_backend *apm3_io_backend; @@ -39,7 +40,7 @@ HRESULT apm3_io_init(void) return hr; } - apm3_io_config_load(&apm3_io_cfg, L".\\segatools.ini"); + apm3_io_config_load(&apm3_io_cfg, get_config_path()); if (wstr_ieq(apm3_io_cfg.mode, L"keyboard")) { hr = apm3_kb_init(&apm3_io_cfg.kb, &apm3_io_backend);