Cleanup

7 files changed, 34 insertions, 129 deletions

diff --git a/arm9/lib/src/GX.c b/arm9/lib/src/GX.c
index 6d979139..9823e8ba 100644
--- a/arm9/lib/src/GX.c
+++ b/arm9/lib/src/GX.c
@@ -7,11 +7,6 @@ extern u16 gUnk021D33C0;
 extern u32 gUnk02106814;
 extern u16 gUnk02106810;
 
-void GX_InitGXState();
-
-void MI_DmaFill32(u32, void *, u32, u32);
-void MIi_CpuClear32(u32, void *, u32);
-
 void GX_Init(){
     SETREG16(HW_REG_POWCNT1, READREG16(HW_REG_POWCNT1) | 0x8000);
     SETREG16(HW_REG_POWCNT1, (READREG16(HW_REG_POWCNT1) & ~0x20E) | 0x20E);
diff --git a/arm9/lib/src/GX_g3_util.c b/arm9/lib/src/GX_g3_util.c
index 049b9366..1cd956ad 100644
--- a/arm9/lib/src/GX_g3_util.c
+++ b/arm9/lib/src/GX_g3_util.c
@@ -2,13 +2,7 @@
 #include "main.h"
 #include "gx.h"
 
-#define HW_REG_DIV_NUMER 0x04000290
-#define HW_REG_DIV_DENOM 0x04000298
 
-#define HW_REG_MTX_MODE  0x04000440
-#define HW_REG_MTX_LOAD_4x4 0x04000458
-#define HW_REG_MTX_LOAD_4x3 0x0400045C
-#define HW_REG_MTX_MULT_3x3 0x04000468
 
 void G3i_PerspectiveW_(fx32 fovsin, fx32 fovcos, fx32 ratio, fx32 near, fx32 far, fx32 scale, u32 load, struct Mtx44 *mtx){
     fx32 fovcot, temp1, temp2;
diff --git a/arm9/lib/src/GX_g3b.c b/arm9/lib/src/GX_g3b.c
index 1e25adb5..0efe8518 100644
--- a/arm9/lib/src/GX_g3b.c
+++ b/arm9/lib/src/GX_g3b.c
@@ -3,8 +3,6 @@
 #include "gx.h"
 
 
-void MI_Copy64B(void *src, void *dst);
-
 void G3BS_LoadMtx44(struct DL *displaylist, struct Mtx44 *mtx){
     *(u32 *)displaylist->var00 = 0x16;
     MI_Copy64B(mtx, displaylist->var04);
diff --git a/arm9/lib/src/GX_g3x.c b/arm9/lib/src/GX_g3x.c
index f9c2adb7..70c4f3fe 100644
--- a/arm9/lib/src/GX_g3x.c
+++ b/arm9/lib/src/GX_g3x.c
@@ -3,13 +3,6 @@
 #include "gx.h"
 
 extern u32 gUnk02106814;
-void MI_Copy64B(void *, void *);
-void MIi_CpuCopy16(void *, void *, u32);
-void GXi_NopClearFifo128_(void *);
-void MI_Copy16B(void *, void *);
-void MI_DmaFill32Async(u32, void *, u32, u32, u32, u32);
-void MI_DmaFill32(u32, void *, u32, u32);
-void MIi_CpuClear32(u32, void *, u32);
 
 asm void GXi_NopClearFifo128_(void *reg){
     mov r1, #0x0
diff --git a/arm9/lib/src/GX_load2d.c b/arm9/lib/src/GX_load2d.c
index b0af0e8c..9ebf24cc 100644
--- a/arm9/lib/src/GX_load2d.c
+++ b/arm9/lib/src/GX_load2d.c
@@ -12,46 +12,6 @@ extern s32 gUnk021D33E8;
 extern u32 gUnk021D33E4;
 extern s32 gUnk021D33E0;
 
-void MI_WaitDma(u32);
-void MI_DmaCopy32Async(u32, void *, void *, u32, void *, void *);
-void MI_DmaCopy16(u32 unk, void *src, void *dst, u32 size);
-void MIi_CpuCopy16(void *src, void *dst, u32 size);
-void MI_DmaCopy32(u32 unk, void *src, void *dst, u32 size);
-void MIi_CpuCopy32(void *src, void *dst, u32 size);
-
-
-static inline void _GX_Load_16(void *src, u32 offset, u32 size, u32 base){
-    if (gUnk02106814 != -1 && size > 0x1C)
-    {
-        MI_DmaCopy16(gUnk02106814, src, (void *)(base + offset), size);
-    }
-    else
-    {
-        MIi_CpuCopy16(src, (void *)(base + offset), size);
-    }
-}
-
-static inline void _GX_Load_32(void *src, u32 offset, u32 size, u32 base){
-    if (gUnk02106814 != -1 && size > 0x30)
-    {
-        MI_DmaCopy32(gUnk02106814, src, (void *)(base + offset), size);
-    }
-    else
-    {
-        MIi_CpuCopy32(src, (void *)(base + offset), size);
-    }
-}
-
-static inline void _GX_Load_32_Async(void *src, void *dst, u32 size, void *func, void *ptr){
-    if (gUnk02106814 != -1)
-    {
-        MI_DmaCopy32Async(gUnk02106814, src, dst, size, func, ptr);
-    }
-    else
-    {
-        MIi_CpuCopy32(src, dst, size);
-    }
-}
 
 static inline void *_GX_OBJ_PTR(){
     return (void *)0x6400000;
@@ -61,117 +21,117 @@ static inline void *_GXS_OBJ_PTR(){
 }
 
 void GX_LoadBGPltt(void *src, u32 offset, u32 size){
-    _GX_Load_16(src, offset, size, 0x5000000);
+    _GX_Load_16(gUnk02106814, src, (void *)(0x5000000 + offset), size);
 }
 
 void GXS_LoadBGPltt(void *src, u32 offset, u32 size){
-    _GX_Load_16(src, offset, size, 0x5000400);
+    _GX_Load_16(gUnk02106814, src, (void *)(0x5000400 + offset), size);
 }
 
 void GX_LoadOBJPltt(void *src, u32 offset, u32 size){
-    _GX_Load_16(src, offset, size, 0x5000200);
+    _GX_Load_16(gUnk02106814, src, (void *)(0x5000200 + offset), size);
 }
 
 void GXS_LoadOBJPltt(void *src, u32 offset, u32 size){
-    _GX_Load_16(src, offset, size, 0x5000600);
+    _GX_Load_16(gUnk02106814, src, (void *)(0x5000600 + offset), size);
 }
 
 void GX_LoadOAM(void *src, u32 offset, u32 size){
-    _GX_Load_32(src, offset, size, 0x7000000);
+    _GX_Load_32(gUnk02106814, src, (void *)(0x7000000 + offset), size);
 }
 
 void GXS_LoadOAM(void *src, u32 offset, u32 size){
-    _GX_Load_32(src, offset, size, 0x7000400);
+    _GX_Load_32(gUnk02106814, src, (void *)(0x7000400 + offset), size);
 }
 
 void GX_LoadOBJ(void *src, u32 offset, u32 size){
     u32 base = (u32)_GX_OBJ_PTR();
-    _GX_Load_32(src, offset, size, base);
+    _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GXS_LoadOBJ(void *src, u32 offset, u32 size){
     u32 base = (u32)_GXS_OBJ_PTR();
-    _GX_Load_32(src, offset, size, base);
+    _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GX_LoadBG0Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG0ScrPtr();
-    _GX_Load_16(src, offset, size, base);
+    _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GXS_LoadBG0Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG0ScrPtr();
-    _GX_Load_16(src, offset, size, base);
+    _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GX_LoadBG1Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG1ScrPtr();
-    _GX_Load_16(src, offset, size, base);
+    _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GXS_LoadBG1Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG1ScrPtr();
-    _GX_Load_16(src, offset, size, base);
+    _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GX_LoadBG2Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG2ScrPtr();
-    _GX_Load_16(src, offset, size, base);
+    _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GXS_LoadBG2Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG2ScrPtr();
-    _GX_Load_16(src, offset, size, base);
+    _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GX_LoadBG3Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG3ScrPtr();
-    _GX_Load_16(src, offset, size, base);
+    _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GXS_LoadBG3Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG3ScrPtr();
-    _GX_Load_16(src, offset, size, base);
+    _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GX_LoadBG0Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG0CharPtr();
-    _GX_Load_32(src, offset, size, base);
+    _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GXS_LoadBG0Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG0CharPtr();
-    _GX_Load_32(src, offset, size, base);
+    _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GX_LoadBG1Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG1CharPtr();
-    _GX_Load_32(src, offset, size, base);
+    _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GXS_LoadBG1Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG1CharPtr();
-    _GX_Load_32(src, offset, size, base);
+    _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GX_LoadBG2Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG2CharPtr();
-    _GX_Load_32(src, offset, size, base);
+    _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GXS_LoadBG2Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG2CharPtr();
-    _GX_Load_32(src, offset, size, base);
+    _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GX_LoadBG3Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG3CharPtr();
-    _GX_Load_32(src, offset, size, base);
+    _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GXS_LoadBG3Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG3CharPtr();
-    _GX_Load_32(src, offset, size, base);
+    _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size);
 }
 
 void GX_BeginLoadBGExtPltt(){
@@ -197,7 +157,7 @@ void GX_BeginLoadBGExtPltt(){
 }
 
 void GX_LoadBGExtPltt(void *src, u32 offset, u32 size){
-    _GX_Load_32_Async(src, (void *)(gUnk021D33F0 + offset - gUnk021D33EC), size, NULL, NULL);
+    _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D33F0 + offset - gUnk021D33EC), size, NULL, NULL);
 }
 
 void GX_EndLoadBGExtPltt(){
@@ -225,7 +185,7 @@ void GX_BeginLoadOBJExtPltt(){
 }
 
 void GX_LoadOBJExtPltt(void *src, u32 offset, u32 size){
-    _GX_Load_32_Async(src, (void *)(gUnk021D33E4 + offset), size, NULL, NULL);
+    _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D33E4 + offset), size, NULL, NULL);
 }
 
 void GX_EndLoadOBJExtPltt(){
@@ -241,7 +201,7 @@ void GXS_BeginLoadBGExtPltt(){
 }
 
 void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){
-    _GX_Load_32_Async(src, (void *)(0x06898000 + offset), size, NULL, NULL);
+    _GX_Load_32_Async(gUnk02106814, src, (void *)(0x06898000 + offset), size, NULL, NULL);
 }
 
 void GXS_EndLoadBGExtPltt(){
@@ -256,7 +216,7 @@ void GXS_BeginLoadOBJExtPltt(){
 }
 
 void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){
-    _GX_Load_32_Async(src, (void *)(0x068A0000 + offset), size, NULL, NULL);
+    _GX_Load_32_Async(gUnk02106814, src, (void *)(0x068A0000 + offset), size, NULL, NULL);
 }
 
 void GXS_EndLoadOBJExtPltt(){
diff --git a/arm9/lib/src/GX_load3d.c b/arm9/lib/src/GX_load3d.c
index 9ae7427a..bad119fd 100644
--- a/arm9/lib/src/GX_load3d.c
+++ b/arm9/lib/src/GX_load3d.c
@@ -21,39 +21,6 @@ extern u16 gUnk02103B3C[];
 extern s32 gUnk021D33FC;
 extern u32 gUnk021D340C;
 
-static inline void _GX_Load_16(void *src, void *dst, u32 size){
-    if (gUnk02106814 != -1 && size > 0x1C)
-    {
-        MI_DmaCopy16(gUnk02106814, src, dst, size);
-    }
-    else
-    {
-        MIi_CpuCopy16(src, dst, size);
-    }
-}
-
-static inline void _GX_Load_32(void *src, void *dst, u32 size){
-    if (gUnk02106814 != -1 && size > 0x30)
-    {
-        MI_DmaCopy32(gUnk02106814, src, dst, size);
-    }
-    else
-    {
-        MIi_CpuCopy32(src, dst, size);
-    }
-}
-
-static inline void _GX_Load_32_Async(void *src, void *dst, u32 size, void *func, void *ptr){
-    if (gUnk02106814 != -1)
-    {
-        MI_DmaCopy32Async(gUnk02106814, src, dst, size, func, ptr);
-    }
-    else
-    {
-        MIi_CpuCopy32(src, dst, size);
-    }
-}
-
 void GX_BeginLoadTex(){
     u32 temp = GX_ResetBankForTex();
     gUnk021D3410 = temp;
@@ -83,12 +50,12 @@ void GX_LoadTex(void *src, u32 offset, u32 size){
             void *temp2 = (void *)gUnk021D3414;
             u32 temp1 = gUnk021D3418 - offset;
             temp = (void *)(gUnk021D3400 + offset);
-            _GX_Load_32(src, temp, temp1);
-            _GX_Load_32_Async((void *)((u8 *)src + temp1), temp2, (size - temp1), NULL, NULL);
+            _GX_Load_32(gUnk02106814, src, temp, temp1);
+            _GX_Load_32_Async(gUnk02106814, (void *)((u8 *)src + temp1), temp2, (size - temp1), NULL, NULL);
             return;
         }
     }
-    _GX_Load_32_Async(src, temp, size, NULL, NULL);
+    _GX_Load_32_Async(gUnk02106814, src, temp, size, NULL, NULL);
 }
 
 void GX_EndLoadTex(){
@@ -108,7 +75,7 @@ void GX_BeginLoadTexPltt(){
 }
 
 void GX_LoadTexPltt(void *src, u32 offset, u32 size){
-    _GX_Load_32_Async(src, (void *)(gUnk021D3404 + offset), size, NULL, NULL);
+    _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D3404 + offset), size, NULL, NULL);
 }
 
 void GX_EndLoadTexPltt(){
@@ -141,11 +108,11 @@ void GX_BeginLoadClearImage(){
 }
 
 void GX_LoadClearImageColor(void *src, u32 size){
-    _GX_Load_32_Async(src, (void *)(gUnk021D340C), size, NULL, NULL);
+    _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D340C), size, NULL, NULL);
 }
 
 void GX_LoadClearImageDepth(void *src, u32 size){
-    _GX_Load_32_Async(src, (void *)(gUnk021D340C + 0x20000), size, NULL, NULL);
+    _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D340C + 0x20000), size, NULL, NULL);
 }
 
 void GX_EndLoadClearImage(){
diff --git a/arm9/lib/src/GX_vramcnt.c b/arm9/lib/src/GX_vramcnt.c
index 52be412c..d0ac5f7a 100644
--- a/arm9/lib/src/GX_vramcnt.c
+++ b/arm9/lib/src/GX_vramcnt.c
@@ -5,8 +5,6 @@
 extern u16 gUnk021D33BC;
 extern struct VRAM_banks gUnk021D33C4;
 
-void OSi_UnlockVram(u16, u16);
-
 void GX_VRAMCNT_SetLCDC_(u32 mask){
     if (mask & (0x1 << 0))
         SETREG8(HW_REG_VRAMCNT_A, 0x80);