X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.s;h=b2359db7e33808782fc299b37d0efd6c45957dc0;hb=9cd8914e0223ff79f46dea9bc0b7cbd24c79f4bf;hp=a042d81dc352a12b6eaf06d2a4e88ca7a98a08d0;hpb=760e26c7ddf3a6a3f5d3360cd5d0f04ca5d9c121;p=picodrive.git

diff --git a/Pico/Memory.s b/Pico/Memory.s
index a042d81..b2359db 100644
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -386,10 +386,7 @@ m_read8_misc2:
     cmp     r2, #0x4000
     mvnne   r0, #0
     bxne    lr                @ invalid
-    ldr     r1, =PicoOpt
-    ldr     r1, [r1]
-    tst     r1, #1
-    bne     ym2612_read_local_68k
+    b       ym2612_read_local_68k
 
 m_read8_fake_ym2612:
     ldr     r3, =(Pico+0x22200)
@@ -415,13 +412,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