From 5223256ef928245620bb1a223084df6931999795 Mon Sep 17 00:00:00 2001 From: Made Date: Wed, 13 May 2020 20:55:45 +0200 Subject: Decompile GX_load2d.h --- arm9/lib/src/GX_load2d.c | 267 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 267 insertions(+) create mode 100644 arm9/lib/src/GX_load2d.c (limited to 'arm9/lib/src/GX_load2d.c') diff --git a/arm9/lib/src/GX_load2d.c b/arm9/lib/src/GX_load2d.c new file mode 100644 index 00000000..b0af0e8c --- /dev/null +++ b/arm9/lib/src/GX_load2d.c @@ -0,0 +1,267 @@ +#include "global.h" +#include "main.h" +#include "gx.h" + +extern u32 gUnk02106814; + +extern s32 gUnk021D33F8; +extern s32 gUnk021D33F4; +extern u32 gUnk021D33F0; +extern u32 gUnk021D33EC; +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; +} +static inline void *_GXS_OBJ_PTR(){ + return (void *)0x6600000; +} + +void GX_LoadBGPltt(void *src, u32 offset, u32 size){ + _GX_Load_16(src, offset, size, 0x5000000); +} + +void GXS_LoadBGPltt(void *src, u32 offset, u32 size){ + _GX_Load_16(src, offset, size, 0x5000400); +} + +void GX_LoadOBJPltt(void *src, u32 offset, u32 size){ + _GX_Load_16(src, offset, size, 0x5000200); +} + +void GXS_LoadOBJPltt(void *src, u32 offset, u32 size){ + _GX_Load_16(src, offset, size, 0x5000600); +} + +void GX_LoadOAM(void *src, u32 offset, u32 size){ + _GX_Load_32(src, offset, size, 0x7000000); +} + +void GXS_LoadOAM(void *src, u32 offset, u32 size){ + _GX_Load_32(src, offset, size, 0x7000400); +} + +void GX_LoadOBJ(void *src, u32 offset, u32 size){ + u32 base = (u32)_GX_OBJ_PTR(); + _GX_Load_32(src, offset, size, base); +} + +void GXS_LoadOBJ(void *src, u32 offset, u32 size){ + u32 base = (u32)_GXS_OBJ_PTR(); + _GX_Load_32(src, offset, size, base); +} + +void GX_LoadBG0Scr(void *src, u32 offset, u32 size){ + u32 base = (u32)G2_GetBG0ScrPtr(); + _GX_Load_16(src, offset, size, base); +} + +void GXS_LoadBG0Scr(void *src, u32 offset, u32 size){ + u32 base = (u32)G2S_GetBG0ScrPtr(); + _GX_Load_16(src, offset, size, base); +} + +void GX_LoadBG1Scr(void *src, u32 offset, u32 size){ + u32 base = (u32)G2_GetBG1ScrPtr(); + _GX_Load_16(src, offset, size, base); +} + +void GXS_LoadBG1Scr(void *src, u32 offset, u32 size){ + u32 base = (u32)G2S_GetBG1ScrPtr(); + _GX_Load_16(src, offset, size, base); +} + +void GX_LoadBG2Scr(void *src, u32 offset, u32 size){ + u32 base = (u32)G2_GetBG2ScrPtr(); + _GX_Load_16(src, offset, size, base); +} + +void GXS_LoadBG2Scr(void *src, u32 offset, u32 size){ + u32 base = (u32)G2S_GetBG2ScrPtr(); + _GX_Load_16(src, offset, size, base); +} + +void GX_LoadBG3Scr(void *src, u32 offset, u32 size){ + u32 base = (u32)G2_GetBG3ScrPtr(); + _GX_Load_16(src, offset, size, base); +} + +void GXS_LoadBG3Scr(void *src, u32 offset, u32 size){ + u32 base = (u32)G2S_GetBG3ScrPtr(); + _GX_Load_16(src, offset, size, base); +} + +void GX_LoadBG0Char(void *src, u32 offset, u32 size){ + u32 base = (u32)G2_GetBG0CharPtr(); + _GX_Load_32(src, offset, size, base); +} + +void GXS_LoadBG0Char(void *src, u32 offset, u32 size){ + u32 base = (u32)G2S_GetBG0CharPtr(); + _GX_Load_32(src, offset, size, base); +} + +void GX_LoadBG1Char(void *src, u32 offset, u32 size){ + u32 base = (u32)G2_GetBG1CharPtr(); + _GX_Load_32(src, offset, size, base); +} + +void GXS_LoadBG1Char(void *src, u32 offset, u32 size){ + u32 base = (u32)G2S_GetBG1CharPtr(); + _GX_Load_32(src, offset, size, base); +} + +void GX_LoadBG2Char(void *src, u32 offset, u32 size){ + u32 base = (u32)G2_GetBG2CharPtr(); + _GX_Load_32(src, offset, size, base); +} + +void GXS_LoadBG2Char(void *src, u32 offset, u32 size){ + u32 base = (u32)G2S_GetBG2CharPtr(); + _GX_Load_32(src, offset, size, base); +} + +void GX_LoadBG3Char(void *src, u32 offset, u32 size){ + u32 base = (u32)G2_GetBG3CharPtr(); + _GX_Load_32(src, offset, size, base); +} + +void GXS_LoadBG3Char(void *src, u32 offset, u32 size){ + u32 base = (u32)G2S_GetBG3CharPtr(); + _GX_Load_32(src, offset, size, base); +} + +void GX_BeginLoadBGExtPltt(){ + gUnk021D33F4 = GX_ResetBankForBGExtPltt(); + switch (gUnk021D33F4) + { + case 0: //needed to match + break; + case 0x10: + gUnk021D33F0 = 0x06880000; + gUnk021D33EC = 0x0; + break; + case 0x40: + gUnk021D33F0 = 0x06894000; + gUnk021D33EC = 0x4000; + break; + case 0x20: + case 0x60: + gUnk021D33F0 = 0x06890000; + gUnk021D33EC = 0x0; + break; + } +} + +void GX_LoadBGExtPltt(void *src, u32 offset, u32 size){ + _GX_Load_32_Async(src, (void *)(gUnk021D33F0 + offset - gUnk021D33EC), size, NULL, NULL); +} + +void GX_EndLoadBGExtPltt(){ + if (gUnk02106814 != -1) + MI_WaitDma(gUnk02106814); + GX_SetBankForBGExtPltt(gUnk021D33F4); + gUnk021D33F4 = 0x0; + gUnk021D33F0 = 0x0; + gUnk021D33EC = 0x0; +} + +void GX_BeginLoadOBJExtPltt(){ + gUnk021D33E8 = GX_ResetBankForOBJExtPltt(); + switch (gUnk021D33E8) + { + case 0: //needed to match + break; + case 0x40: + gUnk021D33E4 = 0x06894000; + break; + case 0x20: + gUnk021D33E4 = 0x06890000; + break; + } +} + +void GX_LoadOBJExtPltt(void *src, u32 offset, u32 size){ + _GX_Load_32_Async(src, (void *)(gUnk021D33E4 + offset), size, NULL, NULL); +} + +void GX_EndLoadOBJExtPltt(){ + if (gUnk02106814 != -1) + MI_WaitDma(gUnk02106814); + GX_SetBankForOBJExtPltt(gUnk021D33E8); + gUnk021D33E8 = 0x0; + gUnk021D33E4 = 0x0; +} + +void GXS_BeginLoadBGExtPltt(){ + gUnk021D33E0 = FUN_020C6034(); +} + +void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){ + _GX_Load_32_Async(src, (void *)(0x06898000 + offset), size, NULL, NULL); +} + +void GXS_EndLoadBGExtPltt(){ + if (gUnk02106814 != -1) + MI_WaitDma(gUnk02106814); + GX_SetBankForSubBGExtPltt(gUnk021D33E0); + gUnk021D33E0 = 0x0; +} + +void GXS_BeginLoadOBJExtPltt(){ + gUnk021D33F8 = GX_ResetBankForSubOBJ(); +} + +void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){ + _GX_Load_32_Async(src, (void *)(0x068A0000 + offset), size, NULL, NULL); +} + +void GXS_EndLoadOBJExtPltt(){ + if (gUnk02106814 != -1) + MI_WaitDma(gUnk02106814); + GX_SetBankForSubOBJExtPltt(gUnk021D33F8); + gUnk021D33F8 = 0x0; +} -- cgit v1.2.3 From 08e4b4f6657bac9d361a9f6948ae6d2bfe50eebf Mon Sep 17 00:00:00 2001 From: Made Date: Fri, 15 May 2020 04:03:35 +0200 Subject: Cleanup --- arm9/lib/src/GX_load2d.c | 96 ++++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 68 deletions(-) (limited to 'arm9/lib/src/GX_load2d.c') 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(){ -- cgit v1.2.3 From a92d77224c8ec645752a56aa35cc8a8457cd4cd3 Mon Sep 17 00:00:00 2001 From: Made Date: Fri, 15 May 2020 04:14:48 +0200 Subject: Add ARM_FUNC to GX --- arm9/lib/src/GX_load2d.c | 72 ++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'arm9/lib/src/GX_load2d.c') diff --git a/arm9/lib/src/GX_load2d.c b/arm9/lib/src/GX_load2d.c index 9ebf24cc..972babad 100644 --- a/arm9/lib/src/GX_load2d.c +++ b/arm9/lib/src/GX_load2d.c @@ -20,121 +20,121 @@ static inline void *_GXS_OBJ_PTR(){ return (void *)0x6600000; } -void GX_LoadBGPltt(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadBGPltt(void *src, u32 offset, u32 size){ _GX_Load_16(gUnk02106814, src, (void *)(0x5000000 + offset), size); } -void GXS_LoadBGPltt(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadBGPltt(void *src, u32 offset, u32 size){ _GX_Load_16(gUnk02106814, src, (void *)(0x5000400 + offset), size); } -void GX_LoadOBJPltt(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadOBJPltt(void *src, u32 offset, u32 size){ _GX_Load_16(gUnk02106814, src, (void *)(0x5000200 + offset), size); } -void GXS_LoadOBJPltt(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadOBJPltt(void *src, u32 offset, u32 size){ _GX_Load_16(gUnk02106814, src, (void *)(0x5000600 + offset), size); } -void GX_LoadOAM(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadOAM(void *src, u32 offset, u32 size){ _GX_Load_32(gUnk02106814, src, (void *)(0x7000000 + offset), size); } -void GXS_LoadOAM(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadOAM(void *src, u32 offset, u32 size){ _GX_Load_32(gUnk02106814, src, (void *)(0x7000400 + offset), size); } -void GX_LoadOBJ(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadOBJ(void *src, u32 offset, u32 size){ u32 base = (u32)_GX_OBJ_PTR(); _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); } -void GXS_LoadOBJ(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadOBJ(void *src, u32 offset, u32 size){ u32 base = (u32)_GXS_OBJ_PTR(); _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); } -void GX_LoadBG0Scr(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadBG0Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG0ScrPtr(); _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); } -void GXS_LoadBG0Scr(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadBG0Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG0ScrPtr(); _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); } -void GX_LoadBG1Scr(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadBG1Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG1ScrPtr(); _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); } -void GXS_LoadBG1Scr(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadBG1Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG1ScrPtr(); _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); } -void GX_LoadBG2Scr(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadBG2Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG2ScrPtr(); _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); } -void GXS_LoadBG2Scr(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadBG2Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG2ScrPtr(); _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); } -void GX_LoadBG3Scr(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadBG3Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG3ScrPtr(); _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); } -void GXS_LoadBG3Scr(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadBG3Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG3ScrPtr(); _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); } -void GX_LoadBG0Char(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadBG0Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG0CharPtr(); _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); } -void GXS_LoadBG0Char(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadBG0Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG0CharPtr(); _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); } -void GX_LoadBG1Char(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadBG1Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG1CharPtr(); _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); } -void GXS_LoadBG1Char(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadBG1Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG1CharPtr(); _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); } -void GX_LoadBG2Char(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadBG2Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG2CharPtr(); _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); } -void GXS_LoadBG2Char(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadBG2Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG2CharPtr(); _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); } -void GX_LoadBG3Char(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadBG3Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG3CharPtr(); _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); } -void GXS_LoadBG3Char(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadBG3Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG3CharPtr(); _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); } -void GX_BeginLoadBGExtPltt(){ +ARM_FUNC void GX_BeginLoadBGExtPltt(){ gUnk021D33F4 = GX_ResetBankForBGExtPltt(); switch (gUnk021D33F4) { @@ -156,11 +156,11 @@ void GX_BeginLoadBGExtPltt(){ } } -void GX_LoadBGExtPltt(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadBGExtPltt(void *src, u32 offset, u32 size){ _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D33F0 + offset - gUnk021D33EC), size, NULL, NULL); } -void GX_EndLoadBGExtPltt(){ +ARM_FUNC void GX_EndLoadBGExtPltt(){ if (gUnk02106814 != -1) MI_WaitDma(gUnk02106814); GX_SetBankForBGExtPltt(gUnk021D33F4); @@ -169,7 +169,7 @@ void GX_EndLoadBGExtPltt(){ gUnk021D33EC = 0x0; } -void GX_BeginLoadOBJExtPltt(){ +ARM_FUNC void GX_BeginLoadOBJExtPltt(){ gUnk021D33E8 = GX_ResetBankForOBJExtPltt(); switch (gUnk021D33E8) { @@ -184,11 +184,11 @@ void GX_BeginLoadOBJExtPltt(){ } } -void GX_LoadOBJExtPltt(void *src, u32 offset, u32 size){ +ARM_FUNC void GX_LoadOBJExtPltt(void *src, u32 offset, u32 size){ _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D33E4 + offset), size, NULL, NULL); } -void GX_EndLoadOBJExtPltt(){ +ARM_FUNC void GX_EndLoadOBJExtPltt(){ if (gUnk02106814 != -1) MI_WaitDma(gUnk02106814); GX_SetBankForOBJExtPltt(gUnk021D33E8); @@ -196,30 +196,30 @@ void GX_EndLoadOBJExtPltt(){ gUnk021D33E4 = 0x0; } -void GXS_BeginLoadBGExtPltt(){ +ARM_FUNC void GXS_BeginLoadBGExtPltt(){ gUnk021D33E0 = FUN_020C6034(); } -void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){ _GX_Load_32_Async(gUnk02106814, src, (void *)(0x06898000 + offset), size, NULL, NULL); } -void GXS_EndLoadBGExtPltt(){ +ARM_FUNC void GXS_EndLoadBGExtPltt(){ if (gUnk02106814 != -1) MI_WaitDma(gUnk02106814); GX_SetBankForSubBGExtPltt(gUnk021D33E0); gUnk021D33E0 = 0x0; } -void GXS_BeginLoadOBJExtPltt(){ +ARM_FUNC void GXS_BeginLoadOBJExtPltt(){ gUnk021D33F8 = GX_ResetBankForSubOBJ(); } -void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){ +ARM_FUNC void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){ _GX_Load_32_Async(gUnk02106814, src, (void *)(0x068A0000 + offset), size, NULL, NULL); } -void GXS_EndLoadOBJExtPltt(){ +ARM_FUNC void GXS_EndLoadOBJExtPltt(){ if (gUnk02106814 != -1) MI_WaitDma(gUnk02106814); GX_SetBankForSubOBJExtPltt(gUnk021D33F8); -- cgit v1.2.3 From f34db9ec15de8a39989afc722286844ac5fe252b Mon Sep 17 00:00:00 2001 From: Made Date: Fri, 15 May 2020 04:54:46 +0200 Subject: Correct global symbol names --- arm9/lib/src/GX_load2d.c | 138 +++++++++++++++++++++++------------------------ 1 file changed, 69 insertions(+), 69 deletions(-) (limited to 'arm9/lib/src/GX_load2d.c') diff --git a/arm9/lib/src/GX_load2d.c b/arm9/lib/src/GX_load2d.c index 972babad..c0139c41 100644 --- a/arm9/lib/src/GX_load2d.c +++ b/arm9/lib/src/GX_load2d.c @@ -2,15 +2,15 @@ #include "main.h" #include "gx.h" -extern u32 gUnk02106814; +extern u32 UNK_02106814; -extern s32 gUnk021D33F8; -extern s32 gUnk021D33F4; -extern u32 gUnk021D33F0; -extern u32 gUnk021D33EC; -extern s32 gUnk021D33E8; -extern u32 gUnk021D33E4; -extern s32 gUnk021D33E0; +extern s32 UNK_021D33F8; +extern s32 UNK_021D33F4; +extern u32 UNK_021D33F0; +extern u32 UNK_021D33EC; +extern s32 UNK_021D33E8; +extern u32 UNK_021D33E4; +extern s32 UNK_021D33E0; static inline void *_GX_OBJ_PTR(){ @@ -21,207 +21,207 @@ static inline void *_GXS_OBJ_PTR(){ } ARM_FUNC void GX_LoadBGPltt(void *src, u32 offset, u32 size){ - _GX_Load_16(gUnk02106814, src, (void *)(0x5000000 + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(0x5000000 + offset), size); } ARM_FUNC void GXS_LoadBGPltt(void *src, u32 offset, u32 size){ - _GX_Load_16(gUnk02106814, src, (void *)(0x5000400 + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(0x5000400 + offset), size); } ARM_FUNC void GX_LoadOBJPltt(void *src, u32 offset, u32 size){ - _GX_Load_16(gUnk02106814, src, (void *)(0x5000200 + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(0x5000200 + offset), size); } ARM_FUNC void GXS_LoadOBJPltt(void *src, u32 offset, u32 size){ - _GX_Load_16(gUnk02106814, src, (void *)(0x5000600 + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(0x5000600 + offset), size); } ARM_FUNC void GX_LoadOAM(void *src, u32 offset, u32 size){ - _GX_Load_32(gUnk02106814, src, (void *)(0x7000000 + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(0x7000000 + offset), size); } ARM_FUNC void GXS_LoadOAM(void *src, u32 offset, u32 size){ - _GX_Load_32(gUnk02106814, src, (void *)(0x7000400 + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(0x7000400 + offset), size); } ARM_FUNC void GX_LoadOBJ(void *src, u32 offset, u32 size){ u32 base = (u32)_GX_OBJ_PTR(); - _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadOBJ(void *src, u32 offset, u32 size){ u32 base = (u32)_GXS_OBJ_PTR(); - _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG0Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG0ScrPtr(); - _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG0Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG0ScrPtr(); - _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG1Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG1ScrPtr(); - _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG1Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG1ScrPtr(); - _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG2Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG2ScrPtr(); - _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG2Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG2ScrPtr(); - _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG3Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG3ScrPtr(); - _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG3Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG3ScrPtr(); - _GX_Load_16(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG0Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG0CharPtr(); - _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG0Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG0CharPtr(); - _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG1Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG1CharPtr(); - _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG1Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG1CharPtr(); - _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG2Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG2CharPtr(); - _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG2Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG2CharPtr(); - _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG3Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG3CharPtr(); - _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG3Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG3CharPtr(); - _GX_Load_32(gUnk02106814, src, (void *)(base + offset), size); + _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_BeginLoadBGExtPltt(){ - gUnk021D33F4 = GX_ResetBankForBGExtPltt(); - switch (gUnk021D33F4) + UNK_021D33F4 = GX_ResetBankForBGExtPltt(); + switch (UNK_021D33F4) { case 0: //needed to match break; case 0x10: - gUnk021D33F0 = 0x06880000; - gUnk021D33EC = 0x0; + UNK_021D33F0 = 0x06880000; + UNK_021D33EC = 0x0; break; case 0x40: - gUnk021D33F0 = 0x06894000; - gUnk021D33EC = 0x4000; + UNK_021D33F0 = 0x06894000; + UNK_021D33EC = 0x4000; break; case 0x20: case 0x60: - gUnk021D33F0 = 0x06890000; - gUnk021D33EC = 0x0; + UNK_021D33F0 = 0x06890000; + UNK_021D33EC = 0x0; break; } } ARM_FUNC void GX_LoadBGExtPltt(void *src, u32 offset, u32 size){ - _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D33F0 + offset - gUnk021D33EC), size, NULL, NULL); + _GX_Load_32_Async(UNK_02106814, src, (void *)(UNK_021D33F0 + offset - UNK_021D33EC), size, NULL, NULL); } ARM_FUNC void GX_EndLoadBGExtPltt(){ - if (gUnk02106814 != -1) - MI_WaitDma(gUnk02106814); - GX_SetBankForBGExtPltt(gUnk021D33F4); - gUnk021D33F4 = 0x0; - gUnk021D33F0 = 0x0; - gUnk021D33EC = 0x0; + if (UNK_02106814 != -1) + MI_WaitDma(UNK_02106814); + GX_SetBankForBGExtPltt(UNK_021D33F4); + UNK_021D33F4 = 0x0; + UNK_021D33F0 = 0x0; + UNK_021D33EC = 0x0; } ARM_FUNC void GX_BeginLoadOBJExtPltt(){ - gUnk021D33E8 = GX_ResetBankForOBJExtPltt(); - switch (gUnk021D33E8) + UNK_021D33E8 = GX_ResetBankForOBJExtPltt(); + switch (UNK_021D33E8) { case 0: //needed to match break; case 0x40: - gUnk021D33E4 = 0x06894000; + UNK_021D33E4 = 0x06894000; break; case 0x20: - gUnk021D33E4 = 0x06890000; + UNK_021D33E4 = 0x06890000; break; } } ARM_FUNC void GX_LoadOBJExtPltt(void *src, u32 offset, u32 size){ - _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D33E4 + offset), size, NULL, NULL); + _GX_Load_32_Async(UNK_02106814, src, (void *)(UNK_021D33E4 + offset), size, NULL, NULL); } ARM_FUNC void GX_EndLoadOBJExtPltt(){ - if (gUnk02106814 != -1) - MI_WaitDma(gUnk02106814); - GX_SetBankForOBJExtPltt(gUnk021D33E8); - gUnk021D33E8 = 0x0; - gUnk021D33E4 = 0x0; + if (UNK_02106814 != -1) + MI_WaitDma(UNK_02106814); + GX_SetBankForOBJExtPltt(UNK_021D33E8); + UNK_021D33E8 = 0x0; + UNK_021D33E4 = 0x0; } ARM_FUNC void GXS_BeginLoadBGExtPltt(){ - gUnk021D33E0 = FUN_020C6034(); + UNK_021D33E0 = FUN_020C6034(); } ARM_FUNC void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){ - _GX_Load_32_Async(gUnk02106814, src, (void *)(0x06898000 + offset), size, NULL, NULL); + _GX_Load_32_Async(UNK_02106814, src, (void *)(0x06898000 + offset), size, NULL, NULL); } ARM_FUNC void GXS_EndLoadBGExtPltt(){ - if (gUnk02106814 != -1) - MI_WaitDma(gUnk02106814); - GX_SetBankForSubBGExtPltt(gUnk021D33E0); - gUnk021D33E0 = 0x0; + if (UNK_02106814 != -1) + MI_WaitDma(UNK_02106814); + GX_SetBankForSubBGExtPltt(UNK_021D33E0); + UNK_021D33E0 = 0x0; } ARM_FUNC void GXS_BeginLoadOBJExtPltt(){ - gUnk021D33F8 = GX_ResetBankForSubOBJ(); + UNK_021D33F8 = GX_ResetBankForSubOBJ(); } ARM_FUNC void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){ - _GX_Load_32_Async(gUnk02106814, src, (void *)(0x068A0000 + offset), size, NULL, NULL); + _GX_Load_32_Async(UNK_02106814, src, (void *)(0x068A0000 + offset), size, NULL, NULL); } ARM_FUNC void GXS_EndLoadOBJExtPltt(){ - if (gUnk02106814 != -1) - MI_WaitDma(gUnk02106814); - GX_SetBankForSubOBJExtPltt(gUnk021D33F8); - gUnk021D33F8 = 0x0; + if (UNK_02106814 != -1) + MI_WaitDma(UNK_02106814); + GX_SetBankForSubOBJExtPltt(UNK_021D33F8); + UNK_021D33F8 = 0x0; } -- cgit v1.2.3 From 648c9421d8ecbd8642f4ae393ab8add89fb3dc00 Mon Sep 17 00:00:00 2001 From: Made Date: Mon, 18 May 2020 02:10:36 +0200 Subject: Add enums and some other stuff and split header --- arm9/lib/src/GX_load2d.c | 68 +++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 36 deletions(-) (limited to 'arm9/lib/src/GX_load2d.c') diff --git a/arm9/lib/src/GX_load2d.c b/arm9/lib/src/GX_load2d.c index c0139c41..55faa915 100644 --- a/arm9/lib/src/GX_load2d.c +++ b/arm9/lib/src/GX_load2d.c @@ -21,117 +21,117 @@ static inline void *_GXS_OBJ_PTR(){ } ARM_FUNC void GX_LoadBGPltt(void *src, u32 offset, u32 size){ - _GX_Load_16(UNK_02106814, src, (void *)(0x5000000 + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000000 + offset), size); } ARM_FUNC void GXS_LoadBGPltt(void *src, u32 offset, u32 size){ - _GX_Load_16(UNK_02106814, src, (void *)(0x5000400 + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000400 + offset), size); } ARM_FUNC void GX_LoadOBJPltt(void *src, u32 offset, u32 size){ - _GX_Load_16(UNK_02106814, src, (void *)(0x5000200 + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000200 + offset), size); } ARM_FUNC void GXS_LoadOBJPltt(void *src, u32 offset, u32 size){ - _GX_Load_16(UNK_02106814, src, (void *)(0x5000600 + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000600 + offset), size); } ARM_FUNC void GX_LoadOAM(void *src, u32 offset, u32 size){ - _GX_Load_32(UNK_02106814, src, (void *)(0x7000000 + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(0x7000000 + offset), size); } ARM_FUNC void GXS_LoadOAM(void *src, u32 offset, u32 size){ - _GX_Load_32(UNK_02106814, src, (void *)(0x7000400 + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(0x7000400 + offset), size); } ARM_FUNC void GX_LoadOBJ(void *src, u32 offset, u32 size){ u32 base = (u32)_GX_OBJ_PTR(); - _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadOBJ(void *src, u32 offset, u32 size){ u32 base = (u32)_GXS_OBJ_PTR(); - _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG0Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG0ScrPtr(); - _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG0Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG0ScrPtr(); - _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG1Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG1ScrPtr(); - _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG1Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG1ScrPtr(); - _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG2Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG2ScrPtr(); - _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG2Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG2ScrPtr(); - _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG3Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG3ScrPtr(); - _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG3Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG3ScrPtr(); - _GX_Load_16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG0Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG0CharPtr(); - _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG0Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG0CharPtr(); - _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG1Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG1CharPtr(); - _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG1Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG1CharPtr(); - _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG2Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG2CharPtr(); - _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG2Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG2CharPtr(); - _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG3Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG3CharPtr(); - _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG3Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG3CharPtr(); - _GX_Load_32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); } ARM_FUNC void GX_BeginLoadBGExtPltt(){ @@ -157,12 +157,11 @@ ARM_FUNC void GX_BeginLoadBGExtPltt(){ } ARM_FUNC void GX_LoadBGExtPltt(void *src, u32 offset, u32 size){ - _GX_Load_32_Async(UNK_02106814, src, (void *)(UNK_021D33F0 + offset - UNK_021D33EC), size, NULL, NULL); + GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D33F0 + offset - UNK_021D33EC), size, NULL, NULL); } ARM_FUNC void GX_EndLoadBGExtPltt(){ - if (UNK_02106814 != -1) - MI_WaitDma(UNK_02106814); + GXi_WaitDma(UNK_02106814); GX_SetBankForBGExtPltt(UNK_021D33F4); UNK_021D33F4 = 0x0; UNK_021D33F0 = 0x0; @@ -185,12 +184,11 @@ ARM_FUNC void GX_BeginLoadOBJExtPltt(){ } ARM_FUNC void GX_LoadOBJExtPltt(void *src, u32 offset, u32 size){ - _GX_Load_32_Async(UNK_02106814, src, (void *)(UNK_021D33E4 + offset), size, NULL, NULL); + GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D33E4 + offset), size, NULL, NULL); } ARM_FUNC void GX_EndLoadOBJExtPltt(){ - if (UNK_02106814 != -1) - MI_WaitDma(UNK_02106814); + GXi_WaitDma(UNK_02106814); GX_SetBankForOBJExtPltt(UNK_021D33E8); UNK_021D33E8 = 0x0; UNK_021D33E4 = 0x0; @@ -201,12 +199,11 @@ ARM_FUNC void GXS_BeginLoadBGExtPltt(){ } ARM_FUNC void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){ - _GX_Load_32_Async(UNK_02106814, src, (void *)(0x06898000 + offset), size, NULL, NULL); + GXi_DmaCopy32Async(UNK_02106814, src, (void *)(0x06898000 + offset), size, NULL, NULL); } ARM_FUNC void GXS_EndLoadBGExtPltt(){ - if (UNK_02106814 != -1) - MI_WaitDma(UNK_02106814); + GXi_WaitDma(UNK_02106814); GX_SetBankForSubBGExtPltt(UNK_021D33E0); UNK_021D33E0 = 0x0; } @@ -216,12 +213,11 @@ ARM_FUNC void GXS_BeginLoadOBJExtPltt(){ } ARM_FUNC void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){ - _GX_Load_32_Async(UNK_02106814, src, (void *)(0x068A0000 + offset), size, NULL, NULL); + GXi_DmaCopy32Async(UNK_02106814, src, (void *)(0x068A0000 + offset), size, NULL, NULL); } ARM_FUNC void GXS_EndLoadOBJExtPltt(){ - if (UNK_02106814 != -1) - MI_WaitDma(UNK_02106814); + GXi_WaitDma(UNK_02106814); GX_SetBankForSubOBJExtPltt(UNK_021D33F8); UNK_021D33F8 = 0x0; } -- cgit v1.2.3 From 8ac22ef273a2863591f7e382d2d8781cc434e8a5 Mon Sep 17 00:00:00 2001 From: Made Date: Mon, 18 May 2020 02:32:07 +0200 Subject: Rename globals --- arm9/lib/src/GX_load2d.c | 130 +++++++++++++++++++++++------------------------ 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'arm9/lib/src/GX_load2d.c') diff --git a/arm9/lib/src/GX_load2d.c b/arm9/lib/src/GX_load2d.c index 55faa915..17ab3694 100644 --- a/arm9/lib/src/GX_load2d.c +++ b/arm9/lib/src/GX_load2d.c @@ -2,15 +2,15 @@ #include "main.h" #include "gx.h" -extern u32 UNK_02106814; +extern u32 GXi_DmaId; -extern s32 UNK_021D33F8; -extern s32 UNK_021D33F4; -extern u32 UNK_021D33F0; -extern u32 UNK_021D33EC; -extern s32 UNK_021D33E8; -extern u32 UNK_021D33E4; -extern s32 UNK_021D33E0; +extern s32 sSubOBJExtPltt; +extern s32 sBGExtPltt; +extern u32 sBGExtPlttLCDCBlk; +extern u32 sBGExtPlttLCDCOffset; +extern s32 sOBJExtPltt; +extern u32 sOBJExtPlttLCDCBlk; +extern s32 sSubBGExtPltt; static inline void *_GX_OBJ_PTR(){ @@ -21,203 +21,203 @@ static inline void *_GXS_OBJ_PTR(){ } ARM_FUNC void GX_LoadBGPltt(void *src, u32 offset, u32 size){ - GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000000 + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000000 + offset), size); } ARM_FUNC void GXS_LoadBGPltt(void *src, u32 offset, u32 size){ - GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000400 + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000400 + offset), size); } ARM_FUNC void GX_LoadOBJPltt(void *src, u32 offset, u32 size){ - GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000200 + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000200 + offset), size); } ARM_FUNC void GXS_LoadOBJPltt(void *src, u32 offset, u32 size){ - GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000600 + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000600 + offset), size); } ARM_FUNC void GX_LoadOAM(void *src, u32 offset, u32 size){ - GXi_DmaCopy32(UNK_02106814, src, (void *)(0x7000000 + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(0x7000000 + offset), size); } ARM_FUNC void GXS_LoadOAM(void *src, u32 offset, u32 size){ - GXi_DmaCopy32(UNK_02106814, src, (void *)(0x7000400 + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(0x7000400 + offset), size); } ARM_FUNC void GX_LoadOBJ(void *src, u32 offset, u32 size){ u32 base = (u32)_GX_OBJ_PTR(); - GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadOBJ(void *src, u32 offset, u32 size){ u32 base = (u32)_GXS_OBJ_PTR(); - GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG0Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG0ScrPtr(); - GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG0Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG0ScrPtr(); - GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG1Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG1ScrPtr(); - GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG1Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG1ScrPtr(); - GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG2Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG2ScrPtr(); - GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG2Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG2ScrPtr(); - GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG3Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG3ScrPtr(); - GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG3Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG3ScrPtr(); - GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG0Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG0CharPtr(); - GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG0Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG0CharPtr(); - GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG1Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG1CharPtr(); - GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG1Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG1CharPtr(); - GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG2Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG2CharPtr(); - GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG2Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG2CharPtr(); - GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GX_LoadBG3Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG3CharPtr(); - GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GXS_LoadBG3Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG3CharPtr(); - GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size); + GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } ARM_FUNC void GX_BeginLoadBGExtPltt(){ - UNK_021D33F4 = GX_ResetBankForBGExtPltt(); - switch (UNK_021D33F4) + sBGExtPltt = GX_ResetBankForBGExtPltt(); + switch (sBGExtPltt) { case 0: //needed to match break; case 0x10: - UNK_021D33F0 = 0x06880000; - UNK_021D33EC = 0x0; + sBGExtPlttLCDCBlk = 0x06880000; + sBGExtPlttLCDCOffset = 0x0; break; case 0x40: - UNK_021D33F0 = 0x06894000; - UNK_021D33EC = 0x4000; + sBGExtPlttLCDCBlk = 0x06894000; + sBGExtPlttLCDCOffset = 0x4000; break; case 0x20: case 0x60: - UNK_021D33F0 = 0x06890000; - UNK_021D33EC = 0x0; + sBGExtPlttLCDCBlk = 0x06890000; + sBGExtPlttLCDCOffset = 0x0; break; } } ARM_FUNC void GX_LoadBGExtPltt(void *src, u32 offset, u32 size){ - GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D33F0 + offset - UNK_021D33EC), size, NULL, NULL); + GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sBGExtPlttLCDCBlk + offset - sBGExtPlttLCDCOffset), size, NULL, NULL); } ARM_FUNC void GX_EndLoadBGExtPltt(){ - GXi_WaitDma(UNK_02106814); - GX_SetBankForBGExtPltt(UNK_021D33F4); - UNK_021D33F4 = 0x0; - UNK_021D33F0 = 0x0; - UNK_021D33EC = 0x0; + GXi_WaitDma(GXi_DmaId); + GX_SetBankForBGExtPltt(sBGExtPltt); + sBGExtPltt = 0x0; + sBGExtPlttLCDCBlk = 0x0; + sBGExtPlttLCDCOffset = 0x0; } ARM_FUNC void GX_BeginLoadOBJExtPltt(){ - UNK_021D33E8 = GX_ResetBankForOBJExtPltt(); - switch (UNK_021D33E8) + sOBJExtPltt = GX_ResetBankForOBJExtPltt(); + switch (sOBJExtPltt) { case 0: //needed to match break; case 0x40: - UNK_021D33E4 = 0x06894000; + sOBJExtPlttLCDCBlk = 0x06894000; break; case 0x20: - UNK_021D33E4 = 0x06890000; + sOBJExtPlttLCDCBlk = 0x06890000; break; } } ARM_FUNC void GX_LoadOBJExtPltt(void *src, u32 offset, u32 size){ - GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D33E4 + offset), size, NULL, NULL); + GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sOBJExtPlttLCDCBlk + offset), size, NULL, NULL); } ARM_FUNC void GX_EndLoadOBJExtPltt(){ - GXi_WaitDma(UNK_02106814); - GX_SetBankForOBJExtPltt(UNK_021D33E8); - UNK_021D33E8 = 0x0; - UNK_021D33E4 = 0x0; + GXi_WaitDma(GXi_DmaId); + GX_SetBankForOBJExtPltt(sOBJExtPltt); + sOBJExtPltt = 0x0; + sOBJExtPlttLCDCBlk = 0x0; } ARM_FUNC void GXS_BeginLoadBGExtPltt(){ - UNK_021D33E0 = FUN_020C6034(); + sSubBGExtPltt = FUN_020C6034(); } ARM_FUNC void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){ - GXi_DmaCopy32Async(UNK_02106814, src, (void *)(0x06898000 + offset), size, NULL, NULL); + GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(0x06898000 + offset), size, NULL, NULL); } ARM_FUNC void GXS_EndLoadBGExtPltt(){ - GXi_WaitDma(UNK_02106814); - GX_SetBankForSubBGExtPltt(UNK_021D33E0); - UNK_021D33E0 = 0x0; + GXi_WaitDma(GXi_DmaId); + GX_SetBankForSubBGExtPltt(sSubBGExtPltt); + sSubBGExtPltt = 0x0; } ARM_FUNC void GXS_BeginLoadOBJExtPltt(){ - UNK_021D33F8 = GX_ResetBankForSubOBJ(); + sSubOBJExtPltt = GX_ResetBankForSubOBJ(); } ARM_FUNC void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){ - GXi_DmaCopy32Async(UNK_02106814, src, (void *)(0x068A0000 + offset), size, NULL, NULL); + GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(0x068A0000 + offset), size, NULL, NULL); } ARM_FUNC void GXS_EndLoadOBJExtPltt(){ - GXi_WaitDma(UNK_02106814); - GX_SetBankForSubOBJExtPltt(UNK_021D33F8); - UNK_021D33F8 = 0x0; + GXi_WaitDma(GXi_DmaId); + GX_SetBankForSubOBJExtPltt(sSubOBJExtPltt); + sSubOBJExtPltt = 0x0; } -- cgit v1.2.3 From 88e486100e449d8960894c9e30c4f21489ccbc31 Mon Sep 17 00:00:00 2001 From: Made Date: Mon, 18 May 2020 02:33:11 +0200 Subject: rename main GX header --- arm9/lib/src/GX_load2d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arm9/lib/src/GX_load2d.c') diff --git a/arm9/lib/src/GX_load2d.c b/arm9/lib/src/GX_load2d.c index 17ab3694..d4def461 100644 --- a/arm9/lib/src/GX_load2d.c +++ b/arm9/lib/src/GX_load2d.c @@ -1,6 +1,6 @@ #include "global.h" #include "main.h" -#include "gx.h" +#include "GX.h" extern u32 GXi_DmaId; -- cgit v1.2.3