[dynmulti] left/top read from variables

Fervstheone · Nov 29, 2023 · cefb05b · cefb05b
1 parent ecab5cc
commit cefb05b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
@@ -1731,8 +1731,8 @@
 
 	.macro _dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req, callbacks:req argv:vararg
 	.byte 0xe3
-	.byte \left
-	.byte \top
+	.2byte \left
+	.2byte \top
 	.byte \ignoreBPress
 	.byte \maxBeforeScroll
 	.byte \shouldSort

diff --git a/src/scrcmd.c b/src/scrcmd.c
@@ -1376,8 +1376,8 @@ static void DynamicMultichoiceSortList(struct ListMenuItem *items, u32 count)
 bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx)
 {
     u32 i;
-    u32 left = ScriptReadByte(ctx);
-    u32 top = ScriptReadByte(ctx);
+    u32 left = VarGet(ScriptReadHalfword(ctx));
+    u32 top = VarGet(ScriptReadHalfword(ctx));
     bool32 ignoreBPress = ScriptReadByte(ctx);
     u32 maxBeforeScroll = ScriptReadByte(ctx);
     bool32 shouldSort = ScriptReadByte(ctx);