Merge pull request #282 from red031000/master

arm9 MI_memory

2 files changed, 18 insertions, 16 deletions

diff --git a/arm9/lib/include/MI_memory.h b/arm9/lib/include/MI_memory.h
index 981fdc81..01c12f86 100644
--- a/arm9/lib/include/MI_memory.h
+++ b/arm9/lib/include/MI_memory.h
@@ -1,22 +1,29 @@
-#ifndef NITRO_MI_MEMORY_H_
-#define NITRO_MI_MEMORY_H_
+#ifndef POKEDIAMOND_ARM9_MI_MEMORY_H
+#define POKEDIAMOND_ARM9_MI_MEMORY_H
 
 #include "nitro/types.h"
 
-void MI_CpuFill8(void *dest, u8 data, u32 size);
-void MI_CpuCopy8(void const *src, void *dest, u32 size);
-void MIi_CpuClearFast(u32 data, void *destp, u32 size);
+void MIi_CpuClear16(register u16 data, register void *destp, register u32 size);
+void MIi_CpuCopy16(register const void *srcp, register void *destp, register u32 size);
+void MIi_CpuClear32(register u32 data, register void *destp, register u32 size);
+void MIi_CpuCopy32(register const void *srcp, register void *destp, register u32 size);
+void MIi_CpuSend32(register const void *srcp, volatile void *destp, u32 size);
+void MIi_CpuClearFast(register u32 data, register void *destp, register u32 size);
+void MIi_CpuCopyFast(register const void *srcp, register void *destp, register u32 size);
+void MI_Copy32B(register const void *pSrc, register void *pDest);
+void MI_Copy36B(register const void *pSrc, register void *pDest);
+void MI_Copy48B(register const void *pSrc, register void *pDest);
+void MI_Copy64B(register const void *pSrc, register void *pDest);
+void MI_CpuFill8(register void *dstp, register u8 data, register u32 size);
+void MI_CpuCopy8(register const void *srcp, register void *dstp, register u32 size);
+void MI_Zero36B(register void *pDest);
+
 static inline void MI_CpuClearFast(void *destp, u32 size) {
     MIi_CpuClearFast(0, destp, size);
 }
 static inline void MI_CpuClear8(void *dest, u32 size) {
     MI_CpuFill8(dest, 0, size);
 }
-void MIi_CpuCopy16(const void *src, void *dst, u32 size);
-
-void MIi_CpuClear32(u32 data, void *destp, u32 size);
-
-void MIi_CpuClear16(u16 data, void *destp, u32 size);
 
 static inline void MI_CpuClear16(void * destp, u32 size)
 {
@@ -38,6 +45,4 @@ static inline void MI_CpuCopy16(const void *src, void *dest, u32 size)
     MIi_CpuCopy16(src, dest, size);
 }
 
-void MIi_CpuClearFast(u32 data, void *destp, u32 size);
-
-#endif //NITRO_MI_MEMORY_H_
+#endif //POKEDIAMOND_ARM9_MI_MEMORY_H
diff --git a/arm9/lib/include/gx.h b/arm9/lib/include/gx.h
index f9478851..26f6cfaf 100644
--- a/arm9/lib/include/gx.h
+++ b/arm9/lib/include/gx.h
@@ -9,9 +9,6 @@
 //temporary while other files aren't decompiled
 
 void GXi_NopClearFifo128_(void *);
-void MI_Copy16B(const void *, void *);
-void MI_Copy64B(void *src, void *dst);
-void MIi_CpuCopy32(const void *src, void *dst, u32 size);
 
 #include "GXcommon.h"
 #include "GX_struct_2d.h"