X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.s;h=7e16384921758a2a038690ee19398e8c2e9f48c3;hb=110df09c8a2479c6a58655ad6b09b50584fbe5f4;hp=732e6b852ebcea4259ae6a906fb606e62c95a9b4;hpb=3ec29f016cdeb3100dbb433dd9041e81542765bd;p=picodrive.git diff --git a/Pico/Memory.s b/Pico/Memory.s index 732e6b8..7e16384 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)