From 882ae2a693a50cdfa072462be2d57b93078cf916 Mon Sep 17 00:00:00 2001
From: Bad Diode <bd@badd10de.dev>
Date: Wed, 18 Aug 2021 09:42:00 +0200
Subject: Update UXN core with INC/DEC changes

---
 src/main.c | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 06d2d5b..c15a9e3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -229,22 +229,22 @@ init_uxn(Uxn *u) {
     memcpy(u->ram.dat + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
 
     // Prepare devices.
-    portuxn(u, 0x0, "system", system_talk);
-    portuxn(u, 0x1, "console", console_talk);
-    devscreen = portuxn(u, 0x2, "screen", screen_talk);
-    devaudio = portuxn(u, 0x3, "audio0", audio_talk);
-    portuxn(u, 0x4, "audio1", audio_talk);
-    portuxn(u, 0x5, "audio2", audio_talk);
-    portuxn(u, 0x6, "audio3", audio_talk);
-    portuxn(u, 0x7, "---", nil_talk);
-    devctrl = portuxn(u, 0x8, "controller", nil_talk);
-    devmouse = portuxn(u, 0x9, "mouse", nil_talk);
-    portuxn(u, 0xa, "file", file_talk);
-    portuxn(u, 0xb, "datetime", datetime_talk);
-    portuxn(u, 0xc, "---", nil_talk);
-    portuxn(u, 0xd, "---", nil_talk);
-    portuxn(u, 0xe, "---", nil_talk);
-    portuxn(u, 0xf, "---", nil_talk);
+    uxn_port(u, 0x0, "system", system_talk);
+    uxn_port(u, 0x1, "console", console_talk);
+    devscreen = uxn_port(u, 0x2, "screen", screen_talk);
+    devaudio = uxn_port(u, 0x3, "audio0", audio_talk);
+    uxn_port(u, 0x4, "audio1", audio_talk);
+    uxn_port(u, 0x5, "audio2", audio_talk);
+    uxn_port(u, 0x6, "audio3", audio_talk);
+    uxn_port(u, 0x7, "---", nil_talk);
+    devctrl = uxn_port(u, 0x8, "controller", nil_talk);
+    devmouse = uxn_port(u, 0x9, "mouse", nil_talk);
+    uxn_port(u, 0xa, "file", file_talk);
+    uxn_port(u, 0xb, "datetime", datetime_talk);
+    uxn_port(u, 0xc, "---", nil_talk);
+    uxn_port(u, 0xd, "---", nil_talk);
+    uxn_port(u, 0xe, "---", nil_talk);
+    uxn_port(u, 0xf, "---", nil_talk);
     mempoke16(devscreen->dat, 2, ppu.hor * 8);
     mempoke16(devscreen->dat, 4, ppu.ver * 8);
 }
@@ -258,7 +258,7 @@ handle_input(Uxn *u) {
         switch (ctrl_methods[ctrl_idx]) {
             case CONTROL_CONTROLLER: {
                 devctrl->dat[2] = 0;
-                evaluxn(u, mempeek16(devctrl->dat, 0));
+                uxn_eval(u, mempeek16(devctrl->dat, 0));
                 devctrl->dat[3] = 0;
             } break;
             case CONTROL_MOUSE: {
@@ -266,7 +266,7 @@ handle_input(Uxn *u) {
                 devmouse->dat[7] = 0;
                 mempoke16(devmouse->dat, 0x2, -10);
                 mempoke16(devmouse->dat, 0x4, -10);
-                evaluxn(u, mempeek16(devmouse->dat, 0));
+                uxn_eval(u, mempeek16(devmouse->dat, 0));
             } break;
             case CONTROL_KEYBOARD: {
                 toggle_keyboard();
@@ -327,7 +327,7 @@ handle_input(Uxn *u) {
             *flag &= ~0x80;
         }
 
-        evaluxn(u, mempeek16(devctrl->dat, 0));
+        uxn_eval(u, mempeek16(devctrl->dat, 0));
         devctrl->dat[3] = 0;
     } else if (ctrl_methods[ctrl_idx] == CONTROL_MOUSE) {
         // Detect "mouse key press".
@@ -367,7 +367,7 @@ handle_input(Uxn *u) {
         // Eval mouse.
         mempoke16(devmouse->dat, 0x2, mouse.x);
         mempoke16(devmouse->dat, 0x4, mouse.y);
-        evaluxn(u, mempeek16(devmouse->dat, 0));
+        uxn_eval(u, mempeek16(devmouse->dat, 0));
     } else if (ctrl_methods[ctrl_idx] == CONTROL_KEYBOARD) {
         if (key_tap(KEY_LEFT)) {
             update_cursor(cursor_position - 1);
@@ -411,7 +411,7 @@ handle_input(Uxn *u) {
                     devctrl->dat[3] = symbol;
                 } break;
             }
-            evaluxn(u, mempeek16(devctrl->dat, 0));
+            uxn_eval(u, mempeek16(devctrl->dat, 0));
             devctrl->dat[3] = 0;
         }
     }
@@ -445,12 +445,12 @@ int main(void) {
     init_sound();
 
     // Main loop.
-    evaluxn(&u, 0x0100);
+    uxn_eval(&u, 0x0100);
     PROF_INIT();
     while(true) {
         bios_vblank_wait();
         PROF(handle_input(&u), input_cycles);
-        PROF(evaluxn(&u, mempeek16(devscreen->dat, 0)), eval_cycles);
+        PROF(uxn_eval(&u, mempeek16(devscreen->dat, 0)), eval_cycles);
         PROF(sound_mix(), mix_cycles);
         PROF_SHOW();
         PROF(flipbuf(&ppu), flip_cycles);
-- 
cgit v1.2.1