From 53fe45351b315127f24062243c422ea8f41af3dd Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Sat, 1 Aug 2020 19:07:25 +0200
Subject: [PATCH] fix for multidimensional arrays

---
 src/basic/engine_variables/assign_variable.s         |  4 ++--
 src/basic/engine_variables/fetch_variable_arr.s      | 12 ++++++------
 .../helper_array_fetch_dimension_46K_50K.s           |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/basic/engine_variables/assign_variable.s b/src/basic/engine_variables/assign_variable.s
index be28c998..64f047aa 100644
--- a/src/basic/engine_variables/assign_variable.s
+++ b/src/basic/engine_variables/assign_variable.s
@@ -34,10 +34,10 @@ assign_variable:
 	inx
 	jsr helper_fetch_arr_coord
 
-	lda LINNUM+0
-	pha
 	lda LINNUM+1
 	pha
+	lda LINNUM+0
+	pha
 
 	// Check if more dimensions are given
 
diff --git a/src/basic/engine_variables/fetch_variable_arr.s b/src/basic/engine_variables/fetch_variable_arr.s
index f577eaf6..45228114 100644
--- a/src/basic/engine_variables/fetch_variable_arr.s
+++ b/src/basic/engine_variables/fetch_variable_arr.s
@@ -31,10 +31,10 @@ fetch_variable_arr_fetch_coords_loop:
 
 	jsr helper_fetch_arr_coord
 
-	lda LINNUM+0
-	pha
 	lda LINNUM+1
 	pha
+	lda LINNUM+0
+	pha
 
 	// If more coordinates given - next iteration
 
@@ -104,10 +104,10 @@ fetch_variable_arr_calc_pos_loop:
 	ldx #<VARPNT
 
 	jsr peek_under_roms
-	sta __FAC1+3
+	sta __FAC1+4
 	iny
 	jsr peek_under_roms
-	sta __FAC1+4
+	sta __FAC1+3
 	iny
 
 #elif CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
@@ -117,10 +117,10 @@ fetch_variable_arr_calc_pos_loop:
 #else // CONFIG_MEMORY_MODEL_38
 
 	lda (VARPNT), y
-	sta __FAC1+3
+	sta __FAC1+4
 	iny
 	lda (VARPNT), y
-	sta __FAC1+4
+	sta __FAC1+3
 	iny
 
 #endif
diff --git a/src/basic/engine_variables/helper_array_fetch_dimension_46K_50K.s b/src/basic/engine_variables/helper_array_fetch_dimension_46K_50K.s
index 0bdb8167..c53efb9e 100644
--- a/src/basic/engine_variables/helper_array_fetch_dimension_46K_50K.s
+++ b/src/basic/engine_variables/helper_array_fetch_dimension_46K_50K.s
@@ -16,10 +16,10 @@ helper_array_fetch_dimension:
 	// Fetch the dimension
 
 	lda (VARPNT), y
-	sta __FAC1+3
+	sta __FAC1+4
 	iny
 	lda (VARPNT), y
-	sta __FAC1+4
+	sta __FAC1+3
 	iny
 
 	// Restore default memory mapping