fix waitframe opcodes

2022-08-26 00:19:22 +02:00 · 2022-08-26 00:19:22 +02:00 · d8a651a844
commit d8a651a844
parent f3c707a769
17 changed files with 21 additions and 21 deletions
--- 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:
--- 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:
--- 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:
--- 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,
--- 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:
--- 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:
--- 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:
--- 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,
--- 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:
--- 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:
--- 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:
--- 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,
--- 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:
--- 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:
--- 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:
--- 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,
--- 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