use id instead of function name to define tools

ate47 · Oct 18, 2024 · 3bd6e50 · 3bd6e50
1 parent 1071d40
commit 3bd6e50
Show file tree

Hide file tree

Showing 55 changed files with 152 additions and 152 deletions.
diff --git a/src/acts/actscli.cpp b/src/acts/actscli.cpp
@@ -436,7 +436,7 @@ namespace actscli {
 		return res;
 	}
 }
-ADD_TOOL("packfile", "acts", " [file=acts.acpf]", "Create ACTS pack file", nullptr, packfile);
-ADD_TOOL("exit", "acts", "", "Exit repl cli", nullptr, exitcli);
-ADD_TOOL("echo", "acts", "", "echo", nullptr, echocli);
-ADD_TOOL("repl", "acts", "", "Use repl cli", nullptr, replcli);
+ADD_TOOL(packfile, "acts", " [file=acts.acpf]", "Create ACTS pack file", nullptr, packfile);
+ADD_TOOL(exit, "acts", "", "Exit repl cli", nullptr, exitcli);
+ADD_TOOL(echo, "acts", "", "echo", nullptr, echocli);
+ADD_TOOL(repl, "acts", "", "Use repl cli", nullptr, replcli);
diff --git a/src/acts/adl/adl.cpp b/src/acts/adl/adl.cpp
@@ -894,5 +894,5 @@ namespace acts::compiler::adl {
         return tool::OK;
     }
 
-    ADD_TOOL("adlc", "common", " [def] ([data] [output])", "ADL compiler", nullptr, adlcompiler);
+    ADD_TOOL(adlc, "common", " [def] ([data] [output])", "ADL compiler", nullptr, adlcompiler);
 }
diff --git a/src/acts/compiler/gsc_compiler.cpp b/src/acts/compiler/gsc_compiler.cpp
@@ -5895,6 +5895,6 @@ namespace acts::compiler {
         return tool::OK;
     }
 
-    ADD_TOOL("gscc", "gsc", " --help", "gsc compiler", nullptr, compiler);
-    ADD_TOOL("gscc_pack", "gsc", " [vm] [plt]", "pack required opcode for a vm", nullptr, gscc_pack);
+    ADD_TOOL(gscc, "gsc", " --help", "gsc compiler", nullptr, compiler);
+    ADD_TOOL(gscc_pack, "gsc", " [vm] [plt]", "pack required opcode for a vm", nullptr, gscc_pack);
 }
diff --git a/src/acts/ddl/ddl.cpp b/src/acts/ddl/ddl.cpp
@@ -735,4 +735,4 @@ namespace {
 
 
 }
-ADD_TOOL("ddlcheck", "common", "", "ddl check", nullptr, ddlcheck);
+ADD_TOOL(ddlcheck, "common", "", "ddl check", nullptr, ddlcheck);
diff --git a/src/acts/mods/mods.cpp b/src/acts/mods/mods.cpp
@@ -59,4 +59,4 @@ int mod(Process& unused, int argc, const char* argv[]) {
 	return md.m_func(argc, argv);
 }
 
-ADD_TOOL("mod", "acts", " [modname] [options]", "mods", nullptr, mod);
+ADD_TOOL(mod, "acts", " [modname] [options]", "mods", nullptr, mod);
diff --git a/src/acts/tools/bo3/bo3.cpp b/src/acts/tools/bo3/bo3.cpp
@@ -125,4 +125,4 @@ namespace {
         return ret;
     }
 }
