Fix DEO to work consistently with existing deo_fn

1 files changed, 43 insertions, 5 deletions

diff --git a/src/uxn-core.s b/src/uxn-core.s
index c73d44c..17f57a3 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -18,7 +18,39 @@ rst: .space 256
 rst_ptr: .word rst
 
 .global device_data
-device_data: .space 256
+device_data:
+    .global device_0
+    device_0: .space 16
+    .global device_1
+    device_1: .space 16
+    .global device_2
+    device_2: .space 16
+    .global device_3
+    device_3: .space 16
+    .global device_4
+    device_4: .space 16
+    .global device_5
+    device_5: .space 16
+    .global device_6
+    device_6: .space 16
+    .global device_7
+    device_7: .space 16
+    .global device_8
+    device_8: .space 16
+    .global device_9
+    device_9: .space 16
+    .global device_a
+    device_a: .space 16
+    .global device_b
+    device_b: .space 16
+    .global device_c
+    device_c: .space 16
+    .global device_d
+    device_d: .space 16
+    .global device_e
+    device_e: .space 16
+    .global device_f
+    device_f: .space 16
 
 @ UXN evaluation function.
 @
@@ -824,8 +856,11 @@ deo:
     adr     r6, deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
-    mov     r0, r3
-    mov     r1, r5
+    adr     r0, device_data
+    lsl     r4, #4
+    add     r0, r4
+    strb    r5, [r0, r3]
+    mov     r1, r3
     mov     lr, pc
     bx      r6
     ldmfd   sp!, {r0, r7, lr}
@@ -841,8 +876,11 @@ deo2:
     adr     r6, deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
-    mov     r0, r3
-    mov     r1, r5
+    adr     r0, device_data
+    lsl     r4, #4
+    add     r0, r4
+    strh    r5, [r0, r3]
+    mov     r1, r3
     mov     lr, pc
     bx      r6
     ldmfd   sp!, {r0, r7, lr}