Merge branch 'master' into dsi_camera

# Conflicts:
#	src/DSi_I2C.cpp

1 files changed, 13 insertions, 0 deletions

diff --git a/src/NDSCart.cpp b/src/NDSCart.cpp
index 6abfc7c..077bf48 100644
--- a/src/NDSCart.cpp
+++ b/src/NDSCart.cpp
@@ -1034,6 +1034,19 @@ void RelocateSave(const char* path, bool write)
     NDSCart_SRAM::RelocateSave(path, write);
 }
 
+int ImportSRAM(const u8* data, u32 length)
+{
+    memcpy(NDSCart_SRAM::SRAM, data, std::min(length, NDSCart_SRAM::SRAMLength));
+    FILE* f = Platform::OpenFile(NDSCart_SRAM::SRAMPath, "wb");
+    if (f)
+    {
+        fwrite(NDSCart_SRAM::SRAM, NDSCart_SRAM::SRAMLength, 1, f);
+        fclose(f);
+    }
+
+    return length - NDSCart_SRAM::SRAMLength;
+}
+
 void ResetCart()
 {
     // CHECKME: what if there is a transfer in progress?