From 7e9089849989d5e930eb5b5f7cecfd8d2c6c379c Mon Sep 17 00:00:00 2001 From: Made Date: Fri, 15 May 2020 03:47:36 +0200 Subject: Decompile GX_g3imm.s and GX_state.s --- arm9/lib/src/GX_state.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 arm9/lib/src/GX_state.c (limited to 'arm9/lib/src/GX_state.c') diff --git a/arm9/lib/src/GX_state.c b/arm9/lib/src/GX_state.c new file mode 100644 index 00000000..52d3c6f5 --- /dev/null +++ b/arm9/lib/src/GX_state.c @@ -0,0 +1,26 @@ +#include "global.h" +#include "main.h" +#include "gx.h" + +extern struct VRAM_banks gUnk021D33C4; + +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; + SETREG32(HW_REG_VRAMCNT_A, 0x0); + SETREG8(HW_REG_VRAMCNT_E, 0x0); + SETREG8(HW_REG_VRAMCNT_F, 0x0); + SETREG8(HW_REG_VRAMCNT_G, 0x0); + SETREG16(HW_REG_VRAMCNT_H, 0x0); +} -- 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_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arm9/lib/src/GX_state.c') diff --git a/arm9/lib/src/GX_state.c b/arm9/lib/src/GX_state.c index 52d3c6f5..38968523 100644 --- a/arm9/lib/src/GX_state.c +++ b/arm9/lib/src/GX_state.c @@ -4,7 +4,7 @@ extern struct VRAM_banks gUnk021D33C4; -void GX_InitGXState(){ +ARM_FUNC void GX_InitGXState(){ gUnk021D33C4.var00 = 0x0; gUnk021D33C4.var02 = 0x0; gUnk021D33C4.var04 = 0x0; -- 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_state.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'arm9/lib/src/GX_state.c') 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); -- cgit v1.2.3 From 929c523340dfecbd0e3313e25d36abe47e1cc63e Mon Sep 17 00:00:00 2001 From: Made Date: Fri, 15 May 2020 06:46:25 +0200 Subject: Replace register access macros with variables --- arm9/lib/src/GX_state.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'arm9/lib/src/GX_state.c') diff --git a/arm9/lib/src/GX_state.c b/arm9/lib/src/GX_state.c index 79a53ee7..7da3e1b4 100644 --- a/arm9/lib/src/GX_state.c +++ b/arm9/lib/src/GX_state.c @@ -18,9 +18,9 @@ ARM_FUNC void GX_InitGXState(){ 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); - SETREG8(HW_REG_VRAMCNT_G, 0x0); - SETREG16(HW_REG_VRAMCNT_H, 0x0); + reg_GX_VRAMCNT = 0x0; + reg_GX_VRAMCNT_E = 0x0; + reg_GX_VRAMCNT_F = 0x0; + reg_GX_VRAMCNT_G = 0x0; + reg_GX_VRAM_HI_CNT = 0x0; } -- cgit v1.2.3 From 2e1c3ccd3ff3035acc98b34c2b29ba5c865e6194 Mon Sep 17 00:00:00 2001 From: Made Date: Sun, 17 May 2020 01:40:01 +0200 Subject: struct defs --- arm9/lib/src/GX_state.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'arm9/lib/src/GX_state.c') diff --git a/arm9/lib/src/GX_state.c b/arm9/lib/src/GX_state.c index 7da3e1b4..db313c31 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 UNK_021D33C4; +extern struct GX_State gGXState; ARM_FUNC void GX_InitGXState(){ - 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; + gGXState.lcdc = 0x0; + gGXState.bg = 0x0; + gGXState.obj = 0x0; + gGXState.arm7 = 0x0; + gGXState.tex = 0x0; + gGXState.texPltt = 0x0; + gGXState.clrImg = 0x0; + gGXState.bgExtPltt = 0x0; + gGXState.objExtPltt = 0x0; + gGXState.sub_bg = 0x0; + gGXState.sub_obj = 0x0; + gGXState.sub_bgExtPltt = 0x0; + gGXState.sub_objExtPltt = 0x0; reg_GX_VRAMCNT = 0x0; reg_GX_VRAMCNT_E = 0x0; reg_GX_VRAMCNT_F = 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_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arm9/lib/src/GX_state.c') diff --git a/arm9/lib/src/GX_state.c b/arm9/lib/src/GX_state.c index db313c31..3ca3b266 100644 --- a/arm9/lib/src/GX_state.c +++ b/arm9/lib/src/GX_state.c @@ -1,6 +1,6 @@ #include "global.h" #include "main.h" -#include "gx.h" +#include "GX.h" extern struct GX_State gGXState; -- cgit v1.2.3