Fix issue with bank switching

3 files changed, 8 insertions, 6 deletions

diff --git a/src/debug.c b/src/debug.c
index 17c1c73..fe3077f 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -9,13 +9,17 @@ typedef enum DebugFlags  {
 
 void
 print_debug_info(u8 flags) {
+    txt_position(0, 0);
     if (flags & SHOW_ROM) {
         txt_printf("\nROM");
         for (size_t i = 0; i < 128; i++) {
             if (i % 8 == 0) {
                 txt_printf("\n");
             }
-            txt_printf("%02x ", uxn_ram[i + PAGE_PROGRAM]);
+            if (i % 2 == 0) {
+                txt_printf(" ");
+            }
+            txt_printf("%02x", uxn_ram[i + PAGE_PROGRAM]);
         }
         txt_printf("\n");
     }
diff --git a/src/devices.c b/src/devices.c
index 6c7f281..6a1ed28 100644
--- a/src/devices.c
+++ b/src/devices.c
@@ -1,4 +1,4 @@
-static time_t seconds = 0;
+static time_t seconds = 1693475007;
 
 #define RAM_PAGES 0x10
 
@@ -113,8 +113,8 @@ deo_system(u8 *dev, u8 port) {
                 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;
+                u8 *ram = uxn_ram + (b_page % RAM_PAGES) * 0x10000;
+                u8 *rom = uxn_rom + (a_page % RAM_PAGES) * 0x10000 - PAGE_PROGRAM;
                 for(size_t i = 0; i < length; i++) {
                     ram[b_addr + i] = rom[a_addr + i];
                 }
diff --git a/src/main.c b/src/main.c
index 91172c3..62d133e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -105,8 +105,6 @@ main(void) {
     u8 frame_counter = 0;
     PROF(uxn_eval_asm(PAGE_PROGRAM), eval_cycles);
     while(true) {
-        // txt_position(0, 0);
-        // print_debug_info(0);
         bios_vblank_wait();
         FRAME_START();
         PROF(handle_input(), input_cycles);