arm9 MI_wram

4 files changed, 24 insertions, 15 deletions

diff --git a/arm9/asm/MI_wram.s b/arm9/asm/MI_wram.s
deleted file mode 100644
index 3f245464..00000000
--- a/arm9/asm/MI_wram.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.text
-
-	arm_func_start MI_SetWramBank
-MI_SetWramBank:
-	ldr r1, _020CD870 ; =0x04000247
-	strb r0, [r1, #0x0]
-	bx lr
-	.balign 4
-_020CD870: .word 0x04000247
diff --git a/arm9/lib/include/MI_wram.h b/arm9/lib/include/MI_wram.h
new file mode 100644
index 00000000..fa445a8a
--- /dev/null
+++ b/arm9/lib/include/MI_wram.h
@@ -0,0 +1,14 @@
+#ifndef POKEDIAMOND_MI_WRAM_H
+#define POKEDIAMOND_MI_WRAM_H
+
+typedef enum
+{
+    MI_WRAM_ARM9_ALL = 0,
+    MI_WRAM_1616_1 = 1,
+    MI_WRAM_1616_2 = 2,
+    MI_WRAM_ARM7_ALL = 3
+} MIWram;
+
+void MI_SetWramBank(MIWram cnt);
+
+#endif //POKEDIAMOND_MI_WRAM_H
diff --git a/arm9/lib/src/MI_init.c b/arm9/lib/src/MI_init.c
index 266a5f2f..4556e95a 100644
--- a/arm9/lib/src/MI_init.c
+++ b/arm9/lib/src/MI_init.c
@@ -1,11 +1,10 @@
 #include "nitro/types.h"
 #include "function_target.h"
 #include "MI_dma.h"
-
-extern void MI_SetWramBank(u32 param0);
+#include "MI_wram.h"
 
 ARM_FUNC void MI_Init(void)
 {
-    MI_SetWramBank(3);
+    MI_SetWramBank(MI_WRAM_ARM7_ALL);
     MI_StopDma(0);
 }
diff --git a/arm9/lib/src/MI_wram.c b/arm9/lib/src/MI_wram.c
new file mode 100644
index 00000000..a65bbb6f
--- /dev/null
+++ b/arm9/lib/src/MI_wram.c
@@ -0,0 +1,8 @@
+#include "function_target.h"
+#include "consts.h"
+#include "MI_wram.h"
+
+ARM_FUNC void MI_SetWramBank(MIWram cnt)
+{
+    reg_GX_VRAMCNT_WRAM = (u8)cnt;
+}