-ADD_TOOL("injectbo3", "bo3", " (script) (replace)", "inject script (bo3)", L"BlackOps3.exe", injectbo3);
+ADD_TOOL(injectbo3, "bo3", " (script) (replace)", "inject script (bo3)", L"BlackOps3.exe", injectbo3);
diff --git a/src/acts/tools/bo3/dumpt7.cpp b/src/acts/tools/bo3/dumpt7.cpp
@@ -998,6 +998,6 @@ namespace {
 
 
 
-	ADD_TOOL("dpt7", "bo3", " [pool]", "Black Ops 3 dump pool", L"BlackOps3.exe", t7dp);
-	ADD_TOOL("wpst7", "bo3", " [output=scriptparsetree_t7]", "dump pooled scripts (bo3)", L"BlackOps3.exe", t7poolscripts);
+	ADD_TOOL(dpt7, "bo3", " [pool]", "Black Ops 3 dump pool", L"BlackOps3.exe", t7dp);
+	ADD_TOOL(wpst7, "bo3", " [output=scriptparsetree_t7]", "dump pooled scripts (bo3)", L"BlackOps3.exe", t7poolscripts);
 }
diff --git a/src/acts/tools/bo6/bo6ps4.cpp b/src/acts/tools/bo6/bo6ps4.cpp
@@ -1259,9 +1259,9 @@ namespace {
         if (c) tool::nui::SaveNextConfig();
     }
 
-    ADD_TOOL("ps4cbufbo6", "dev", " [ip:port] [cmd]", "", nullptr, ps4cbufbo6);
-    ADD_TOOL("ps4dumpbo6", "dev", " [ip:port]", "", nullptr, ps4dumpbo6);
-    ADD_TOOL("ps4repbo6", "dev", " [ip:port] [file]", "", nullptr, ps4repbo6);
-    ADD_TOOL_UI("bo6_tools", L"BO6 PS4", Render, Update, Resize);
-    ADD_TOOL_NUI("bo6_tools", "BO6 PS4", bo6_tools);
+    ADD_TOOL(ps4cbufbo6, "dev", " [ip:port] [cmd]", "", nullptr, ps4cbufbo6);
+    ADD_TOOL(ps4dumpbo6, "dev", " [ip:port]", "", nullptr, ps4dumpbo6);
+    ADD_TOOL(ps4repbo6, "dev", " [ip:port] [file]", "", nullptr, ps4repbo6);
+    ADD_TOOL_UI(bo6_tools, L"BO6 PS4", Render, Update, Resize);
+    ADD_TOOL_NUI(bo6_tools, "BO6 PS4", bo6_tools);
 }
diff --git a/src/acts/tools/coder/error_coder.cpp b/src/acts/tools/coder/error_coder.cpp
@@ -2047,8 +2047,8 @@ namespace {
 		ImGui::InputText("Decoded", decodeOutput, sizeof(decodeOutput), ImGuiInputTextFlags_ReadOnly);
 	}
 }
-ADD_TOOL_UI("errenc", L"T8/9 Error encoder", Render, Update, Resize);
-ADD_TOOL_NUI("errenc", "T8/9 Error", errenc_nui);
+ADD_TOOL_UI(errenc, L"T8/9 Error encoder", Render, Update, Resize);
+ADD_TOOL_NUI(errenc, "T8/9 Error", errenc_nui);
 
-ADD_TOOL("errenc", "hash", "[error]", "encode an error", nullptr, errenc);
-ADD_TOOL("errdec", "hash", "[w1] [w2] [w3] [w4]", "decode an error", nullptr, errdec);
+ADD_TOOL(errenc, "hash", "[error]", "encode an error", nullptr, errenc);
+ADD_TOOL(errdec, "hash", "[w1] [w2] [w3] [w4]", "decode an error", nullptr, errdec);
diff --git a/src/acts/tools/compatibility/dbf_gen.cpp b/src/acts/tools/compatibility/dbf_gen.cpp
@@ -616,6 +616,6 @@ namespace {
 		return tool::OK;
 	}
 
-	ADD_TOOL("dbfgen", "compatibility", " (in) (out)", "Gen dynamic file", nullptr, dbfgen);
-	ADD_TOOL("dbfread", "compatibility", " (out)", "Read dynamic file", nullptr, dbfread);
+	ADD_TOOL(dbfgen, "compatibility", " (in) (out)", "Gen dynamic file", nullptr, dbfgen);
+	ADD_TOOL(dbfread, "compatibility", " (out)", "Read dynamic file", nullptr, dbfread);
 }
