diff --git a/src/h1/xsk/assembler.cpp b/src/h1/xsk/assembler.cpp
index c0d6be69..b86ddd40 100644
--- a/src/h1/xsk/assembler.cpp
+++ b/src/h1/xsk/assembler.cpp
@@ -192,8 +192,8 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/h1/xsk/disassembler.cpp b/src/h1/xsk/disassembler.cpp
index 953854a2..e03c34c2 100644
--- a/src/h1/xsk/disassembler.cpp
+++ b/src/h1/xsk/disassembler.cpp
@@ -117,8 +117,8 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst)
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/h1/xsk/h1.cpp b/src/h1/xsk/h1.cpp
index 9b713134..142051bd 100644
--- a/src/h1/xsk/h1.cpp
+++ b/src/h1/xsk/h1.cpp
@@ -45,8 +45,8 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/h1/xsk/h1.hpp b/src/h1/xsk/h1.hpp
index efe2d84d..4a37b392 100644
--- a/src/h1/xsk/h1.hpp
+++ b/src/h1/xsk/h1.hpp
@@ -97,8 +97,8 @@ enum class opcode : std::uint8_t
     OP_GetFarFunction = 0x60,
     OP_less = 0x61,
     OP_GetGameRef = 0x62,
-    OP_waitFrame = 0x63,
-    OP_waittillFrameEnd = 0x64,
+    OP_waittillFrameEnd = 0x63,
+    OP_waitFrame = 0x64,
     OP_SafeSetVariableFieldCached0 = 0x65,
     OP_SafeSetVariableFieldCached = 0x66,
     OP_ScriptMethodChildThreadCallPointer = 0x67,
diff --git a/src/h2/xsk/assembler.cpp b/src/h2/xsk/assembler.cpp
index 2f23528e..13875286 100644
--- a/src/h2/xsk/assembler.cpp
+++ b/src/h2/xsk/assembler.cpp
@@ -192,8 +192,8 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/h2/xsk/disassembler.cpp b/src/h2/xsk/disassembler.cpp
index 7303105d..848f8111 100644
--- a/src/h2/xsk/disassembler.cpp
+++ b/src/h2/xsk/disassembler.cpp
@@ -117,8 +117,8 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst)
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/h2/xsk/h2.cpp b/src/h2/xsk/h2.cpp
index 2f53f025..2d59d6db 100644
--- a/src/h2/xsk/h2.cpp
+++ b/src/h2/xsk/h2.cpp
@@ -45,8 +45,8 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/h2/xsk/h2.hpp b/src/h2/xsk/h2.hpp
index b035d383..0d0cf256 100644
--- a/src/h2/xsk/h2.hpp
+++ b/src/h2/xsk/h2.hpp
@@ -97,8 +97,8 @@ enum class opcode : std::uint8_t
     OP_GetFarFunction = 0x60,
     OP_less = 0x61,
     OP_GetGameRef = 0x62,
-    OP_waitFrame = 0x63,
-    OP_waittillFrameEnd = 0x64,
+    OP_waittillFrameEnd = 0x63,
+    OP_waitFrame = 0x64,
     OP_SafeSetVariableFieldCached0 = 0x65,
     OP_SafeSetVariableFieldCached = 0x66,
     OP_ScriptMethodChildThreadCallPointer = 0x67,
