X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.s;h=cf2036d05db3ff84330ae3f744c3fdec331a1c5c;hb=fbc65db75502192750f19f5cc8c5543aef625cb1;hp=dbe76ac52e2c845f47a8848271c2b9f2ee7977fd;hpb=4b9c58882616c5205a5ad5c9350f20a3d22bd7e1;p=picodrive.git

diff --git a/Pico/Memory.s b/Pico/Memory.s
index dbe76ac..cf2036d 100644
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -389,11 +389,7 @@ m_read8_misc2:
     ldr     r1, =PicoOpt
     ldr     r1, [r1]
     tst     r1, #1
-
-    ldrne   r1, =ym2612_st
-    ldrne   r1, [r1]
-    ldrneb  r0, [r1, #0x11]   @ ym2612_st->status
-    bxne    lr
+    bne     ym2612_read_local_68k
 
 m_read8_fake_ym2612:
     ldr     r3, =(Pico+0x22200)
@@ -419,13 +415,7 @@ m_read8_vdp:
     tst     r0, #0x70000
     tsteq   r0, #0x000e0
     bxne    lr              @ invalid read
-    stmfd   sp!,{r0,lr}
-    bic     r0, r0, #1
-    bl      PicoVideoRead
-    ldmfd   sp!,{r1,lr}
-    tst     r1, #1
-    moveq   r0, r0, lsr #8
-    bx      lr
+    b       PicoVideoRead8
 
 m_read8_ram:
     ldr     r1, =Pico
@@ -872,7 +862,11 @@ m_write8_misc2:
     bic     r0, r0, #0xff0000
     bic     r0, r0, #0x00e000
     tst     r2, #1
+    ldr     r2, =SekCycleCnt
     streqb  r1, [r3, r0]     @ zram
+    ldr     r0, [r2]
+    add     r0, r0, #2       @ hack?
+    str     r0, [r2]
     bx      lr
 
 m_write8_z80_not_ram: