X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.s;h=7f3c2cb464a5220ebbc47f9285303385086d3212;hb=f53f286a8b48d19c65e83f90d00aa47e8e87c889;hp=732e6b852ebcea4259ae6a906fb606e62c95a9b4;hpb=3ec29f016cdeb3100dbb433dd9041e81542765bd;p=picodrive.git

diff --git a/Pico/Memory.s b/Pico/Memory.s
index 732e6b8..7f3c2cb 100644
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -386,17 +386,14 @@ m_read8_misc2:
     cmp     r2, #0x4000
     mvnne   r0, #0
     bxne    lr                @ invalid
-.if EXTERNAL_YM2612
     ldr     r1, =PicoOpt
     ldr     r1, [r1]
     tst     r1, #1
-    beq     m_read8_fake_ym2612
-    tst     r1, #0x200
-    beq     YM2612Read_
-    b       YM2612Read_940
-.else
-    b       YM2612Read_
-.endif
+
+    ldrne   r1, =ym2612_st
+    ldrne   r1, [r1]
+    ldrneb  r0, [r1, #0x11]   @ ym2612_st->status
+    bxne    lr
 
 m_read8_fake_ym2612:
     ldr     r3, =(Pico+0x22200)
@@ -505,8 +502,7 @@ m_read16_rom4: @ 0x200000 - 0x27ffff, SRAM area (NBA Live 95)
     tst     r1, #5
     beq     m_read16_nosram
     stmfd   sp!,{lr}
-    bl      SRAMRead
-    orr     r0, r0, r0, lsl #8
+    bl      SRAMRead16
     ldmfd   sp!,{pc}
 m_read16_nosram:
     ldr     r1, [r3, #4]    @ romsize
@@ -596,8 +592,7 @@ m_read16_above_rom:
     tst     r1, #5
     beq     m_read16_ar_nosram
     stmfd   sp!,{lr}
-    bl      SRAMRead
-    orr     r0, r0, r0, lsl #8
+    bl      SRAMRead16
     ldmfd   sp!,{pc}
 m_read16_ar_nosram:
     mov     r1, #16
@@ -650,14 +645,13 @@ m_read32_rom4: @ 0x200000 - 0x27ffff, SRAM area (does any game do long reads?)
     tst     r1, #5
     beq     m_read32_nosram
     stmfd   sp!,{r0,lr}
-    bl      SRAMRead
+    bl      SRAMRead16
     ldmfd   sp!,{r1,lr}
     stmfd   sp!,{r0,lr}
     add     r0, r1, #2
-    bl      SRAMRead
+    bl      SRAMRead16
     ldmfd   sp!,{r1,lr}
     orr     r0, r0, r1, lsl #16
-    orr     r0, r0, r0, lsl #8
     bx      lr
 m_read32_nosram:
     ldr     r1, [r3, #4]    @ romsize