diff --git a/src/acts/tools/compatibility/scobalula_wnigen.cpp b/src/acts/tools/compatibility/scobalula_wnigen.cpp
@@ -177,6 +177,6 @@ namespace {
 		return tool::OK;
 	}
 
-	ADD_TOOL("wni_r", "compatibility", " [input] [output] [type=csv,txt]", "Read WNI file/dir", nullptr, wni_r);
-	ADD_TOOL("wni_gen", "compatibility", " [input] [output] [canon=false]", "Gen WNI file", nullptr, wni_gen);
+	ADD_TOOL(wni_r, "compatibility", " [input] [output] [type=csv,txt]", "Read WNI file/dir", nullptr, wni_r);
+	ADD_TOOL(wni_gen, "compatibility", " [input] [output] [canon=false]", "Gen WNI file", nullptr, wni_gen);
 }
diff --git a/src/acts/tools/compatibility/serious_db2gen.cpp b/src/acts/tools/compatibility/serious_db2gen.cpp
@@ -281,8 +281,8 @@ namespace {
 		return tool::OK;
 	}
 
-	ADD_TOOL("serious_db", "compatibility", " ([type] [vm])+", "Create a t7compiler database", nullptr, builddb);
-	ADD_TOOL("serious_dbd", "compatibility", " [database]", "Dump a t7compiler database", nullptr, dumpdb);
-	ADD_TOOL("serious_remap", "compatibility", " [database] [vm] [plt] [old] [new]", "Remap an opcode in a vm", nullptr, remapdb);
+	ADD_TOOL(serious_db, "compatibility", " ([type] [vm])+", "Create a t7compiler database", nullptr, builddb);
+	ADD_TOOL(serious_dbd, "compatibility", " [database]", "Dump a t7compiler database", nullptr, dumpdb);
+	ADD_TOOL(serious_remap, "compatibility", " [database] [vm] [plt] [old] [new]", "Remap an opcode in a vm", nullptr, remapdb);
 }
 
diff --git a/src/acts/tools/compatibility/serious_fakedb2gen.cpp b/src/acts/tools/compatibility/serious_fakedb2gen.cpp
@@ -124,6 +124,6 @@ namespace {
 		return tool::OK;
 	}
 
-	ADD_TOOL("serious_fake_db", "compatibility", " [type] [vm]", "Create a FAKE t7compiler database", nullptr, fakedb);
+	ADD_TOOL(serious_fake_db, "compatibility", " [type] [vm]", "Create a FAKE t7compiler database", nullptr, fakedb);
 }
 
diff --git a/src/acts/tools/compatibility/serious_opcodes.cpp b/src/acts/tools/compatibility/serious_opcodes.cpp
@@ -107,6 +107,6 @@ namespace {
 		return tool::OK;
 	}
 
-	ADD_TOOL("serious_opcodes_read", "compatibility", " [file] [out]", "Dump opcodes file", nullptr, serious_opcodes_read);
-	ADD_TOOL("serious_opcodes_write", "compatibility", " [out] [vm] [plt]", "Create opcodes file", nullptr, serious_opcodes_write);
+	ADD_TOOL(serious_opcodes_read, "compatibility", " [file] [out]", "Dump opcodes file", nullptr, serious_opcodes_read);
+	ADD_TOOL(serious_opcodes_write, "compatibility", " [out] [vm] [plt]", "Create opcodes file", nullptr, serious_opcodes_write);
 }
diff --git a/src/acts/tools/console_ui.cpp b/src/acts/tools/console_ui.cpp
@@ -81,5 +81,5 @@ namespace tool::console_ui {
 	}
 
 
-	ADD_TOOL_NUI("zzzz7_console", "Console", console_ui);
+	ADD_TOOL_NUI(zzzz7_console, "Console", console_ui);
 }
diff --git a/src/acts/tools/cordycep_dump.cpp b/src/acts/tools/cordycep_dump.cpp
@@ -1584,6 +1584,6 @@ namespace tool::cordycep::dump {
 			return ret;
 		}
 	}
