summaryrefslogtreecommitdiff
path: root/arm9/lib/src
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/lib/src')
-rw-r--r--arm9/lib/src/GX_load2d.c68
-rw-r--r--arm9/lib/src/GX_load3d.c21
2 files changed, 41 insertions, 48 deletions
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;
}
diff --git a/arm9/lib/src/GX_load3d.c b/arm9/lib/src/GX_load3d.c
index 3a8a8c1d..31ddffc3 100644
--- a/arm9/lib/src/GX_load3d.c
+++ b/arm9/lib/src/GX_load3d.c
@@ -50,17 +50,16 @@ ARM_FUNC void GX_LoadTex(void *src, u32 offset, u32 size){
void *temp2 = (void *)UNK_021D3414;
u32 temp1 = UNK_021D3418 - offset;
temp = (void *)(UNK_021D3400 + offset);
- _GX_Load_32(UNK_02106814, src, temp, temp1);
- _GX_Load_32_Async(UNK_02106814, (void *)((u8 *)src + temp1), temp2, (size - temp1), NULL, NULL);
+ GXi_DmaCopy32(UNK_02106814, src, temp, temp1);
+ GXi_DmaCopy32Async(UNK_02106814, (void *)((u8 *)src + temp1), temp2, (size - temp1), NULL, NULL);
return;
}
}
- _GX_Load_32_Async(UNK_02106814, src, temp, size, NULL, NULL);
+ GXi_DmaCopy32Async(UNK_02106814, src, temp, size, NULL, NULL);
}
ARM_FUNC void GX_EndLoadTex(){
- if (UNK_02106814 != -1)
- MI_WaitDma(UNK_02106814);
+ GXi_WaitDma(UNK_02106814);
GX_SetBankForTex(UNK_021D3410);
UNK_021D3418 = 0x0;
UNK_021D3414 = 0x0;
@@ -75,12 +74,11 @@ ARM_FUNC void GX_BeginLoadTexPltt(){
}
ARM_FUNC void GX_LoadTexPltt(void *src, u32 offset, u32 size){
- _GX_Load_32_Async(UNK_02106814, src, (void *)(UNK_021D3404 + offset), size, NULL, NULL);
+ GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D3404 + offset), size, NULL, NULL);
}
ARM_FUNC void GX_EndLoadTexPltt(){
- if (UNK_02106814 != -1)
- MI_WaitDma(UNK_02106814);
+ GXi_WaitDma(UNK_02106814);
GX_SetBankForTexPltt(UNK_021D3408);
UNK_021D3408 = 0x0;
UNK_021D3404 = 0x0;
@@ -108,16 +106,15 @@ ARM_FUNC void GX_BeginLoadClearImage(){
}
ARM_FUNC void GX_LoadClearImageColor(void *src, u32 size){
- _GX_Load_32_Async(UNK_02106814, src, (void *)(UNK_021D340C), size, NULL, NULL);
+ GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D340C), size, NULL, NULL);
}
ARM_FUNC void GX_LoadClearImageDepth(void *src, u32 size){
- _GX_Load_32_Async(UNK_02106814, src, (void *)(UNK_021D340C + 0x20000), size, NULL, NULL);
+ GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D340C + 0x20000), size, NULL, NULL);
}
ARM_FUNC void GX_EndLoadClearImage(){
- if (UNK_02106814 != -1)
- MI_WaitDma(UNK_02106814);
+ GXi_WaitDma(UNK_02106814);
GX_SetBankForClearImage(UNK_021D33FC);
UNK_021D33FC = 0x0;
UNK_021D340C = 0x0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 12:59:14 +0000