Fix dup(2kr) and ovr(2kr) behaviour

1 files changed, 7 insertions, 5 deletions

diff --git a/src/devices.c b/src/devices.c
index c65d79b..2146bd3 100644
--- a/src/devices.c
+++ b/src/devices.c
@@ -109,16 +109,18 @@ void
 deo_system(u8 *dev, u8 port) {
     switch(port) {
         case 0x3: {
-            // TODO: Rom bank switching (Needs testing).
+            // Rom bank switching (Needs testing).
             u16 addr = PEEK2(dev + 0x2);
             if(uxn_ram[addr] == 0x01) {
-                u16 i, length = PEEK2(uxn_ram + addr + 1);
+                u16 length = PEEK2(uxn_ram + addr + 1);
                 u16 a_page = PEEK2(uxn_ram + addr + 1 + 2);
                 u16 a_addr = PEEK2(uxn_ram + addr + 1 + 4);
+                u16 b_page = PEEK2(uxn_ram + addr + 1 + 6);
                 u16 b_addr = PEEK2(uxn_ram + addr + 1 + 8);
+                u8 *ram = uxn_ram;
                 u8 *rom = uxn_rom + (a_page % RAM_PAGES) * 0x10000;
-                for(i = 0; i < length; i++) {
-                    uxn_ram[(u16)(b_addr + i)] = rom[(u16)(a_addr + i)];
+                for(size_t i = 0; i < length; i++) {
+                    ram[b_addr + i] = rom[a_addr + i];
                 }
             }
         } break;
@@ -177,8 +179,8 @@ dei_datetime(u8 *dev, u8 port) {
         case 0x8: return t->tm_yday;
         case 0x9: return t->tm_yday >> 8;
         case 0xa: return t->tm_isdst;
-        default: return dev[port];
     }
+    return dev[port];
 }
 
 u16