diff --git a/LunaHook/engine32/RPGMakerRGSS3.cpp b/LunaHook/engine32/RPGMakerRGSS3.cpp index ca821cf..2b213d6 100644 --- a/LunaHook/engine32/RPGMakerRGSS3.cpp +++ b/LunaHook/engine32/RPGMakerRGSS3.cpp @@ -531,7 +531,7 @@ namespace bool isValid() const { return Engine::isAddressReadable(type) && *type && size && size < 1500 && Engine::isAddressWritable(text, size + 1) && *text && text[size] == 0 && ::strlen(text) == size // validate size - //&& !::strchr(text, '/') + //&& !::strchr(text, '/') && !all_ascii(text); } @@ -1452,7 +1452,6 @@ bool RPGMakerRGSS3::attach_function() return true; } - bool RPGMakerRGSS300::attach_function() { trigger_fun = [](LPVOID addr1, hook_stack *stack) @@ -1467,8 +1466,8 @@ bool RPGMakerRGSS300::attach_function() hp.address = addr; hp.type = USING_STRING | CODEC_UTF16; hp.offset = get_stack(1); - NewHook(hp, "RGSS300.dll"); + NewHook(hp, "RGSS30x.dll"); return true; }; - return GetModuleHandle(L"RGSS300.dll"); + return GetModuleHandle(L"RGSS300.dll") || GetModuleHandle(L"RGSS301.dll"); } \ No newline at end of file diff --git a/LunaHook/engine32/RPGMakerRGSS3.h b/LunaHook/engine32/RPGMakerRGSS3.h index 9ee5e4d..0b8b231 100644 --- a/LunaHook/engine32/RPGMakerRGSS3.h +++ b/LunaHook/engine32/RPGMakerRGSS3.h @@ -18,8 +18,8 @@ class RPGMakerRGSS300 : public ENGINE public: RPGMakerRGSS300() { - check_by = CHECK_BY::FILE_ALL; - check_by_target = check_by_list{L"System/RGSS300.dll"}; + check_by = CHECK_BY::FILE_ANY; + check_by_target = check_by_list{L"System/RGSS300.dll", L"System/RGSS301.dll"}; is_engine_certain = false; }; bool attach_function();