-	ADD_TOOL("csid", "compatibility", "", "Dump csi info", nullptr, csi_test);
-	ADD_TOOL("dpcord", "common", "", "Cordycep dump tool", L"Cordycep.CLI.exe", dpcord);
+	ADD_TOOL(csid, "compatibility", "", "Dump csi info", nullptr, csi_test);
+	ADD_TOOL(dpcord, "common", "", "Cordycep dump tool", L"Cordycep.CLI.exe", dpcord);
 }
diff --git a/src/acts/tools/cw/cw.cpp b/src/acts/tools/cw/cw.cpp
@@ -925,16 +925,16 @@ namespace {
 	}
 }
 
-ADD_TOOL("cwdllgt", "cw", " [gametype] (map)", "set gametype", L"BlackOpsColdWar.exe", cwdllgt);
-ADD_TOOL("cwdllac", "cw", " [action] (param str)", "run dll action", L"BlackOpsColdWar.exe", cwdllac);
+ADD_TOOL(cwdllgt, "cw", " [gametype] (map)", "set gametype", L"BlackOpsColdWar.exe", cwdllgt);
+ADD_TOOL(cwdllac, "cw", " [action] (param str)", "run dll action", L"BlackOpsColdWar.exe", cwdllac);
 
 #ifndef CI_BUILD
 
-ADD_TOOL("tcrccw", "cw", "", "test crc (cw)", nullptr, cwtestchecksum);
-ADD_TOOL("rawdecryptcw", "cw", "", " raw decrypt (cw)", nullptr, rawdecryptcw);
+ADD_TOOL(tcrccw, "cw", "", "test crc (cw)", nullptr, cwtestchecksum);
+ADD_TOOL(rawdecryptcw, "cw", "", " raw decrypt (cw)", nullptr, rawdecryptcw);
 
-ADD_TOOL("ps4_dpcw100", "cw", " [ip:port]", "dump ps4 scripts (CW)", nullptr, ps4reader100);
-ADD_TOOL("ps4_vtcw100", "cw", " [ip:port]", "dump ps4 vtable (CW)", nullptr, ps4vtable100);
-ADD_TOOL("ps4_sm100", "cw", " [ip:port] [mode=0,1,2,3]", "set mode (CW)", nullptr, ps4setmode100);
+ADD_TOOL(ps4_dpcw100, "cw", " [ip:port]", "dump ps4 scripts (CW)", nullptr, ps4reader100);
+ADD_TOOL(ps4_vtcw100, "cw", " [ip:port]", "dump ps4 vtable (CW)", nullptr, ps4vtable100);
+ADD_TOOL(ps4_sm100, "cw", " [ip:port] [mode=0,1,2,3]", "set mode (CW)", nullptr, ps4setmode100);
 
 #endif
diff --git a/src/acts/tools/cw/decrypt.cpp b/src/acts/tools/cw/decrypt.cpp
@@ -88,6 +88,6 @@ namespace {
 }
 #ifndef CI_BUILD
 
-ADD_TOOL("cwdecrypt", "cw", "", "decrypt tests", nullptr, cwdecrypt);
+ADD_TOOL(cwdecrypt, "cw", "", "decrypt tests", nullptr, cwdecrypt);
 
 #endif
diff --git a/src/acts/tools/cw/poolt9.cpp b/src/acts/tools/cw/poolt9.cpp
@@ -1582,13 +1582,13 @@ namespace {
     }
 
     using namespace cw::pool;