diff --git a/src/s1/xsk/assembler.cpp b/src/s1/xsk/assembler.cpp
index b9717d83..b77fafb5 100644
--- a/src/s1/xsk/assembler.cpp
+++ b/src/s1/xsk/assembler.cpp
@@ -192,8 +192,8 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/s1/xsk/disassembler.cpp b/src/s1/xsk/disassembler.cpp
index 72845aac..b72884e0 100644
--- a/src/s1/xsk/disassembler.cpp
+++ b/src/s1/xsk/disassembler.cpp
@@ -117,8 +117,8 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst)
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/s1/xsk/s1.cpp b/src/s1/xsk/s1.cpp
index 205f3633..c4b7dc40 100644
--- a/src/s1/xsk/s1.cpp
+++ b/src/s1/xsk/s1.cpp
@@ -45,8 +45,8 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/s1/xsk/s1.hpp b/src/s1/xsk/s1.hpp
index 567c96e5..e72a10be 100644
--- a/src/s1/xsk/s1.hpp
+++ b/src/s1/xsk/s1.hpp
@@ -97,8 +97,8 @@ enum class opcode : std::uint8_t
     OP_GetFarFunction = 0x60,
     OP_less = 0x61,
     OP_GetGameRef = 0x62,
-    OP_waitFrame = 0x63,
-    OP_waittillFrameEnd = 0x64,
+    OP_waittillFrameEnd = 0x63,
+    OP_waitFrame = 0x64,
     OP_SafeSetVariableFieldCached0 = 0x65,
     OP_SafeSetVariableFieldCached = 0x66,
     OP_ScriptMethodChildThreadCallPointer = 0x67,
diff --git a/src/s2/xsk/assembler.cpp b/src/s2/xsk/assembler.cpp
index edcaf0cc..60b40233 100644
--- a/src/s2/xsk/assembler.cpp
+++ b/src/s2/xsk/assembler.cpp
@@ -192,8 +192,8 @@ void assembler::assemble_instruction(const instruction::ptr& inst)
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/s2/xsk/disassembler.cpp b/src/s2/xsk/disassembler.cpp
index c33c5245..4903a897 100644
--- a/src/s2/xsk/disassembler.cpp
+++ b/src/s2/xsk/disassembler.cpp
@@ -117,8 +117,8 @@ void disassembler::dissasemble_instruction(const instruction::ptr& inst)
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/s2/xsk/s2.cpp b/src/s2/xsk/s2.cpp
index f4bbf0c9..dc548879 100644
--- a/src/s2/xsk/s2.cpp
+++ b/src/s2/xsk/s2.cpp
@@ -45,8 +45,8 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
         case opcode::OP_EvalLocalArrayRefCached0:
         case opcode::OP_less:
         case opcode::OP_GetGameRef:
-        case opcode::OP_waitFrame:
         case opcode::OP_waittillFrameEnd:
+        case opcode::OP_waitFrame:
         case opcode::OP_SafeSetVariableFieldCached0:
         case opcode::OP_GetLevel:
         case opcode::OP_notify:
diff --git a/src/s2/xsk/s2.hpp b/src/s2/xsk/s2.hpp
index c3d8b266..4b92c6a4 100644
--- a/src/s2/xsk/s2.hpp
+++ b/src/s2/xsk/s2.hpp
@@ -97,8 +97,8 @@ enum class opcode : std::uint8_t
     OP_GetFarFunction = 0x60,
     OP_less = 0x61,
     OP_GetGameRef = 0x62,
-    OP_waitFrame = 0x63,
-    OP_waittillFrameEnd = 0x64,
+    OP_waittillFrameEnd = 0x63,
+    OP_waitFrame = 0x64,
     OP_SafeSetVariableFieldCached0 = 0x65,
     OP_SafeSetVariableFieldCached = 0x66,
     OP_ScriptMethodChildThreadCallPointer = 0x67,
diff --git a/src/utils/xsk/gsc/nodetree.cpp b/src/utils/xsk/gsc/nodetree.cpp
index ddd0ef7a..b4bdcdba 100644
--- a/src/utils/xsk/gsc/nodetree.cpp
+++ b/src/utils/xsk/gsc/nodetree.cpp
@@ -1026,7 +1026,7 @@ auto stmt_waittillframeend::print() const -> std::string
 
 auto stmt_waitframe::print() const -> std::string
 {
-    return "waitframe;";
+    return "waitframe();";
 };
 
 auto stmt_if::print() const -> std::string