bugfixes in sram memhandlers

[picodrive.git] / Pico / Memory.s

diff --git a/Pico/Memory.s b/Pico/Memory.s
index 7e16384..7f3c2cb 100644 (file)
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -502,8 +502,7 @@ m_read16_rom4: @ 0x200000 - 0x27ffff, SRAM area (NBA Live 95)
     tst     r1, #5\r
     beq     m_read16_nosram\r
     stmfd   sp!,{lr}\r
-    bl      SRAMRead\r
-    orr     r0, r0, r0, lsl #8\r
+    bl      SRAMRead16\r
     ldmfd   sp!,{pc}\r
 m_read16_nosram:\r
     ldr     r1, [r3, #4]    @ romsize\r
@@ -593,8 +592,7 @@ m_read16_above_rom:
     tst     r1, #5\r
     beq     m_read16_ar_nosram\r
     stmfd   sp!,{lr}\r
-    bl      SRAMRead\r
-    orr     r0, r0, r0, lsl #8\r
+    bl      SRAMRead16\r
     ldmfd   sp!,{pc}\r
 m_read16_ar_nosram:\r
     mov     r1, #16\r
@@ -647,14 +645,13 @@ m_read32_rom4: @ 0x200000 - 0x27ffff, SRAM area (does any game do long reads?)
     tst     r1, #5\r
     beq     m_read32_nosram\r
     stmfd   sp!,{r0,lr}\r
-    bl      SRAMRead\r
+    bl      SRAMRead16\r
     ldmfd   sp!,{r1,lr}\r
     stmfd   sp!,{r0,lr}\r
     add     r0, r1, #2\r
-    bl      SRAMRead\r
+    bl      SRAMRead16\r
     ldmfd   sp!,{r1,lr}\r
     orr     r0, r0, r1, lsl #16\r
-    orr     r0, r0, r0, lsl #8\r
     bx      lr\r
 m_read32_nosram:\r
     ldr     r1, [r3, #4]    @ romsize\r