1 files changed, 21 insertions, 10 deletions

diff --git a/src/ARM.h b/src/ARM.h
index b9f5d89..95c41d4 100644
--- a/src/ARM.h
+++ b/src/ARM.h
@@ -23,6 +23,7 @@
 
 #include "types.h"
 #include "NDS.h"
+#include "DSi.h"
 
 #define ROR(x, n) (((x) >> (n)) | ((x) << (32-(n))))
 
@@ -272,17 +273,20 @@ public:
 
     u16 CodeRead16(u32 addr)
     {
-        return NDS::ARM7Read16(addr);
+        //return NDS::ARM7Read16(addr);
+        return DSi::ARM7Read16(addr);
     }
 
     u32 CodeRead32(u32 addr)
     {
-        return NDS::ARM7Read32(addr);
+        //return NDS::ARM7Read32(addr);
+        return DSi::ARM7Read32(addr);
     }
 
     void DataRead8(u32 addr, u32* val)
     {
-        *val = NDS::ARM7Read8(addr);
+        *val = DSi::ARM7Read8(addr);
+        //*val = NDS::ARM7Read8(addr);
         DataRegion = addr >> 24;
         DataCycles = NDS::ARM7MemTimings[DataRegion][0];
     }
@@ -291,7 +295,8 @@ public:
     {
         addr &= ~1;
 
-        *val = NDS::ARM7Read16(addr);
+        *val = DSi::ARM7Read16(addr);
+        //*val = NDS::ARM7Read16(addr);
         DataRegion = addr >> 24;
         DataCycles = NDS::ARM7MemTimings[DataRegion][0];
     }
@@ -300,7 +305,8 @@ public:
     {
         addr &= ~3;
 
-        *val = NDS::ARM7Read32(addr);
+        *val = DSi::ARM7Read32(addr);
+        //*val = NDS::ARM7Read32(addr);
         DataRegion = addr >> 24;
         DataCycles = NDS::ARM7MemTimings[DataRegion][2];
     }
@@ -309,13 +315,15 @@ public:
     {
         addr &= ~3;
 
-        *val = NDS::ARM7Read32(addr);
+        *val = DSi::ARM7Read32(addr);
+        //*val = NDS::ARM7Read32(addr);
         DataCycles += NDS::ARM7MemTimings[DataRegion][3];
     }
 
     void DataWrite8(u32 addr, u8 val)
     {
-        NDS::ARM7Write8(addr, val);
+        DSi::ARM7Write8(addr, val);
+        //NDS::ARM7Write8(addr, val);
         DataRegion = addr >> 24;
         DataCycles = NDS::ARM7MemTimings[DataRegion][0];
     }
@@ -324,7 +332,8 @@ public:
     {
         addr &= ~1;
 
-        NDS::ARM7Write16(addr, val);
+        DSi::ARM7Write16(addr, val);
+        //NDS::ARM7Write16(addr, val);
         DataRegion = addr >> 24;
         DataCycles = NDS::ARM7MemTimings[DataRegion][0];
     }
@@ -333,7 +342,8 @@ public:
     {
         addr &= ~3;
 
-        NDS::ARM7Write32(addr, val);
+        DSi::ARM7Write32(addr, val);
+        //NDS::ARM7Write32(addr, val);
         DataRegion = addr >> 24;
         DataCycles = NDS::ARM7MemTimings[DataRegion][2];
     }
@@ -342,7 +352,8 @@ public:
     {
         addr &= ~3;
 
-        NDS::ARM7Write32(addr, val);
+        DSi::ARM7Write32(addr, val);
+        //NDS::ARM7Write32(addr, val);
         DataCycles += NDS::ARM7MemTimings[DataRegion][3];
     }