1 files changed, 50 insertions, 16 deletions

diff --git a/src/main.c b/src/main.c
index 73a74e1..7d77051 100644
--- a/src/main.c
+++ b/src/main.c
@@ -89,22 +89,56 @@ system_talk(Device *d, u8 b0, u8 w) {
 
 void
 screen_talk(Device *d, u8 b0, u8 w) {
-    if(w && b0 == 0xe) {
-        Uint16 x = mempeek16(d->dat, 0x8);
-        Uint16 y = mempeek16(d->dat, 0xa);
-        Uint8 layer = d->dat[0xe] >> 4 & 0x1;
-        ppu_pixel(layer, x, y, d->dat[0xe] & 0x3);
-        reqdraw = 1;
-    } else if(w && b0 == 0xf) {
-        Uint16 x = mempeek16(d->dat, 0x8);
-        Uint16 y = mempeek16(d->dat, 0xa);
-        Uint8 layer = d->dat[0xf] >> 0x6 & 0x1;
-        Uint8 *addr = &d->mem[mempeek16(d->dat, 0xc)];
-        if(d->dat[0xf] >> 0x7 & 0x1)
-            ppu_2bpp(layer, x, y, addr, d->dat[0xf] & 0xf, d->dat[0xf] >> 0x4 & 0x1, d->dat[0xf] >> 0x5 & 0x1);
-        else
-            ppu_1bpp(layer, x, y, addr, d->dat[0xf] & 0xf, d->dat[0xf] >> 0x4 & 0x1, d->dat[0xf] >> 0x5 & 0x1);
-        reqdraw = 1;
+    if (w) {
+        switch (b0) {
+            case 0x1: {
+                d->vector = mempeek16(d->dat, 0x0);
+            } break;
+            case 0xe: {
+                u16 x = mempeek16(d->dat, 0x8);
+                u16 y = mempeek16(d->dat, 0xa);
+                u8 *addr = &d->mem[mempeek16(d->dat, 0xc)];
+                u8 *layer = d->dat[0xe] >> 4 & 0x1 ? pixels_fg : pixels_bg;
+                u8 mode = d->dat[0xe] >> 5;
+                u8 color = d->dat[0xf] & 0xf;
+                if(!mode) {
+                    ppu_pixel(layer, x, y, d->dat[0xe] & 0x3);
+                } else if(mode-- & 0x1) {
+                    u8 flipx = mode & 0x2;
+                    u8 flipy = mode & 0x4;
+                    ppu_1bpp(layer, x, y, addr, color, flipx, flipy);
+                } else {
+                    u8 flipx = mode & 0x2;
+                    u8 flipy = mode & 0x4;
+                    ppu_2bpp(layer, x, y, addr, color, flipx, flipy);
+                }
+                if(d->dat[0x6] & 0x01) { mempoke16(d->dat, 0x8, x + 1); }
+                if(d->dat[0x6] & 0x02) { mempoke16(d->dat, 0xa, y + 1); }
+            } break;
+            case 0xf: {
+                u16 x = mempeek16(d->dat, 0x8);
+                u16 y = mempeek16(d->dat, 0xa);
+                u8 *addr = &d->mem[mempeek16(d->dat, 0xc)];
+                u8 *layer = d->dat[0xf] >> 6 & 0x1 ? pixels_fg : pixels_bg;
+                u8 color = d->dat[0xf] & 0xf;
+                u8 flipx = (d->dat[0xf] >> 0x4) & 0x1;
+                u8 flipy = (d->dat[0xf] >> 0x5) & 0x1;
+                if(d->dat[0xf] >> 0x7 & 0x1) {
+                    ppu_2bpp(layer, x, y, addr, color, flipx, flipy);
+                    if(d->dat[0x6] & 0x04) {
+                        mempoke16(d->dat, 0xc, mempeek16(d->dat, 0xc) + 16);
+                    }
+                } else {
+                    ppu_1bpp(layer, x, y, addr, color, flipx, flipy);
+                    if(d->dat[0x6] & 0x04) {
+                        mempoke16(d->dat, 0xc, mempeek16(d->dat, 0xc) + 8);
+                    }
+                }
+                if(d->dat[0x6] & 0x01) { mempoke16(d->dat, 0x8, x + 8); }
+                if(d->dat[0x6] & 0x02) { mempoke16(d->dat, 0xa, y + 8); }
+            } break;
+            default: break;
+        }
     }
 }