-    ADD_TOOL("dpcw", "cw", " [input=pool_name] (output=pool_id)", "Black Ops Cold War dump pool", L"BlackOpsColdWar.exe", pooltool);
-    ADD_TOOL("wpscw", "cw", "", "write pooled scripts (cw)", L"BlackOpsColdWar.exe", dumppoolcw);
-    ADD_TOOL("dpncw", "cw", "", "dump pool names (cw)", L"BlackOpsColdWar.exe", dpnamescw);
-    ADD_TOOL("dfuncscw", "cw", "", "dump function names (cw)", L"BlackOpsColdWar.exe", dfuncscw);
-    ADD_TOOL("dcfuncscw", "cw", "", "dump cmd names (cw)", L"BlackOpsColdWar.exe", dcfuncscw);
-    ADD_TOOL("dbgcw", "cw", " [inst]", "dbg (cw)", L"BlackOpsColdWar.exe", dbgcw);
-    ADD_TOOL("injectcw", "cw", " (script) (target) (replace)", "inject script (cw)", L"BlackOpsColdWar.exe", injectcw);
-    ADD_TOOL("injectcwalpha", "cw", " (script) (target) (replace)", "inject script (cw alpha)", L"COD2020.exe", injectcwalpha);
-    ADD_TOOL("dbgpcw", "cw", "", "dump bg pool (cw)", L"BlackOpsColdWar.exe", dbgp);
+    ADD_TOOL(dpcw, "cw", " [input=pool_name] (output=pool_id)", "Black Ops Cold War dump pool", L"BlackOpsColdWar.exe", pooltool);
+    ADD_TOOL(wpscw, "cw", "", "write pooled scripts (cw)", L"BlackOpsColdWar.exe", dumppoolcw);
+    ADD_TOOL(dpncw, "cw", "", "dump pool names (cw)", L"BlackOpsColdWar.exe", dpnamescw);
+    ADD_TOOL(dfuncscw, "cw", "", "dump function names (cw)", L"BlackOpsColdWar.exe", dfuncscw);
+    ADD_TOOL(dcfuncscw, "cw", "", "dump cmd names (cw)", L"BlackOpsColdWar.exe", dcfuncscw);
+    ADD_TOOL(dbgcw, "cw", " [inst]", "dbg (cw)", L"BlackOpsColdWar.exe", dbgcw);
+    ADD_TOOL(injectcw, "cw", " (script) (target) (replace)", "inject script (cw)", L"BlackOpsColdWar.exe", injectcw);
+    ADD_TOOL(injectcwalpha, "cw", " (script) (target) (replace)", "inject script (cw alpha)", L"COD2020.exe", injectcwalpha);
+    ADD_TOOL(dbgpcw, "cw", "", "dump bg pool (cw)", L"BlackOpsColdWar.exe", dbgp);
 }
diff --git a/src/acts/tools/dump.cpp b/src/acts/tools/dump.cpp
@@ -2103,15 +2103,15 @@ namespace {
     }
 }
 
