optimizations, fixes, hacks, psp, ...

[picodrive.git] / Pico / Memory.s

diff --git a/Pico/Memory.s b/Pico/Memory.s
index 732e6b8..7e16384 100644 (file)
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -386,17 +386,14 @@ m_read8_misc2:
     cmp     r2, #0x4000\r
     mvnne   r0, #0\r
     bxne    lr                @ invalid\r
-.if EXTERNAL_YM2612\r
     ldr     r1, =PicoOpt\r
     ldr     r1, [r1]\r
     tst     r1, #1\r
-    beq     m_read8_fake_ym2612\r
-    tst     r1, #0x200\r
-    beq     YM2612Read_\r
-    b       YM2612Read_940\r
-.else\r
-    b       YM2612Read_\r
-.endif\r
+\r
+    ldrne   r1, =ym2612_st\r
+    ldrne   r1, [r1]\r
+    ldrneb  r0, [r1, #0x11]   @ ym2612_st->status\r
+    bxne    lr\r
 \r
 m_read8_fake_ym2612:\r
     ldr     r3, =(Pico+0x22200)\r