diff --git a/src/h1/xsk/resolver.cpp b/src/h1/xsk/resolver.cpp
index 99720e4f..3bdbc7ca 100644
--- a/src/h1/xsk/resolver.cpp
+++ b/src/h1/xsk/resolver.cpp
@@ -417,70 +417,70 @@ const std::array<std::pair<std::uint8_t, const char*>, 154> opcode_list
 
 const std::array<std::pair<std::uint16_t, const char*>, 778> function_list
 {{
-    { 0x001, "_func_001" },
-    { 0x002, "_func_002" },
-    { 0x003, "_func_003" },
-    { 0x004, "_func_004" },
-    { 0x005, "_func_005" },
-    { 0x006, "_func_006" },
-    { 0x007, "_func_007" },
-    { 0x008, "_func_008" },
-    { 0x009, "_func_009" },
-    { 0x00A, "_func_00A" },
-    { 0x00B, "_func_00B" },
-    { 0x00C, "_func_00C" },
-    { 0x00D, "_func_00D" },
-    { 0x00E, "_func_00E" },
-    { 0x00F, "_func_00F" },
+    { 0x001, "precacheturret" },
+    { 0x002, "getweaponarray" },
+    { 0x003, "createprintchannel" },
+    { 0x004, "updategamerprofileall" },
+    { 0x005, "clearlocalizedstrings" },
+    { 0x006, "setphysicsgravitydir" },
+    { 0x007, "gettimescale" },
+    { 0x008, "settimescale" },
+    { 0x009, "setslowmotionview" },
+    { 0x00A, "teleportscene" },
+    { 0x00B, "forcesharedammo" },
+    { 0x00C, "refreshhudcompass" },
+    { 0x00D, "refreshhudammocounter" },
+    { 0x00E, "notifyoncommand" },
+    { 0x00F, "setprintchannel" },
     { 0x010, "print" },
     { 0x011, "println" },
-    { 0x012, "_func_012" },
-    { 0x013, "_func_013" },
-    { 0x014, "_func_014" },
-    { 0x015, "_func_015" },
-    { 0x016, "_func_016" },
-    { 0x017, "_func_017" },
-    { 0x018, "_func_018" },
-    { 0x019, "_func_019" },
-    { 0x01A, "_func_01A" },
-    { 0x01B, "_func_01B" },
-    { 0x01C, "_func_01C" },
-    { 0x01D, "_func_01D" },
-    { 0x01E, "_func_01E" },
-    { 0x01F, "_func_01F" },
-    { 0x020, "_func_020" },
-    { 0x021, "_func_021" },
-    { 0x022, "_func_022" },
-    { 0x023, "_func_023" },
-    { 0x024, "_func_024" },
-    { 0x025, "_func_025" },
-    { 0x026, "_func_026" },
+    { 0x012, "print3d" },
+    { 0x013, "line" },
+    { 0x014, "box" },
+    { 0x015, "orientedbox" },
+    { 0x016, "sphere" },
+    { 0x017, "cylinder" },
+    { 0x018, "spawnturret" },
+    { 0x019, "canspawnturret" },
+    { 0x01A, "assert" },
+    { 0x01B, "pausecinematicingame" },
+    { 0x01C, "drawcompassfriendlies" },
+    { 0x01D, "bulletspread" },
+    { 0x01E, "bullettracer" },
+    { 0x01F, "badplace_delete" },
+    { 0x020, "badplace_cylinder" },
+    { 0x021, "badplace_arc" },
+    { 0x022, "badplace_brush" },
+    { 0x023, "clearallcorpses" },
+    { 0x024, "setturretnode" },
+    { 0x025, "unsetturretnode" },
+    { 0x026, "setnodepriority" },
     { 0x027, "_func_027" },
     { 0x028, "_func_028" },
     { 0x029, "_func_029" },
     { 0x02A, "_func_02A" },
     { 0x02B, "_func_02B" },
-    { 0x02C, "_func_02C" },
-    { 0x02D, "_func_02D" },
-    { 0x02E, "_func_02E" },
+    { 0x02C, "updategamerprofile" },
+    { 0x02D, "assertex" },
+    { 0x02E, "assertmsg" },
     { 0x02F, "isdefined" },
-    { 0x030, "_func_030" },
-    { 0x031, "_func_031" },
-    { 0x032, "_func_032" },
-    { 0x033, "_func_033" },
-    { 0x034, "_func_034" },
-    { 0x035, "_func_035" },
-    { 0x036, "_func_036" },
-    { 0x037, "_func_037" },
-    { 0x038, "_func_038" },
-    { 0x039, "_func_039" },
-    { 0x03A, "_func_03A" },
-    { 0x03B, "_func_03B" },
-    { 0x03C, "_func_03C" },
-    { 0x03D, "_func_03D" },
-    { 0x03E, "_func_03E" },
-    { 0x03F, "_func_03F" },
-    { 0x040, "_func_040" },
+    { 0x030, "isvalidmissile" },
+    { 0x031, "isstring" },
+    { 0x032, "setomnvar" },
+    { 0x033, "getomnvar" },
+    { 0x034, "setdvar" },
+    { 0x035, "setdynamicdvar" },
+    { 0x036, "setdvarifuninitialized" },
+    { 0x037, "setdevdvar" },
+    { 0x038, "setdevdvarifuninitialized" },
+    { 0x039, "getdvar" },
+    { 0x03A, "getdvarint" },
+    { 0x03B, "getdvarfloat" },
+    { 0x03C, "getdvarvector" },
+    { 0x03D, "gettime" },
+    { 0x03E, "gettimeutc" },
+    { 0x03F, "getradiometricunit" },
+    { 0x040, "getentbynum" },
     { 0x041, "_func_041" },
     { 0x042, "_func_042" },
     { 0x043, "_func_043" },
@@ -517,10 +517,10 @@ const std::array<std::pair<std::uint16_t, const char*>, 778> function_list
     { 0x062, "_func_062" },
     { 0x063, "_func_063" },
     { 0x064, "_func_064" },
-    { 0x065, "_func_065" },
-    { 0x066, "_func_066" },
-    { 0x067, "_func_067" },
-    { 0x068, "_func_068" },
+    { 0x065, "getanimlength" },
+    { 0x066, "animhasnotetrack" },
+    { 0x067, "getnotetracktimes" },
+    { 0x068, "spawn" },
     { 0x069, "_func_069" },
     { 0x06A, "_func_06A" },
     { 0x06B, "_func_06B" },
@@ -696,9 +696,9 @@ const std::array<std::pair<std::uint16_t, const char*>, 778> function_list
     { 0x115, "_func_115" },
     { 0x116, "_func_116" },
     { 0x117, "_func_117" },
-    { 0x118, "_func_118" },
-    { 0x119, "_func_119" },
-    { 0x11A, "_func_11A" },
+    { 0x118, "anglestoup" },
+    { 0x119, "anglestoright" },
+    { 0x11A, "anglestoforward" },
     { 0x11B, "_func_11B" },
     { 0x11C, "_func_11C" },
     { 0x11D, "_func_11D" },
@@ -743,25 +743,25 @@ const std::array<std::pair<std::uint16_t, const char*>, 778> function_list
     { 0x144, "_func_144" },
     { 0x145, "_func_145" },
     { 0x146, "_func_146" },
-    { 0x147, "_func_147" },
-    { 0x148, "_func_148" },
-    { 0x149, "_func_149" },
-    { 0x14A, "_func_14A" },
-    { 0x14B, "_func_14B" },
-    { 0x14C, "_func_14C" },
-    { 0x14D, "_func_14D" },
-    { 0x14E, "_func_14E" },
-    { 0x14F, "_func_14F" },
-    { 0x150, "_func_150" },
-    { 0x151, "_func_151" },
-    { 0x152, "_func_152" },
-    { 0x153, "_func_153" },
-    { 0x154, "_func_154" },
-    { 0x155, "_func_155" },
-    { 0x156, "_func_156" },
-    { 0x157, "_func_157" },
-    { 0x158, "_func_158" },
-    { 0x159, "_func_159" },
+    { 0x147, "precachemodel" },
+    { 0x148, "precacheshellshock" },
+    { 0x149, "precacheitem" },
+    { 0x14A, "precacheshader" },
+    { 0x14B, "precachestring" },
+    { 0x14C, "precachemenu" },
+    { 0x14D, "precacherumble" },
+    { 0x14E, "precachelocationselector" },
+    { 0x14F, "precacheleaderboards" },
+    { 0x150, "loadfx" },
+    { 0x151, "playfx" },
+    { 0x152, "playfxontag" },
+    { 0x153, "stopfxontag" },
+    { 0x154, "killfxontag" },
+    { 0x155, "playloopedfx" },
+    { 0x156, "spawnfx" },
+    { 0x157, "triggerfx" },
+    { 0x158, "playfxontagforclients" },
+    { 0x159, "setfxkillondelete" },
     { 0x15A, "_func_15A" },
     { 0x15B, "_func_15B" },
     { 0x15C, "_func_15C" },
diff --git a/src/s1/xsk/resolver.cpp b/src/s1/xsk/resolver.cpp
index 5c826e33..ae631e01 100644
--- a/src/s1/xsk/resolver.cpp
+++ b/src/s1/xsk/resolver.cpp
@@ -464,10 +464,10 @@ const std::array<std::pair<std::uint16_t, const char*>, 735> function_list
     { 0x020, "badplace_cylinder" },
     { 0x021, "badplace_arc" },
     { 0x022, "badplace_brush" },
-    { 0x023, "_func_023" }, // SP 0x140261020
-    { 0x024, "_func_024" }, // SP 0x14027EA80
-    { 0x025, "_func_025" }, // SP 0x14027EB20
-    { 0x026, "_func_026" }, // SP 0x14027E9B0
+    { 0x023, "clearallcorpses" }, // SP 0x140261020
+    { 0x024, "setturretnode" }, // SP 0x14027EA80
+    { 0x025, "unsetturretnode" }, // SP 0x14027EB20
+    { 0x026, "setnodepriority" }, // SP 0x14027E9B0
     { 0x027, "_func_027" }, // SP 0x14027E870
     { 0x028, "_func_028" }, // empty
     { 0x029, "_func_029" }, // empty
@@ -492,7 +492,7 @@ const std::array<std::pair<std::uint16_t, const char*>, 735> function_list
     { 0x03C, "getdvarvector" },
     { 0x03D, "gettime" },
     { 0x03E, "gettimeutc" },
-    { 0x03F, "_func_03F" }, // SP 0x14024B9C0, MP 0x1403156A0
+    { 0x03F, "getradiometricunit" },
     { 0x040, "getentbynum" },
     { 0x041, "getweaponmodel" },
     { 0x042, "getculldist" },