-ADD_TOOL("dps", "bo4", " [output=pool.csv]", "dump pooled scripts", L"BlackOps4.exe", poolscripts);
-ADD_TOOL("ddv", "bo4", " [output=dvars.csv]", "dump dvars", L"BlackOps4.exe", dumpdvars);
-ADD_TOOL("wpsbo4", "bo4", " [output=scriptparsetree]", "write pooled scripts", L"BlackOps4.exe", writepoolscripts);
-ADD_TOOL("wef", "bo4", " [output=efields.csv]", "write ent fields", L"BlackOps4.exe", wef);
-ADD_TOOL("dls", "bo4", " [output=linked.csv]", "dump linked scripts", L"BlackOps4.exe", linkedscripts);
-ADD_TOOL("dfunc", "bo4", " [output=funcs.csv]", "dump functions", L"BlackOps4.exe", dumpfunctions);
-ADD_TOOL("devents", "bo4", " [output=events.csv]", "dump registered instance events", L"BlackOps4.exe", events);
-ADD_TOOL("dcfunc", "bo4", " [output=cfuncs.csv]", "dump cmd functions", L"BlackOps4.exe", dumpcmdfunctions);
-ADD_TOOL("dscfunc", "bo4", " [output=csfuncs.csv]", "dump sv cmd functions", L"BlackOps4.exe", dumpsvcmdfunctions);
-ADD_TOOL("dfields", "bo4", " [output=dfields.csv]", "dump class fields", L"BlackOps4.exe", dfields);
-ADD_TOOL("dcm", "bo4", " [output=gfxworld.json]", "dump gfx world", L"BlackOps4.exe", dcm);
-ADD_TOOL("dstorage", "bo4", " [output=storage.json]", "dump storage", L"BlackOps4.exe", dstorage);
+ADD_TOOL(dps, "bo4", " [output=pool.csv]", "dump pooled scripts", L"BlackOps4.exe", poolscripts);
+ADD_TOOL(ddv, "bo4", " [output=dvars.csv]", "dump dvars", L"BlackOps4.exe", dumpdvars);
+ADD_TOOL(wpsbo4, "bo4", " [output=scriptparsetree]", "write pooled scripts", L"BlackOps4.exe", writepoolscripts);
+ADD_TOOL(wef, "bo4", " [output=efields.csv]", "write ent fields", L"BlackOps4.exe", wef);
+ADD_TOOL(dls, "bo4", " [output=linked.csv]", "dump linked scripts", L"BlackOps4.exe", linkedscripts);
+ADD_TOOL(dfunc, "bo4", " [output=funcs.csv]", "dump functions", L"BlackOps4.exe", dumpfunctions);
+ADD_TOOL(devents, "bo4", " [output=events.csv]", "dump registered instance events", L"BlackOps4.exe", events);
+ADD_TOOL(dcfunc, "bo4", " [output=cfuncs.csv]", "dump cmd functions", L"BlackOps4.exe", dumpcmdfunctions);
+ADD_TOOL(dscfunc, "bo4", " [output=csfuncs.csv]", "dump sv cmd functions", L"BlackOps4.exe", dumpsvcmdfunctions);
+ADD_TOOL(dfields, "bo4", " [output=dfields.csv]", "dump class fields", L"BlackOps4.exe", dfields);
+ADD_TOOL(dcm, "bo4", " [output=gfxworld.json]", "dump gfx world", L"BlackOps4.exe", dcm);
+ADD_TOOL(dstorage, "bo4", " [output=storage.json]", "dump storage", L"BlackOps4.exe", dstorage);
diff --git a/src/acts/tools/fastfiles.cpp b/src/acts/tools/fastfiles.cpp
@@ -348,10 +348,10 @@ namespace {
 
 #ifndef CI_BUILD
 
-ADD_TOOL("fftest", "fastfile", " [ff]", "test fastfile", nullptr, fftest);
-ADD_TOOL("casctest", "fastfile", " [path]", "test casc", nullptr, casctest);
-ADD_TOOL("h32ck", "fastfile", " [path]", "hash checksum", nullptr, h32ck);
-ADD_TOOL("daes", "bo4", "", "dump AES keys", L"BlackOps4.exe", ffdaes);
-ADD_TOOL("daes_local", "bo4", "", "dump AES acts keys", nullptr, daes_local);
+ADD_TOOL(fftest, "fastfile", " [ff]", "test fastfile", nullptr, fftest);
+ADD_TOOL(casctest, "fastfile", " [path]", "test casc", nullptr, casctest);
+ADD_TOOL(h32ck, "fastfile", " [path]", "hash checksum", nullptr, h32ck);
+ADD_TOOL(daes, "bo4", "", "dump AES keys", L"BlackOps4.exe", ffdaes);
+ADD_TOOL(daes_local, "bo4", "", "dump AES acts keys", nullptr, daes_local);
 
 #endif
diff --git a/src/acts/tools/gsc.cpp b/src/acts/tools/gsc.cpp
@@ -3302,6 +3302,6 @@ static int gscd(Process& proc, int argc, const char* argv[]) {
     return gscinfo(proc, argc, argv);
 }
 
-ADD_TOOL("gscinfo", "gsc", " --help", "GSC decompiler/disassembler", nullptr, gscinfo);
-ADD_TOOL("gscd", "gsc", " --help", "GSC decompiler/disassembler", nullptr, gscd);
-ADD_TOOL("dds", "gsc", " [input=scriptparsetree] [output=dataset.csv]", "dump dataset from gscinfo", nullptr, dumpdataset);
+ADD_TOOL(gscinfo, "gsc", " --help", "GSC decompiler/disassembler", nullptr, gscinfo);
+ADD_TOOL(gscd, "gsc", " --help", "GSC decompiler/disassembler", nullptr, gscd);
+ADD_TOOL(dds, "gsc", " [input=scriptparsetree] [output=dataset.csv]", "dump dataset from gscinfo", nullptr, dumpdataset);
diff --git a/src/acts/tools/gsc_demo.cpp b/src/acts/tools/gsc_demo.cpp
@@ -192,6 +192,6 @@ namespace {
 
 #ifndef CI_BUILD
 
-ADD_TOOL("gscdemo", "dev", "", "", nullptr, gscdemo);
+ADD_TOOL(gscdemo, "dev", "", "", nullptr, gscdemo);
 
 #endif
diff --git a/src/acts/tools/gsc_gdb.cpp b/src/acts/tools/gsc_gdb.cpp
@@ -387,6 +387,6 @@ namespace tool::gsc::gdb {
 	}
 
 
-	ADD_TOOL("gscgdbd", "gsc", "", "decompile GSC GDB file", nullptr, gscgdbinfo);
-	ADD_TOOL("gscgdbc", "gsc", " [dir]", "compile GSC GDB file", nullptr, gscgdbc);
+	ADD_TOOL(gscgdbd, "gsc", "", "decompile GSC GDB file", nullptr, gscgdbinfo);
+	ADD_TOOL(gscgdbc, "gsc", " [dir]", "compile GSC GDB file", nullptr, gscgdbc);
 }
diff --git a/src/acts/tools/gsc_hookmap.cpp b/src/acts/tools/gsc_hookmap.cpp
@@ -372,8 +372,8 @@ namespace {
         return tool::OK;
     }
 
-    ADD_TOOL("gschook", "gsc", " [base] [dump]", "find all the linked functions of a script from a dump", nullptr, gschook);
+    ADD_TOOL(gschook, "gsc", " [base] [dump]", "find all the linked functions of a script from a dump", nullptr, gschook);
 #ifndef CI_BUILD
-    ADD_TOOL("gsclerr", "gsc", " [dump]", "find all the link errors in a gsc dump", nullptr, gsclerr);
+    ADD_TOOL(gsclerr, "gsc", " [dump]", "find all the link errors in a gsc dump", nullptr, gsclerr);
 #endif
 }
