diff options
Diffstat (limited to 'arm9/lib/src')
-rw-r--r-- | arm9/lib/src/GX.c | 36 | ||||
-rw-r--r-- | arm9/lib/src/GX_g3x.c | 8 | ||||
-rw-r--r-- | arm9/lib/src/GX_load2d.c | 138 | ||||
-rw-r--r-- | arm9/lib/src/GX_load3d.c | 112 | ||||
-rw-r--r-- | arm9/lib/src/GX_state.c | 28 | ||||
-rw-r--r-- | arm9/lib/src/GX_vramcnt.c | 152 |
6 files changed, 237 insertions, 237 deletions
diff --git a/arm9/lib/src/GX.c b/arm9/lib/src/GX.c index bae16fca..ca3e4604 100644 --- a/arm9/lib/src/GX.c +++ b/arm9/lib/src/GX.c @@ -2,10 +2,10 @@ #include "main.h" #include "gx.h" -extern u16 gUnk021D33BC; -extern u16 gUnk021D33C0; -extern u32 gUnk02106814; -extern u16 gUnk02106810; +extern u16 UNK_021D33BC; +extern u16 UNK_021D33C0; +extern u32 UNK_02106814; +extern u16 UNK_02106810; ARM_FUNC void GX_Init(){ SETREG16(HW_REG_POWCNT1, READREG16(HW_REG_POWCNT1) | 0x8000); @@ -13,22 +13,22 @@ ARM_FUNC void GX_Init(){ SETREG16(HW_REG_POWCNT1, READREG16(HW_REG_POWCNT1) | 0x1); GX_InitGXState(); u32 temp; - while (gUnk021D33BC == 0) + while (UNK_021D33BC == 0) { temp = OS_GetLockID(); if (temp == -3) { OS_Terminate(); } - gUnk021D33BC = temp; + UNK_021D33BC = temp; } SETREG16(HW_REG_DISPSTAT, 0x0); SETREG32(HW_REG_DISPCNT, 0x0); - if (gUnk02106814 != -1) + if (UNK_02106814 != -1) { - MI_DmaFill32(gUnk02106814, (void *)HW_REG_BG0CNT_A, 0x0, 0x60); + MI_DmaFill32(UNK_02106814, (void *)HW_REG_BG0CNT_A, 0x0, 0x60); SETREG16(HW_REG_MASTER_BRIGHT, 0x0); - MI_DmaFill32(gUnk02106814, (void *)HW_REG_DISPCNT_2D, 0x0, 0x70); + MI_DmaFill32(UNK_02106814, (void *)HW_REG_DISPCNT_2D, 0x0, 0x70); } else { @@ -74,16 +74,16 @@ ARM_FUNC u32 GX_VBlankIntr(u32 enable){ ARM_FUNC void GX_DispOff(){ u32 temp = READREG32(HW_REG_DISPCNT); - gUnk02106810 = 0x0; - gUnk021D33C0 = (temp & 0x30000) >> 0x10; + UNK_02106810 = 0x0; + UNK_021D33C0 = (temp & 0x30000) >> 0x10; SETREG32(HW_REG_DISPCNT, temp & ~0x30000); } ARM_FUNC void GX_DispOn(){ - gUnk02106810 = 0x1; - if (gUnk021D33C0) + UNK_02106810 = 0x1; + if (UNK_021D33C0) { - SETREG32(HW_REG_DISPCNT, READREG32(HW_REG_DISPCNT) & ~0x30000 | (gUnk021D33C0 << 0x10)); + SETREG32(HW_REG_DISPCNT, READREG32(HW_REG_DISPCNT) & ~0x30000 | (UNK_021D33C0 << 0x10)); } else @@ -94,12 +94,12 @@ ARM_FUNC void GX_DispOn(){ ARM_FUNC void GX_SetGraphicsMode(u32 mode1, u32 mode2, u32 mode3){ u32 temp2 = READREG32(HW_REG_DISPCNT); - gUnk021D33C0 = mode1; - if (!gUnk02106810) + UNK_021D33C0 = mode1; + if (!UNK_02106810) mode1 = 0; SETREG32(HW_REG_DISPCNT, (mode2 | ((temp2 & 0xFFF0FFF0) | (mode1 << 0x10))) | (mode3 << 0x3)); - if (!gUnk021D33C0) - gUnk02106810 = 0x0; + if (!UNK_021D33C0) + UNK_02106810 = 0x0; } ARM_FUNC void GXS_SetGraphicsMode(u32 mode){ diff --git a/arm9/lib/src/GX_g3x.c b/arm9/lib/src/GX_g3x.c index 7ced9de6..e76adce7 100644 --- a/arm9/lib/src/GX_g3x.c +++ b/arm9/lib/src/GX_g3x.c @@ -2,7 +2,7 @@ #include "main.h" #include "gx.h" -extern u32 gUnk02106814; +extern u32 UNK_02106814; ARM_FUNC asm void GXi_NopClearFifo128_(void *reg){ mov r1, #0x0 @@ -178,10 +178,10 @@ ARM_FUNC void G3X_SetClearColor(u32 col, u32 alpha, u32 depth, u32 polygon_id, u } ARM_FUNC void G3X_InitTable(){ - if (gUnk02106814 != -1) + if (UNK_02106814 != -1) { - MI_DmaFill32Async(gUnk02106814, (void *)HW_REG_EDGE_COLOR, 0x0, 0x10, 0x0, 0x0); - MI_DmaFill32(gUnk02106814, (void *)HW_REG_FOG_TABLE, 0x0, 0x60); + MI_DmaFill32Async(UNK_02106814, (void *)HW_REG_EDGE_COLOR, 0x0, 0x10, 0x0, 0x0); + MI_DmaFill32(UNK_02106814, (void *)HW_REG_FOG_TABLE, 0x0, 0x60); } else { 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; } diff --git a/arm9/lib/src/GX_load3d.c b/arm9/lib/src/GX_load3d.c index ee7502db..3a8a8c1d 100644 --- a/arm9/lib/src/GX_load3d.c +++ b/arm9/lib/src/GX_load3d.c @@ -2,123 +2,123 @@ #include "main.h" #include "gx.h" -extern u32 gUnk02106814; +extern u32 UNK_02106814; -extern u32 gUnk021D3410; -extern u32 gUnk021D3400; -extern u32 gUnk021D3414; -extern u32 gUnk021D3418; +extern u32 UNK_021D3410; +extern u32 UNK_021D3400; +extern u32 UNK_021D3414; +extern u32 UNK_021D3418; //probably structs of length 0x6 -extern u16 gUnk02103B4C[]; -extern u16 gUnk02103B4E[]; -extern u16 gUnk02103B50[]; +extern u16 UNK_02103B4C[]; +extern u16 UNK_02103B4E[]; +extern u16 UNK_02103B50[]; -extern u32 gUnk021D3408; -extern u32 gUnk021D3404; -extern u16 gUnk02103B3C[]; +extern u32 UNK_021D3408; +extern u32 UNK_021D3404; +extern u16 UNK_02103B3C[]; -extern s32 gUnk021D33FC; -extern u32 gUnk021D340C; +extern s32 UNK_021D33FC; +extern u32 UNK_021D340C; ARM_FUNC void GX_BeginLoadTex(){ u32 temp = GX_ResetBankForTex(); - gUnk021D3410 = temp; - gUnk021D3400 = gUnk02103B4C[temp * 3] << 0xC; - gUnk021D3414 = gUnk02103B4E[temp * 3] << 0xC; - gUnk021D3418 = gUnk02103B50[temp * 3] << 0xC; + UNK_021D3410 = temp; + UNK_021D3400 = UNK_02103B4C[temp * 3] << 0xC; + UNK_021D3414 = UNK_02103B4E[temp * 3] << 0xC; + UNK_021D3418 = UNK_02103B50[temp * 3] << 0xC; } ARM_FUNC void GX_LoadTex(void *src, u32 offset, u32 size){ void *temp; - if (!gUnk021D3414) + if (!UNK_021D3414) { - temp = (void *)(gUnk021D3400 + offset); + temp = (void *)(UNK_021D3400 + offset); } else { - if ((offset + size) < gUnk021D3418) + if ((offset + size) < UNK_021D3418) { - temp = (void *)(gUnk021D3400 + offset); + temp = (void *)(UNK_021D3400 + offset); } - else if (offset >= gUnk021D3418) + else if (offset >= UNK_021D3418) { - temp = (void *)(gUnk021D3414 + offset - gUnk021D3418); + temp = (void *)(UNK_021D3414 + offset - UNK_021D3418); } else { - void *temp2 = (void *)gUnk021D3414; - u32 temp1 = gUnk021D3418 - offset; - temp = (void *)(gUnk021D3400 + offset); - _GX_Load_32(gUnk02106814, src, temp, temp1); - _GX_Load_32_Async(gUnk02106814, (void *)((u8 *)src + temp1), temp2, (size - temp1), NULL, NULL); + 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); return; } } - _GX_Load_32_Async(gUnk02106814, src, temp, size, NULL, NULL); + _GX_Load_32_Async(UNK_02106814, src, temp, size, NULL, NULL); } ARM_FUNC void GX_EndLoadTex(){ - if (gUnk02106814 != -1) - MI_WaitDma(gUnk02106814); - GX_SetBankForTex(gUnk021D3410); - gUnk021D3418 = 0x0; - gUnk021D3414 = 0x0; - gUnk021D3400 = 0x0; - gUnk021D3410 = 0x0; + if (UNK_02106814 != -1) + MI_WaitDma(UNK_02106814); + GX_SetBankForTex(UNK_021D3410); + UNK_021D3418 = 0x0; + UNK_021D3414 = 0x0; + UNK_021D3400 = 0x0; + UNK_021D3410 = 0x0; } ARM_FUNC void GX_BeginLoadTexPltt(){ s32 temp = GX_ResetBankForTexPltt(); - gUnk021D3408 = temp; - gUnk021D3404 = gUnk02103B3C[temp >> 4] << 0xC; + UNK_021D3408 = temp; + UNK_021D3404 = UNK_02103B3C[temp >> 4] << 0xC; } ARM_FUNC void GX_LoadTexPltt(void *src, u32 offset, u32 size){ - _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D3404 + offset), size, NULL, NULL); + _GX_Load_32_Async(UNK_02106814, src, (void *)(UNK_021D3404 + offset), size, NULL, NULL); } ARM_FUNC void GX_EndLoadTexPltt(){ - if (gUnk02106814 != -1) - MI_WaitDma(gUnk02106814); - GX_SetBankForTexPltt(gUnk021D3408); - gUnk021D3408 = 0x0; - gUnk021D3404 = 0x0; + if (UNK_02106814 != -1) + MI_WaitDma(UNK_02106814); + GX_SetBankForTexPltt(UNK_021D3408); + UNK_021D3408 = 0x0; + UNK_021D3404 = 0x0; } ARM_FUNC void GX_BeginLoadClearImage(){ s32 temp = GX_ResetBankForClearImage(); - gUnk021D33FC = temp; + UNK_021D33FC = temp; switch (temp) { case 2: case 3: - gUnk021D340C = 0x6800000; + UNK_021D340C = 0x6800000; return; case 8: case 12: - gUnk021D340C = 0x6840000; + UNK_021D340C = 0x6840000; return; case 1: - gUnk021D340C = 0x67E0000; + UNK_021D340C = 0x67E0000; return; case 4: - gUnk021D340C = 0x6820000; + UNK_021D340C = 0x6820000; } } ARM_FUNC void GX_LoadClearImageColor(void *src, u32 size){ - _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D340C), size, NULL, NULL); + _GX_Load_32_Async(UNK_02106814, src, (void *)(UNK_021D340C), size, NULL, NULL); } ARM_FUNC void GX_LoadClearImageDepth(void *src, u32 size){ - _GX_Load_32_Async(gUnk02106814, src, (void *)(gUnk021D340C + 0x20000), size, NULL, NULL); + _GX_Load_32_Async(UNK_02106814, src, (void *)(UNK_021D340C + 0x20000), size, NULL, NULL); } ARM_FUNC void GX_EndLoadClearImage(){ - if (gUnk02106814 != -1) - MI_WaitDma(gUnk02106814); - GX_SetBankForClearImage(gUnk021D33FC); - gUnk021D33FC = 0x0; - gUnk021D340C = 0x0; + if (UNK_02106814 != -1) + MI_WaitDma(UNK_02106814); + GX_SetBankForClearImage(UNK_021D33FC); + UNK_021D33FC = 0x0; + UNK_021D340C = 0x0; } diff --git a/arm9/lib/src/GX_state.c b/arm9/lib/src/GX_state.c index 38968523..79a53ee7 100644 --- a/arm9/lib/src/GX_state.c +++ b/arm9/lib/src/GX_state.c @@ -2,22 +2,22 @@ #include "main.h" #include "gx.h" -extern struct VRAM_banks gUnk021D33C4; +extern struct VRAM_banks UNK_021D33C4; ARM_FUNC void GX_InitGXState(){ - gUnk021D33C4.var00 = 0x0; - gUnk021D33C4.var02 = 0x0; - gUnk021D33C4.var04 = 0x0; - gUnk021D33C4.var06 = 0x0; - gUnk021D33C4.var08 = 0x0; - gUnk021D33C4.var0A = 0x0; - gUnk021D33C4.var0C = 0x0; - gUnk021D33C4.var0E = 0x0; - gUnk021D33C4.var10 = 0x0; - gUnk021D33C4.var12 = 0x0; - gUnk021D33C4.var14 = 0x0; - gUnk021D33C4.var16 = 0x0; - gUnk021D33C4.var18 = 0x0; + UNK_021D33C4.var00 = 0x0; + UNK_021D33C4.var02 = 0x0; + UNK_021D33C4.var04 = 0x0; + UNK_021D33C4.var06 = 0x0; + UNK_021D33C4.var08 = 0x0; + UNK_021D33C4.var0A = 0x0; + UNK_021D33C4.var0C = 0x0; + UNK_021D33C4.var0E = 0x0; + UNK_021D33C4.var10 = 0x0; + UNK_021D33C4.var12 = 0x0; + UNK_021D33C4.var14 = 0x0; + UNK_021D33C4.var16 = 0x0; + UNK_021D33C4.var18 = 0x0; SETREG32(HW_REG_VRAMCNT_A, 0x0); SETREG8(HW_REG_VRAMCNT_E, 0x0); SETREG8(HW_REG_VRAMCNT_F, 0x0); diff --git a/arm9/lib/src/GX_vramcnt.c b/arm9/lib/src/GX_vramcnt.c index 24862470..fdedca46 100644 --- a/arm9/lib/src/GX_vramcnt.c +++ b/arm9/lib/src/GX_vramcnt.c @@ -2,8 +2,8 @@ #include "main.h" #include "gx.h" -extern u16 gUnk021D33BC; -extern struct VRAM_banks gUnk021D33C4; +extern u16 UNK_021D33BC; +extern struct VRAM_banks UNK_021D33C4; ARM_FUNC void GX_VRAMCNT_SetLCDC_(u32 mask){ if (mask & (0x1 << 0)) @@ -27,8 +27,8 @@ ARM_FUNC void GX_VRAMCNT_SetLCDC_(u32 mask){ } ARM_FUNC void GX_SetBankForBG(s32 bg){ - gUnk021D33C4.var00 = (u16)(~bg & (gUnk021D33C4.var00 | gUnk021D33C4.var02)); - gUnk021D33C4.var02 = bg; + UNK_021D33C4.var00 = (u16)(~bg & (UNK_021D33C4.var00 | UNK_021D33C4.var02)); + UNK_021D33C4.var02 = bg; switch (bg) { case 8: @@ -96,12 +96,12 @@ ARM_FUNC void GX_SetBankForBG(s32 bg){ default: break; } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC void GX_SetBankForOBJ(s32 obj){ - gUnk021D33C4.var00 = (u16)(~obj & (gUnk021D33C4.var00 | gUnk021D33C4.var04)); - gUnk021D33C4.var04 = obj; + UNK_021D33C4.var00 = (u16)(~obj & (UNK_021D33C4.var00 | UNK_021D33C4.var04)); + UNK_021D33C4.var04 = obj; switch (obj) { case 3: @@ -135,12 +135,12 @@ ARM_FUNC void GX_SetBankForOBJ(s32 obj){ default: break; } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC void GX_SetBankForBGExtPltt(s32 bgextpltt){ - gUnk021D33C4.var00 = (u16)(~bgextpltt & (gUnk021D33C4.var00 | gUnk021D33C4.var0E)); - gUnk021D33C4.var0E = bgextpltt; + UNK_021D33C4.var00 = (u16)(~bgextpltt & (UNK_021D33C4.var00 | UNK_021D33C4.var0E)); + UNK_021D33C4.var0E = bgextpltt; switch (bgextpltt) { case 0x10: @@ -161,12 +161,12 @@ ARM_FUNC void GX_SetBankForBGExtPltt(s32 bgextpltt){ SETREG32(HW_REG_DISPCNT, READREG32(HW_REG_DISPCNT) & ~0x40000000); break; } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC void GX_SetBankForOBJExtPltt(s32 objextpltt){ - gUnk021D33C4.var00 = (u16)(~objextpltt & (gUnk021D33C4.var00 | gUnk021D33C4.var10)); - gUnk021D33C4.var10 = objextpltt; + UNK_021D33C4.var00 = (u16)(~objextpltt & (UNK_021D33C4.var00 | UNK_021D33C4.var10)); + UNK_021D33C4.var10 = objextpltt; switch (objextpltt) { case 32: @@ -181,12 +181,12 @@ ARM_FUNC void GX_SetBankForOBJExtPltt(s32 objextpltt){ SETREG32(HW_REG_DISPCNT, READREG32(HW_REG_DISPCNT) & ~0x80000000); break; } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC void GX_SetBankForTex(s32 tex){ - gUnk021D33C4.var00 = (u16)(~tex & (gUnk021D33C4.var00 | gUnk021D33C4.var08)); - gUnk021D33C4.var08 = tex; + UNK_021D33C4.var00 = (u16)(~tex & (UNK_021D33C4.var00 | UNK_021D33C4.var08)); + UNK_021D33C4.var08 = tex; if (tex == 0) { SETREG16(HW_REG_DISP3DCNT, READREG16(HW_REG_DISP3DCNT) & 0x0000CFFE); @@ -244,12 +244,12 @@ ARM_FUNC void GX_SetBankForTex(s32 tex){ break; } } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC void GX_SetBankForTexPltt(s32 texpltt){ - gUnk021D33C4.var00 = (u16)(~texpltt & (gUnk021D33C4.var00 | gUnk021D33C4.var0A)); - gUnk021D33C4.var0A = texpltt; + UNK_021D33C4.var00 = (u16)(~texpltt & (UNK_021D33C4.var00 | UNK_021D33C4.var0A)); + UNK_021D33C4.var0A = texpltt; switch (texpltt) { case 0: //needed to match @@ -270,12 +270,12 @@ ARM_FUNC void GX_SetBankForTexPltt(s32 texpltt){ SETREG8(HW_REG_VRAMCNT_G, 0x83); break; } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC void GX_SetBankForClearImage(s32 clearimage){ - gUnk021D33C4.var00 = (u16)(~clearimage & (gUnk021D33C4.var00 | gUnk021D33C4.var0C)); - gUnk021D33C4.var0C = clearimage; + UNK_021D33C4.var00 = (u16)(~clearimage & (UNK_021D33C4.var00 | UNK_021D33C4.var0C)); + UNK_021D33C4.var0C = clearimage; switch (clearimage) { case 3: @@ -301,12 +301,12 @@ ARM_FUNC void GX_SetBankForClearImage(s32 clearimage){ SETREG8(HW_REG_VRAMCNT_C, 0x9B); SETREG16(HW_REG_DISP3DCNT, READREG16(HW_REG_DISP3DCNT) | 0x4000); } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC void GX_SetBankForARM7(s32 arm7){ - gUnk021D33C4.var00 = (u16)(~arm7 & (gUnk021D33C4.var00 | gUnk021D33C4.var06)); - gUnk021D33C4.var06 = arm7; + UNK_021D33C4.var00 = (u16)(~arm7 & (UNK_021D33C4.var00 | UNK_021D33C4.var06)); + UNK_021D33C4.var06 = arm7; switch (arm7) { case 0: //needed to match @@ -321,17 +321,17 @@ ARM_FUNC void GX_SetBankForARM7(s32 arm7){ case 8: SETREG8(HW_REG_VRAMCNT_D, 0x82); } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC void GX_SetBankForLCDC(s32 lcdc){ - gUnk021D33C4.var00 |= lcdc; + UNK_021D33C4.var00 |= lcdc; GX_VRAMCNT_SetLCDC_(lcdc); } ARM_FUNC void GX_SetBankForSubBG(s32 subbg){ - gUnk021D33C4.var00 = (u16)(~subbg & (gUnk021D33C4.var00 | gUnk021D33C4.var12)); - gUnk021D33C4.var12 = subbg; + UNK_021D33C4.var00 = (u16)(~subbg & (UNK_021D33C4.var00 | UNK_021D33C4.var12)); + UNK_021D33C4.var12 = subbg; switch (subbg) { case 0: //needed to match @@ -344,13 +344,13 @@ ARM_FUNC void GX_SetBankForSubBG(s32 subbg){ case 128: SETREG8(HW_REG_VRAMCNT_H, 0x81); } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC void GX_SetBankForSubOBJ(s32 subobj){ - gUnk021D33C4.var00 = (u16)(~subobj & (gUnk021D33C4.var00 | gUnk021D33C4.var14)); - gUnk021D33C4.var14 = subobj; + UNK_021D33C4.var00 = (u16)(~subobj & (UNK_021D33C4.var00 | UNK_021D33C4.var14)); + UNK_021D33C4.var14 = subobj; switch (subobj) { case 8: @@ -362,12 +362,12 @@ ARM_FUNC void GX_SetBankForSubOBJ(s32 subobj){ case 0: //needed to match break; } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC void GX_SetBankForSubBGExtPltt(s32 subbgextpltt){ - gUnk021D33C4.var00 = (u16)(~subbgextpltt & (gUnk021D33C4.var00 | gUnk021D33C4.var16)); - gUnk021D33C4.var16 = subbgextpltt; + UNK_021D33C4.var00 = (u16)(~subbgextpltt & (UNK_021D33C4.var00 | UNK_021D33C4.var16)); + UNK_021D33C4.var16 = subbgextpltt; switch (subbgextpltt) { case 128: @@ -378,12 +378,12 @@ ARM_FUNC void GX_SetBankForSubBGExtPltt(s32 subbgextpltt){ SETREG32(HW_REG_DISPCNT_2D, READREG32(HW_REG_DISPCNT_2D) & ~0x40000000); break; } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC void GX_SetBankForSubOBJExtPltt(s32 subobjextpltt){ - gUnk021D33C4.var00 = (u16)(~subobjextpltt & (gUnk021D33C4.var00 | gUnk021D33C4.var18)); - gUnk021D33C4.var18 = subobjextpltt; + UNK_021D33C4.var00 = (u16)(~subobjextpltt & (UNK_021D33C4.var00 | UNK_021D33C4.var18)); + UNK_021D33C4.var18 = subobjextpltt; switch (subobjextpltt) { case 256: @@ -394,63 +394,63 @@ ARM_FUNC void GX_SetBankForSubOBJExtPltt(s32 subobjextpltt){ SETREG32(HW_REG_DISPCNT_2D, READREG32(HW_REG_DISPCNT_2D) & ~0x80000000); break; } - GX_VRAMCNT_SetLCDC_(gUnk021D33C4.var00); + GX_VRAMCNT_SetLCDC_(UNK_021D33C4.var00); } ARM_FUNC u32 FUN_020C6130(u16 *ptr){ u16 temp = *ptr; *ptr = 0; - gUnk021D33C4.var00 |= temp; + UNK_021D33C4.var00 |= temp; GX_VRAMCNT_SetLCDC_(temp); return temp; } ARM_FUNC u32 GX_ResetBankForBG(){ - return FUN_020C6130(&gUnk021D33C4.var02); + return FUN_020C6130(&UNK_021D33C4.var02); } ARM_FUNC u32 GX_ResetBankForOBJ(){ - return FUN_020C6130(&gUnk021D33C4.var04); + return FUN_020C6130(&UNK_021D33C4.var04); } ARM_FUNC u32 GX_ResetBankForBGExtPltt(){ SETREG32(HW_REG_DISPCNT, READREG32(HW_REG_DISPCNT) & ~0x40000000); - return FUN_020C6130(&gUnk021D33C4.var0E); + return FUN_020C6130(&UNK_021D33C4.var0E); } ARM_FUNC u32 GX_ResetBankForOBJExtPltt(){ SETREG32(HW_REG_DISPCNT, READREG32(HW_REG_DISPCNT) & ~0x80000000); - return FUN_020C6130(&gUnk021D33C4.var10); + return FUN_020C6130(&UNK_021D33C4.var10); } ARM_FUNC u32 GX_ResetBankForTex(){ - return FUN_020C6130(&gUnk021D33C4.var08); + return FUN_020C6130(&UNK_021D33C4.var08); } ARM_FUNC u32 GX_ResetBankForTexPltt(){ - return FUN_020C6130(&gUnk021D33C4.var0A); + return FUN_020C6130(&UNK_021D33C4.var0A); } ARM_FUNC u32 GX_ResetBankForClearImage(){ - return FUN_020C6130(&gUnk021D33C4.var0C); + return FUN_020C6130(&UNK_021D33C4.var0C); } ARM_FUNC u32 GX_ResetBankForSubBG(){ - return FUN_020C6130(&gUnk021D33C4.var12); + return FUN_020C6130(&UNK_021D33C4.var12); } ARM_FUNC u32 FUN_020C605C(){ - return FUN_020C6130(&gUnk021D33C4.var14); + return FUN_020C6130(&UNK_021D33C4.var14); } ARM_FUNC u32 FUN_020C6034(){ SETREG32(HW_REG_DISPCNT_2D, READREG32(HW_REG_DISPCNT_2D) & ~0x40000000); - return FUN_020C6130(&gUnk021D33C4.var16); + return FUN_020C6130(&UNK_021D33C4.var16); } ARM_FUNC u32 GX_ResetBankForSubOBJ(){ SETREG32(HW_REG_DISPCNT_2D, READREG32(HW_REG_DISPCNT_2D) & ~0x80000000); - return FUN_020C6130(&gUnk021D33C4.var18); + return FUN_020C6130(&UNK_021D33C4.var18); } ARM_FUNC u32 FUN_020C5F28(u16 *ptr){ @@ -474,106 +474,106 @@ ARM_FUNC u32 FUN_020C5F28(u16 *ptr){ SETREG8(HW_REG_VRAMCNT_H, 0x0); if (temp & (0x1 << 8)) SETREG8(HW_REG_VRAMCNT_I, 0x0); - OSi_UnlockVram((u16)temp, gUnk021D33BC); + OSi_UnlockVram((u16)temp, UNK_021D33BC); return temp; } ARM_FUNC u32 disableBankForX_(){ - return FUN_020C5F28(&gUnk021D33C4.var02); + return FUN_020C5F28(&UNK_021D33C4.var02); } ARM_FUNC u32 GX_DisableBankForOBJExtPltt_2(){ - return FUN_020C5F28(&gUnk021D33C4.var04); + return FUN_020C5F28(&UNK_021D33C4.var04); } ARM_FUNC u32 GX_DisableBankForBGExtPltt(){ SETREG32(HW_REG_DISPCNT, READREG32(HW_REG_DISPCNT) & ~0x40000000); - return FUN_020C5F28(&gUnk021D33C4.var0E); + return FUN_020C5F28(&UNK_021D33C4.var0E); } ARM_FUNC u32 GX_DisableBankForOBJExtPltt(){ SETREG32(HW_REG_DISPCNT, READREG32(HW_REG_DISPCNT) & ~0x80000000); - return FUN_020C5F28(&gUnk021D33C4.var10); + return FUN_020C5F28(&UNK_021D33C4.var10); } ARM_FUNC u32 GX_DisableBankForTexPltt_2(){ - return FUN_020C5F28(&gUnk021D33C4.var08); + return FUN_020C5F28(&UNK_021D33C4.var08); } ARM_FUNC u32 GX_DisableBankForTexPltt(){ - return FUN_020C5F28(&gUnk021D33C4.var0A); + return FUN_020C5F28(&UNK_021D33C4.var0A); } ARM_FUNC u32 GX_DisableBankForClearImage(){ - return FUN_020C5F28(&gUnk021D33C4.var0C); + return FUN_020C5F28(&UNK_021D33C4.var0C); } ARM_FUNC u32 GX_DisableBankForARM7(){ - return FUN_020C5F28(&gUnk021D33C4.var06); + return FUN_020C5F28(&UNK_021D33C4.var06); } ARM_FUNC u32 GX_DisableBankForLCDC(){ - return FUN_020C5F28(&gUnk021D33C4.var00); + return FUN_020C5F28(&UNK_021D33C4.var00); } ARM_FUNC u32 GX_DisableBankForSubBGExtPltt(){ - return FUN_020C5F28(&gUnk021D33C4.var12); + return FUN_020C5F28(&UNK_021D33C4.var12); } ARM_FUNC u32 GX_DisableBankForSubOBJExtPltt_2(){ - return FUN_020C5F28(&gUnk021D33C4.var14); + return FUN_020C5F28(&UNK_021D33C4.var14); } ARM_FUNC u32 FUN_020C5E04(){ SETREG32(HW_REG_DISPCNT_2D, READREG32(HW_REG_DISPCNT_2D) & ~0x40000000); - return FUN_020C5F28(&gUnk021D33C4.var16); + return FUN_020C5F28(&UNK_021D33C4.var16); } ARM_FUNC u32 GX_DisableBankForSubOBJExtPltt(){ SETREG32(HW_REG_DISPCNT_2D, READREG32(HW_REG_DISPCNT_2D) & ~0x80000000); - return FUN_020C5F28(&gUnk021D33C4.var18); + return FUN_020C5F28(&UNK_021D33C4.var18); } ARM_FUNC u32 GX_GetBankForBGExtPltt_2(){ - return gUnk021D33C4.var02; + return UNK_021D33C4.var02; } ARM_FUNC u32 GX_GetBankForOBJ(){ - return gUnk021D33C4.var04; + return UNK_021D33C4.var04; } ARM_FUNC u32 GX_GetBankForBGExtPltt(){ - return gUnk021D33C4.var0E; + return UNK_021D33C4.var0E; } ARM_FUNC u32 GX_GetBankForOBJExtPltt(){ - return gUnk021D33C4.var10; + return UNK_021D33C4.var10; } ARM_FUNC u32 FUN_020C5D8C(){ - return gUnk021D33C4.var08; + return UNK_021D33C4.var08; } ARM_FUNC u32 GX_GetBankForTexPltt(){ - return gUnk021D33C4.var0A; + return UNK_021D33C4.var0A; } ARM_FUNC u32 GX_GetBankForLCDC(){ - return gUnk021D33C4.var00; + return UNK_021D33C4.var00; } ARM_FUNC u32 GX_GetBankForSubBGExtPltt_2(){ - return gUnk021D33C4.var12; + return UNK_021D33C4.var12; } ARM_FUNC u32 GX_GetBankForSubOBJ(){ - return gUnk021D33C4.var14; + return UNK_021D33C4.var14; } ARM_FUNC u32 GX_GetBankForSubBGExtPltt(){ - return gUnk021D33C4.var16; + return UNK_021D33C4.var16; } ARM_FUNC u32 GX_GetBankForSubOBJExtPltt(){ - return gUnk021D33C4.var18; + return UNK_021D33C4.var18; } |