fix(zscript): Trace(string) using wrong register

ZQuestClassic · Apr 17, 2024 · d845df6 · d845df6
1 parent 40537d3
commit d845df6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/parser/symbols/GlobalSymbols.cpp b/src/parser/symbols/GlobalSymbols.cpp
@@ -495,7 +495,7 @@ void GlobalSymbols::generateCode()
 		Function* function = getFunction("TraceS");
 		int32_t label = function->getLabel();
 		vector<shared_ptr<Opcode>> code;
-		addOpcode2 (code, new OPopRegister(new VarArgument(INDEX)));
+		addOpcode2 (code, new OPopRegister(new VarArgument(EXP2)));
 		LABELBACK(label);
 		addOpcode2 (code, new OTrace6Register(new VarArgument(EXP2)));
 		RETURN();

diff --git a/tests/scripts/armos_expected.txt b/tests/scripts/armos_expected.txt
@@ -13818,7 +13818,7 @@ ALLOCATEMEMV d2,43
 STORED d2,0
 WRITEPODSTRING d2,"ghost.zh: Failed to find prototype eweapon"
 LOADD d2,0
-SETR d0,d2
+SETR d3,d2
 TRACE6 d3
 TRACE3
 SETV d2,0