diff --git a/src/acts/tools/gsc_injector_ui.cpp b/src/acts/tools/gsc_injector_ui.cpp
@@ -717,6 +717,6 @@ namespace {
         if (c) tool::nui::SaveNextConfig();
     }
 
-    ADD_TOOL_UI("gsc_inject", L"GSC Inject", Render, Update, Resize);
-    ADD_TOOL_NUI("gsc_inject", "GSC Inject", gsc_inject);
+    ADD_TOOL_UI(gsc_inject, L"GSC Inject", Render, Update, Resize);
+    ADD_TOOL_NUI(gsc_inject, "GSC Inject", gsc_inject);
 }
diff --git a/src/acts/tools/gsc_merge.cpp b/src/acts/tools/gsc_merge.cpp
@@ -116,7 +116,7 @@ namespace {
 
 #ifndef CI_BUILD
 
-ADD_TOOL("gscmerge", "gsc", "[output] [files]+", "merge GSC files", nullptr, gscmerge);
+ADD_TOOL(gscmerge, "gsc", "[output] [files]+", "merge GSC files", nullptr, gscmerge);
 
 #endif
 
diff --git a/src/acts/tools/gsc_opcodes_load.cpp b/src/acts/tools/gsc_opcodes_load.cpp
@@ -2138,8 +2138,8 @@ namespace tool::gsc::opcode {
 		return tool::OK;
 	}
 
-	ADD_TOOL("opcodetest", "dev", "", "test opcodes names lookup", nullptr, opcodetest);
+	ADD_TOOL(opcodetest, "dev", "", "test opcodes names lookup", nullptr, opcodetest);
 #endif
-	ADD_TOOL("dop", "dev", " [file=opcodes.actsop]", "dump opcodes", nullptr, dop);
+	ADD_TOOL(dop, "dev", " [file=opcodes.actsop]", "dump opcodes", nullptr, dop);
 
 }
diff --git a/src/acts/tools/hash.cpp b/src/acts/tools/hash.cpp
@@ -1262,20 +1262,20 @@ namespace {
 
 }
 
-ADD_TOOL_UI("hash", L"Hash", Render, Update, Resize);
-ADD_TOOL_NUI("hash", "Hash", hash_nui);
-ADD_TOOL_NUI("hashsearch", "Searcher", hashsearch_nui);
-
-ADD_TOOL("lookup", "hash", " (string)*", "lookup strings", nullptr, lookuptool);
-ADD_TOOL("expand_gen", "hash", " [count]", "expand test", nullptr, expand_gen);
-ADD_TOOL("h32", "hash", " (string)*", "hash strings", nullptr, hash32);
-ADD_TOOL("h64", "hash", " (string)*", "hash strings", nullptr, hash64);
-ADD_TOOL("ht7", "hash", " (string)*", "hash strings", nullptr, hasht7);
-ADD_TOOL("httest", "hash", " (string)*", "hash strings", nullptr, httest);
-ADD_TOOL("fnv1acrack", "hash", " [string] [hash] [iv]", "crack fnv1a key, base iv: 100000001b3, 10000000233", nullptr, fnv1acrack);
-ADD_TOOL("fnv1acrack2", "hash", " [csv] [iv]", "crack fnv1a key (one key based)", nullptr, fnv1acrack2);
-ADD_TOOL("fnv1acrack3", "hash", " [csv] [iv]", "crack fnv1a keys (first char based)", nullptr, fnv1acrack3);
-ADD_TOOL("str", "hash", "", "check collisions in the string file", nullptr, collisiontool);
+ADD_TOOL_UI(hash, L"Hash", Render, Update, Resize);
+ADD_TOOL_NUI(hash, "Hash", hash_nui);
+ADD_TOOL_NUI(hashsearch, "Searcher", hashsearch_nui);
+
+ADD_TOOL(lookup, "hash", " (string)*", "lookup strings", nullptr, lookuptool);
+ADD_TOOL(expand_gen, "hash", " [count]", "expand test", nullptr, expand_gen);
+ADD_TOOL(h32, "hash", " (string)*", "hash strings", nullptr, hash32);
+ADD_TOOL(h64, "hash", " (string)*", "hash strings", nullptr, hash64);
+ADD_TOOL(ht7, "hash", " (string)*", "hash strings", nullptr, hasht7);
+ADD_TOOL(httest, "hash", " (string)*", "hash strings", nullptr, httest);
+ADD_TOOL(fnv1acrack, "hash", " [string] [hash] [iv]", "crack fnv1a key, base iv: 100000001b3, 10000000233", nullptr, fnv1acrack);
+ADD_TOOL(fnv1acrack2, "hash", " [csv] [iv]", "crack fnv1a key (one key based)", nullptr, fnv1acrack2);
+ADD_TOOL(fnv1acrack3, "hash", " [csv] [iv]", "crack fnv1a keys (first char based)", nullptr, fnv1acrack3);
+ADD_TOOL(str, "hash", "", "check collisions in the string file", nullptr, collisiontool);
 #ifndef CI_BUILD
-ADD_TOOL("fakefnvds", "hash", " [csv] [key] [iv]", "gen fake fnv1a dataset", nullptr, fakefnvds);
+ADD_TOOL(fakefnvds, "hash", " [csv] [key] [iv]", "gen fake fnv1a dataset", nullptr, fakefnvds);
 #endif
diff --git a/src/acts/tools/hashes/compiled_files.cpp b/src/acts/tools/hashes/compiled_files.cpp
@@ -135,6 +135,6 @@ namespace {
 		return tool::OK;
 	}
 
-	ADD_TOOL("cfd", "hash", " [dir] (output)", "decompile raw compiled file (.cf)", nullptr, cfd);
+	ADD_TOOL(cfd, "hash", " [dir] (output)", "decompile raw compiled file (.cf)", nullptr, cfd);
 
 }