From 806ab0ddd5a5e799bad32e705a3e769d9c7c169d Mon Sep 17 00:00:00 2001
From: jtuu <joona.tuukkanen@gmail.com>
Date: Wed, 2 Oct 2019 16:45:40 +0300
Subject: [PATCH] [VM] Implement arg_pushr, b, w, and s correctly. Remove
 arg_pusha and o because they are tricky and low priority.

---
 src/quest_editor/scripting/vm/index.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/quest_editor/scripting/vm/index.ts b/src/quest_editor/scripting/vm/index.ts
index 426b8755..794afe5c 100644
--- a/src/quest_editor/scripting/vm/index.ts
+++ b/src/quest_editor/scripting/vm/index.ts
@@ -1,4 +1,4 @@
-import { Instruction, InstructionSegment, Segment, SegmentType, Arg } from "../instructions";
+import { Instruction, InstructionSegment, Segment, SegmentType, Arg, new_arg } from "../instructions";
 import {
     OP_CALL,
     OP_CLEAR,
@@ -138,12 +138,18 @@ export class VirtualMachine {
                 this.jump_to_label(exec, inst.args[0].value);
                 break;
             case OP_ARG_PUSHR:
+                // deref given register ref
+                this.push_arg_stack(exec, new_arg(
+                    this.get_sint(inst.args[0].value),
+                    REGISTER_SIZE,
+                    inst.args[0].asm
+                ));
+                break;
             case OP_ARG_PUSHL:
             case OP_ARG_PUSHB:
             case OP_ARG_PUSHW:
-            case OP_ARG_PUSHA:
-            case OP_ARG_PUSHO:
             case OP_ARG_PUSHS:
+                // push arg as-is
                 this.push_arg_stack(exec, inst.args[0].value);
                 break;
             default: