split GXAttr, GXFifo, GXFrameBuf, GXGeometry, GXInit, GXLight, and GXMisc

1 files changed, 71 insertions, 71 deletions

diff --git a/asm/text_7.s b/asm/text_7.s
index 55e5957..fd85ba1 100644
--- a/asm/text_7.s
+++ b/asm/text_7.s
@@ -16839,13 +16839,13 @@ lbl_80230F44:
 /* 80230F60 0022CBC0  48 00 8E F9 */	bl func_80239E58
 /* 80230F64 0022CBC4  3C 60 80 23 */	lis r3, func_80232394@ha
 /* 80230F68 0022CBC8  38 63 23 94 */	addi r3, r3, func_80232394@l
-/* 80230F6C 0022CBCC  48 04 FE 3D */	bl func_80280DA8
+/* 80230F6C 0022CBCC  48 04 FE 3D */	bl GXSetDrawDoneCallback
 /* 80230F70 0022CBD0  3C 60 80 23 */	lis r3, lbl_8023234C@ha
 /* 80230F74 0022CBD4  38 63 23 4C */	addi r3, r3, lbl_8023234C@l
-/* 80230F78 0022CBD8  48 04 E1 D5 */	bl func_8027F14C
+/* 80230F78 0022CBD8  48 04 E1 D5 */	bl GXSetBreakPtCallback
 /* 80230F7C 0022CBDC  38 60 00 01 */	li r3, 1
 /* 80230F80 0022CBE0  38 80 00 08 */	li r4, 8
-/* 80230F84 0022CBE4  48 04 F6 95 */	bl func_80280618
+/* 80230F84 0022CBE4  48 04 F6 95 */	bl GXSetMisc
 /* 80230F88 0022CBE8  7F C3 F3 78 */	mr r3, r30
 /* 80230F8C 0022CBEC  48 00 A7 79 */	bl func_8023B704
 /* 80230F90 0022CBF0  7F C3 F3 78 */	mr r3, r30
@@ -16894,11 +16894,11 @@ lbl_80230F44:
 /* 8023103C 0022CC9C  38 84 45 BC */	addi r4, r4, lbl_804245BC@l
 /* 80231040 0022CCA0  90 83 00 D8 */	stw r4, 0xd8(r3)
 /* 80231044 0022CCA4  38 60 00 00 */	li r3, 0
-/* 80231048 0022CCA8  48 04 FD 61 */	bl func_80280DA8
+/* 80231048 0022CCA8  48 04 FD 61 */	bl GXSetDrawDoneCallback
 /* 8023104C 0022CCAC  38 60 00 00 */	li r3, 0
-/* 80231050 0022CCB0  48 04 FC 91 */	bl func_80280CE0
+/* 80231050 0022CCB0  48 04 FC 91 */	bl GXSetDrawSyncCallback
 /* 80231054 0022CCB4  38 60 00 00 */	li r3, 0
-/* 80231058 0022CCB8  48 04 E0 F5 */	bl func_8027F14C
+/* 80231058 0022CCB8  48 04 E0 F5 */	bl GXSetBreakPtCallback
 /* 8023105C 0022CCBC  7F C3 F3 78 */	mr r3, r30
 /* 80231060 0022CCC0  48 00 17 11 */	bl func_80232770
 /* 80231064 0022CCC4  80 7E 16 E8 */	lwz r3, 0x16e8(r30)
@@ -16953,11 +16953,11 @@ lbl_802310FC:
 /* 80231110 0022CD70  38 C0 00 00 */	li r6, 0
 /* 80231114 0022CD74  48 04 15 35 */	bl OSSetIdleFunction
 /* 80231118 0022CD78  38 60 00 00 */	li r3, 0
-/* 8023111C 0022CD7C  48 04 FC 8D */	bl func_80280DA8
+/* 8023111C 0022CD7C  48 04 FC 8D */	bl GXSetDrawDoneCallback
 /* 80231120 0022CD80  38 60 00 00 */	li r3, 0
-/* 80231124 0022CD84  48 04 FB BD */	bl func_80280CE0
+/* 80231124 0022CD84  48 04 FB BD */	bl GXSetDrawSyncCallback
 /* 80231128 0022CD88  38 60 00 00 */	li r3, 0
-/* 8023112C 0022CD8C  48 04 E0 21 */	bl func_8027F14C
+/* 8023112C 0022CD8C  48 04 E0 21 */	bl GXSetBreakPtCallback
 /* 80231130 0022CD90  38 60 00 00 */	li r3, 0
 /* 80231134 0022CD94  48 05 1C BD */	bl func_80282DF0
 /* 80231138 0022CD98  38 60 00 00 */	li r3, 0
@@ -16966,7 +16966,7 @@ lbl_802310FC:
 /* 80231144 0022CDA4  48 04 6C F9 */	bl VISetPreRetraceCallback
 /* 80231148 0022CDA8  38 60 00 00 */	li r3, 0
 /* 8023114C 0022CDAC  48 04 6D 35 */	bl VISetPostRetraceCallback
-/* 80231150 0022CDB0  48 04 F7 49 */	bl func_80280898
+/* 80231150 0022CDB0  48 04 F7 49 */	bl GXAbortFrame
 /* 80231154 0022CDB4  80 7E 16 C4 */	lwz r3, 0x16c4(r30)
 /* 80231158 0022CDB8  2C 03 00 00 */	cmpwi r3, 0
 /* 8023115C 0022CDBC  41 82 00 1C */	beq lbl_80231178
@@ -17013,7 +17013,7 @@ func_802311BC:
 /* 802311E4 0022CE44  7C 64 1B 78 */	mr r4, r3
 /* 802311E8 0022CE48  7C 66 1B 78 */	mr r6, r3
 /* 802311EC 0022CE4C  7C 67 1B 78 */	mr r7, r3
-/* 802311F0 0022CE50  48 04 DE 59 */	bl func_8027F048
+/* 802311F0 0022CE50  48 04 DE 59 */	bl GXGetGPStatus
 /* 802311F4 0022CE54  88 01 00 09 */	lbz r0, 9(r1)
 /* 802311F8 0022CE58  28 00 00 01 */	cmplwi r0, 1
 /* 802311FC 0022CE5C  41 82 00 48 */	beq lbl_80231244
@@ -17058,7 +17058,7 @@ func_80231260:
 /* 80231274 0022CED4  93 A1 00 14 */	stw r29, 0x14(r1)
 /* 80231278 0022CED8  7C 7D 1B 78 */	mr r29, r3
 /* 8023127C 0022CEDC  48 00 A4 35 */	bl func_8023B6B0
-/* 80231280 0022CEE0  48 04 F6 19 */	bl func_80280898
+/* 80231280 0022CEE0  48 04 F6 19 */	bl GXAbortFrame
 /* 80231284 0022CEE4  48 00 11 11 */	bl func_80232394
 /* 80231288 0022CEE8  48 04 15 31 */	bl OSGetTime
 /* 8023128C 0022CEEC  80 BD 00 9C */	lwz r5, 0x9c(r29)
@@ -18212,7 +18212,7 @@ lbl_8023234C:
 /* 80232368 0022DFC8  8B E3 16 F9 */	lbz r31, 0x16f9(r3)
 /* 8023236C 0022DFCC  38 00 00 00 */	li r0, 0
 /* 80232370 0022DFD0  98 03 16 F9 */	stb r0, 0x16f9(r3)
-/* 80232374 0022DFD4  48 04 CE 1D */	bl func_8027F190
+/* 80232374 0022DFD4  48 04 CE 1D */	bl GXDisableBreakPt
 /* 80232378 0022DFD8  80 6D A3 D8 */	lwz r3, lbl_8063F698-_SDA_BASE_(r13)
 /* 8023237C 0022DFDC  9B E3 16 F9 */	stb r31, 0x16f9(r3)
 lbl_80232380:
@@ -18275,7 +18275,7 @@ func_80232404:
 /* 8023243C 0022E09C  7F A3 EB 78 */	mr r3, r29
 /* 80232440 0022E0A0  48 00 95 09 */	bl func_8023B948
 /* 80232444 0022E0A4  90 7F 00 08 */	stw r3, 8(r31)
-/* 80232448 0022E0A8  48 04 E6 C5 */	bl func_80280B0C
+/* 80232448 0022E0A8  48 04 E6 C5 */	bl GXSetDrawDone
 /* 8023244C 0022E0AC  80 7F 00 08 */	lwz r3, 8(r31)
 /* 80232450 0022E0B0  83 E1 00 1C */	lwz r31, 0x1c(r1)
 /* 80232454 0022E0B4  83 C1 00 18 */	lwz r30, 0x18(r1)
@@ -18392,7 +18392,7 @@ func_8023255C:
 /* 802325D0 0022E230  93 9E 16 C4 */	stw r28, 0x16c4(r30)
 /* 802325D4 0022E234  93 9E 16 C8 */	stw r28, 0x16c8(r30)
 /* 802325D8 0022E238  93 9E 16 CC */	stw r28, 0x16cc(r30)
-/* 802325DC 0022E23C  48 04 B3 FD */	bl func_8027D9D8
+/* 802325DC 0022E23C  48 04 B3 FD */	bl GXInit
 /* 802325E0 0022E240  90 7E 16 BC */	stw r3, 0x16bc(r30)
 /* 802325E4 0022E244  57 FD 20 36 */	slwi r29, r31, 4
 /* 802325E8 0022E248  7F A3 EB 78 */	mr r3, r29
@@ -18506,9 +18506,9 @@ func_80232770:
 /* 8023277C 0022E3DC  93 E1 00 0C */	stw r31, 0xc(r1)
 /* 80232780 0022E3E0  7C 7F 1B 78 */	mr r31, r3
 /* 80232784 0022E3E4  38 60 00 00 */	li r3, 0
-/* 80232788 0022E3E8  48 04 C3 49 */	bl func_8027EAD0
+/* 80232788 0022E3E8  48 04 C3 49 */	bl GXSetCPUFifo
 /* 8023278C 0022E3EC  38 60 00 00 */	li r3, 0
-/* 80232790 0022E3F0  48 04 C5 21 */	bl func_8027ECB0
+/* 80232790 0022E3F0  48 04 C5 21 */	bl GXSetGPFifo
 /* 80232794 0022E3F4  80 7F 16 E4 */	lwz r3, 0x16e4(r31)
 /* 80232798 0022E3F8  2C 03 00 00 */	cmpwi r3, 0
 /* 8023279C 0022E3FC  41 82 00 08 */	beq lbl_802327A4
@@ -18861,7 +18861,7 @@ func_80232BF0:
 /* 80232C6C 0022E8CC  80 7C 00 04 */	lwz r3, 4(r28)
 /* 80232C70 0022E8D0  80 9C 00 08 */	lwz r4, 8(r28)
 /* 80232C74 0022E8D4  48 05 39 C9 */	bl func_8028663C
-/* 80232C78 0022E8D8  48 04 DA 89 */	bl func_80280700
+/* 80232C78 0022E8D8  48 04 DA 89 */	bl GXResetWriteGatherPipe
 /* 80232C7C 0022E8DC  A0 7C 00 00 */	lhz r3, 0(r28)
 /* 80232C80 0022E8E0  38 00 00 01 */	li r0, 1
 /* 80232C84 0022E8E4  60 63 00 09 */	ori r3, r3, 9
@@ -19486,7 +19486,7 @@ func_8023352C:
 /* 80233550 0022F1B0  7F E5 FB 78 */	mr r5, r31
 /* 80233554 0022F1B4  80 7E 17 38 */	lwz r3, 0x1738(r30)
 /* 80233558 0022F1B8  80 84 00 04 */	lwz r4, 4(r4)
-/* 8023355C 0022F1BC  48 04 DB ED */	bl func_80281148
+/* 8023355C 0022F1BC  48 04 DB ED */	bl GXBegin
 /* 80233560 0022F1C0  38 00 00 01 */	li r0, 1
 /* 80233564 0022F1C4  98 1E 16 FA */	stb r0, 0x16fa(r30)
 /* 80233568 0022F1C8  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -21683,7 +21683,7 @@ func_80235474:
 /* 802354D8 00231138  38 7F 00 3C */	addi r3, r31, 0x3c
 /* 802354DC 0023113C  FC 40 08 90 */	fmr f2, f1
 /* 802354E0 00231140  FC 60 08 90 */	fmr f3, f1
-/* 802354E4 00231144  48 04 CC C9 */	bl nlVector3_Set
+/* 802354E4 00231144  48 04 CC C9 */	bl GXInitLightPos
 /* 802354E8 00231148  38 80 00 00 */	li r4, 0
 /* 802354EC 0023114C  38 60 00 02 */	li r3, 2
 /* 802354F0 00231150  38 00 00 01 */	li r0, 1
@@ -21940,7 +21940,7 @@ lbl_80235860:
 /* 8023587C 002314DC  C0 9E 00 24 */	lfs f4, 0x24(r30)
 /* 80235880 002314E0  C0 BE 00 28 */	lfs f5, 0x28(r30)
 /* 80235884 002314E4  C0 DE 00 2C */	lfs f6, 0x2c(r30)
-/* 80235888 002314E8  48 04 CA 5D */	bl func_802822E4
+/* 80235888 002314E8  48 04 CA 5D */	bl GXInitSpecularDirHA
 /* 8023588C 002314EC  48 00 00 20 */	b lbl_802358AC
 lbl_80235890:
 /* 80235890 002314F0  54 60 07 7B */	rlwinm. r0, r3, 0, 0x1d, 0x1d
@@ -21949,7 +21949,7 @@ lbl_80235890:
 /* 8023589C 002314FC  38 7E 00 3C */	addi r3, r30, 0x3c
 /* 802358A0 00231500  C0 41 00 10 */	lfs f2, 0x10(r1)
 /* 802358A4 00231504  C0 61 00 14 */	lfs f3, 0x14(r1)
-/* 802358A8 00231508  48 04 C9 31 */	bl func_802821D8
+/* 802358A8 00231508  48 04 C9 31 */	bl GXInitSpecularDir
 lbl_802358AC:
 /* 802358AC 0023150C  88 7E 00 01 */	lbz r3, 1(r30)
 /* 802358B0 00231510  54 60 06 31 */	rlwinm. r0, r3, 0, 0x18, 0x18
@@ -21985,7 +21985,7 @@ lbl_80235910:
 /* 80235920 00231580  38 7E 00 3C */	addi r3, r30, 0x3c
 /* 80235924 00231584  C0 41 00 1C */	lfs f2, 0x1c(r1)
 /* 80235928 00231588  C0 61 00 20 */	lfs f3, 0x20(r1)
-/* 8023592C 0023158C  48 04 C8 81 */	bl nlVector3_Set
+/* 8023592C 0023158C  48 04 C8 81 */	bl GXInitLightPos
 lbl_80235930:
 /* 80235930 00231590  88 1E 00 01 */	lbz r0, 1(r30)
 /* 80235934 00231594  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
@@ -21994,7 +21994,7 @@ lbl_80235930:
 /* 80235940 002315A0  38 7E 00 3C */	addi r3, r30, 0x3c
 /* 80235944 002315A4  C0 41 00 10 */	lfs f2, 0x10(r1)
 /* 80235948 002315A8  C0 61 00 14 */	lfs f3, 0x14(r1)
-/* 8023594C 002315AC  48 04 C8 71 */	bl func_802821BC
+/* 8023594C 002315AC  48 04 C8 71 */	bl GXInitLightDir
 lbl_80235950:
 /* 80235950 002315B0  88 7E 00 01 */	lbz r3, 1(r30)
 /* 80235954 002315B4  54 60 07 39 */	rlwinm. r0, r3, 0, 0x1c, 0x1c
@@ -22015,7 +22015,7 @@ lbl_80235980:
 /* 8023598C 002315EC  38 7E 00 3C */	addi r3, r30, 0x3c
 /* 80235990 002315F0  C0 5E 00 2C */	lfs f2, 0x2c(r30)
 /* 80235994 002315F4  80 9E 00 24 */	lwz r4, 0x24(r30)
-/* 80235998 002315F8  48 04 C7 45 */	bl func_802820DC
+/* 80235998 002315F8  48 04 C7 45 */	bl GXInitLightDistAttn
 lbl_8023599C:
 /* 8023599C 002315FC  88 1E 00 01 */	lbz r0, 1(r30)
 /* 802359A0 00231600  54 00 06 B5 */	rlwinm. r0, r0, 0, 0x1a, 0x1a
@@ -22023,7 +22023,7 @@ lbl_8023599C:
 /* 802359A8 00231608  C0 3E 00 34 */	lfs f1, 0x34(r30)
 /* 802359AC 0023160C  38 7E 00 3C */	addi r3, r30, 0x3c
 /* 802359B0 00231610  80 9E 00 30 */	lwz r4, 0x30(r30)
-/* 802359B4 00231614  48 04 C5 A1 */	bl func_80281F54
+/* 802359B4 00231614  48 04 C5 A1 */	bl GXInitLightSpot
 /* 802359B8 00231618  48 00 00 60 */	b lbl_80235A18
 lbl_802359BC:
 /* 802359BC 0023161C  88 1E 00 01 */	lbz r0, 1(r30)
@@ -22033,7 +22033,7 @@ lbl_802359BC:
 /* 802359CC 0023162C  38 7E 00 3C */	addi r3, r30, 0x3c
 /* 802359D0 00231630  C0 41 00 1C */	lfs f2, 0x1c(r1)
 /* 802359D4 00231634  C0 61 00 20 */	lfs f3, 0x20(r1)
-/* 802359D8 00231638  48 04 C7 D5 */	bl nlVector3_Set
+/* 802359D8 00231638  48 04 C7 D5 */	bl GXInitLightPos
 lbl_802359DC:
 /* 802359DC 0023163C  88 1E 00 01 */	lbz r0, 1(r30)
 /* 802359E0 00231640  54 00 06 F7 */	rlwinm. r0, r0, 0, 0x1b, 0x1b
@@ -22042,7 +22042,7 @@ lbl_802359DC:
 /* 802359EC 0023164C  38 7E 00 3C */	addi r3, r30, 0x3c
 /* 802359F0 00231650  C0 5E 00 2C */	lfs f2, 0x2c(r30)
 /* 802359F4 00231654  80 9E 00 24 */	lwz r4, 0x24(r30)
-/* 802359F8 00231658  48 04 C6 E5 */	bl func_802820DC
+/* 802359F8 00231658  48 04 C6 E5 */	bl GXInitLightDistAttn
 lbl_802359FC:
 /* 802359FC 0023165C  88 1E 00 01 */	lbz r0, 1(r30)
 /* 80235A00 00231660  54 00 06 B5 */	rlwinm. r0, r0, 0, 0x1a, 0x1a
@@ -22050,7 +22050,7 @@ lbl_802359FC:
 /* 80235A08 00231668  C0 3E 00 34 */	lfs f1, 0x34(r30)
 /* 80235A0C 0023166C  38 7E 00 3C */	addi r3, r30, 0x3c
 /* 80235A10 00231670  80 9E 00 30 */	lwz r4, 0x30(r30)
-/* 80235A14 00231674  48 04 C5 41 */	bl func_80281F54
+/* 80235A14 00231674  48 04 C5 41 */	bl GXInitLightSpot
 lbl_80235A18:
 /* 80235A18 00231678  38 60 00 00 */	li r3, 0
 /* 80235A1C 0023167C  38 00 00 01 */	li r0, 1
@@ -22058,7 +22058,7 @@ lbl_80235A18:
 /* 80235A24 00231684  38 7E 00 3C */	addi r3, r30, 0x3c
 /* 80235A28 00231688  7C 04 F8 30 */	slw r4, r0, r31
 /* 80235A2C 0023168C  9B FE 00 7C */	stb r31, 0x7c(r30)
-/* 80235A30 00231690  48 04 C8 ED */	bl func_8028231C
+/* 80235A30 00231690  48 04 C8 ED */	bl GXLoadLightObjImm
 /* 80235A34 00231694  80 01 00 44 */	lwz r0, 0x44(r1)
 /* 80235A38 00231698  83 E1 00 3C */	lwz r31, 0x3c(r1)
 /* 80235A3C 0023169C  83 C1 00 38 */	lwz r30, 0x38(r1)
@@ -24866,9 +24866,9 @@ func_80238198:
 /* 802381B0 00233E10  7C 7E 1B 78 */	mr r30, r3
 /* 802381B4 00233E14  93 A1 00 14 */	stw r29, 0x14(r1)
 /* 802381B8 00233E18  93 81 00 10 */	stw r28, 0x10(r1)
-/* 802381BC 00233E1C  48 04 7A C9 */	bl func_8027FC84
+/* 802381BC 00233E1C  48 04 7A C9 */	bl GXClearVtxDesc
 /* 802381C0 00233E20  38 7F 01 B8 */	addi r3, r31, 0x1b8
-/* 802381C4 00233E24  48 04 74 95 */	bl func_8027F658
+/* 802381C4 00233E24  48 04 74 95 */	bl GXSetVtxDescv
 /* 802381C8 00233E28  80 7E 16 38 */	lwz r3, 0x1638(r30)
 /* 802381CC 00233E2C  80 03 15 04 */	lwz r0, 0x1504(r3)
 /* 802381D0 00233E30  7C 00 F8 40 */	cmplw r0, r31
@@ -24883,7 +24883,7 @@ lbl_802381E8:
 lbl_802381F0:
 /* 802381F0 00233E50  80 9C 00 04 */	lwz r4, 4(r28)
 /* 802381F4 00233E54  88 BC 00 02 */	lbz r5, 2(r28)
-/* 802381F8 00233E58  48 04 81 85 */	bl func_8028037C
+/* 802381F8 00233E58  48 04 81 85 */	bl GXSetArray
 /* 802381FC 00233E5C  A0 1E 16 FE */	lhz r0, 0x16fe(r30)
 /* 80238200 00233E60  3B 9C 00 0C */	addi r28, r28, 0xc
 /* 80238204 00233E64  60 00 00 01 */	ori r0, r0, 1
@@ -24908,7 +24908,7 @@ lbl_80238220:
 /* 80238248 00233EA8  40 82 00 18 */	bne lbl_80238260
 lbl_8023824C:
 /* 8023824C 00233EAC  38 9F 00 08 */	addi r4, r31, 8
-/* 80238250 00233EB0  48 04 7C 09 */	bl func_8027FE58
+/* 80238250 00233EB0  48 04 7C 09 */	bl GXSetVtxAttrFmtv
 /* 80238254 00233EB4  80 1E 16 38 */	lwz r0, 0x1638(r30)
 /* 80238258 00233EB8  7C 60 EA 14 */	add r3, r0, r29
 /* 8023825C 00233EBC  93 E3 14 E4 */	stw r31, 0x14e4(r3)
@@ -25108,7 +25108,7 @@ func_802384BC:
 /* 80238500 00234160  7C 00 F0 40 */	cmplw r0, r30
 /* 80238504 00234164  41 82 00 10 */	beq lbl_80238514
 /* 80238508 00234168  7F C3 F3 78 */	mr r3, r30
-/* 8023850C 0023416C  48 04 80 E9 */	bl func_802805F4
+/* 8023850C 0023416C  48 04 80 E9 */	bl GXSetNumTexGens
 /* 80238510 00234170  9B DF 0A 88 */	stb r30, 0xa88(r31)
 lbl_80238514:
 /* 80238514 00234174  80 7D 16 38 */	lwz r3, 0x1638(r29)
@@ -25158,7 +25158,7 @@ lbl_802385AC:
 /* 802385B8 00234218  80 D9 00 08 */	lwz r6, 8(r25)
 /* 802385BC 0023421C  88 F9 00 0C */	lbz r7, 0xc(r25)
 /* 802385C0 00234220  81 19 00 10 */	lwz r8, 0x10(r25)
-/* 802385C4 00234224  48 04 7E 09 */	bl func_802803CC
+/* 802385C4 00234224  48 04 7E 09 */	bl GXSetTexCoordGen2
 /* 802385C8 00234228  80 19 00 00 */	lwz r0, 0(r25)
 /* 802385CC 0023422C  90 18 00 00 */	stw r0, 0(r24)
 /* 802385D0 00234230  80 19 00 04 */	lwz r0, 4(r25)
@@ -25194,7 +25194,7 @@ lbl_80238610:
 /* 8023863C 0023429C  41 82 00 1C */	beq lbl_80238658
 lbl_80238640:
 /* 80238640 002342A0  80 9F 01 30 */	lwz r4, 0x130(r31)
-/* 80238644 002342A4  48 04 8D 29 */	bl func_8028136C
+/* 80238644 002342A4  48 04 8D 29 */	bl GXSetLineWidth
 /* 80238648 002342A8  88 1F 01 2C */	lbz r0, 0x12c(r31)
 /* 8023864C 002342AC  98 1F 0B 4C */	stb r0, 0xb4c(r31)
 /* 80238650 002342B0  80 1F 01 30 */	lwz r0, 0x130(r31)
@@ -25214,7 +25214,7 @@ lbl_80238658:
 /* 80238684 002342E4  41 82 00 1C */	beq lbl_802386A0
 lbl_80238688:
 /* 80238688 002342E8  80 9F 01 38 */	lwz r4, 0x138(r31)
-/* 8023868C 002342EC  48 04 8D 15 */	bl func_802813A0
+/* 8023868C 002342EC  48 04 8D 15 */	bl GXSetPointSize
 /* 80238690 002342F0  88 1F 01 34 */	lbz r0, 0x134(r31)
 /* 80238694 002342F4  98 1F 0B 54 */	stb r0, 0xb54(r31)
 /* 80238698 002342F8  80 1F 01 38 */	lwz r0, 0x138(r31)
@@ -25244,7 +25244,7 @@ lbl_802386C4:
 lbl_802386F0:
 /* 802386F0 00234350  88 B9 00 01 */	lbz r5, 1(r25)
 /* 802386F4 00234354  7F 03 C3 78 */	mr r3, r24
-/* 802386F8 00234358  48 04 8C DD */	bl func_802813D4
+/* 802386F8 00234358  48 04 8C DD */	bl GXEnableTexOffsets
 /* 802386FC 0023435C  88 19 00 00 */	lbz r0, 0(r25)
 /* 80238700 00234360  98 1A 00 00 */	stb r0, 0(r26)
 /* 80238704 00234364  88 19 00 01 */	lbz r0, 1(r25)
@@ -25296,7 +25296,7 @@ lbl_80238788:
 /* 802387A8 00234408  88 1F 0B A0 */	lbz r0, 0xba0(r31)
 /* 802387AC 0023440C  7C 00 18 40 */	cmplw r0, r3
 /* 802387B0 00234410  41 82 00 10 */	beq lbl_802387C0
-/* 802387B4 00234414  48 04 8C 85 */	bl func_80281438
+/* 802387B4 00234414  48 04 8C 85 */	bl GXSetCoPlanar
 /* 802387B8 00234418  88 1F 01 80 */	lbz r0, 0x180(r31)
 /* 802387BC 0023441C  98 1F 0B A0 */	stb r0, 0xba0(r31)
 lbl_802387C0:
@@ -25308,7 +25308,7 @@ lbl_802387C0:
 /* 802387D4 00234434  80 7F 01 84 */	lwz r3, 0x184(r31)
 /* 802387D8 00234438  7C 00 18 00 */	cmpw r0, r3
 /* 802387DC 0023443C  41 82 00 10 */	beq lbl_802387EC
-/* 802387E0 00234440  48 04 8C 31 */	bl func_80281410
+/* 802387E0 00234440  48 04 8C 31 */	bl GXSetCullMode
 /* 802387E4 00234444  80 1F 01 84 */	lwz r0, 0x184(r31)
 /* 802387E8 00234448  90 1F 0B A4 */	stw r0, 0xba4(r31)
 lbl_802387EC:
@@ -25437,7 +25437,7 @@ lbl_80238998:
 /* 802389BC 0023461C  7C 00 C0 40 */	cmplw r0, r24
 /* 802389C0 00234620  41 82 00 10 */	beq lbl_802389D0
 /* 802389C4 00234624  7F 03 C3 78 */	mr r3, r24
-/* 802389C8 00234628  48 04 9B 81 */	bl func_80282548
+/* 802389C8 00234628  48 04 9B 81 */	bl GXSetNumChans
 /* 802389CC 0023462C  9B 1F 0B AC */	stb r24, 0xbac(r31)
 lbl_802389D0:
 /* 802389D0 00234630  80 7D 16 38 */	lwz r3, 0x1638(r29)
@@ -25524,7 +25524,7 @@ lbl_80238AE0:
 /* 80238AF0 00234750  80 FB 00 0C */	lwz r7, 0xc(r27)
 /* 80238AF4 00234754  81 1B 00 10 */	lwz r8, 0x10(r27)
 /* 80238AF8 00234758  81 3B 00 14 */	lwz r9, 0x14(r27)
-/* 80238AFC 0023475C  48 04 9A 71 */	bl func_8028256C
+/* 80238AFC 0023475C  48 04 9A 71 */	bl GXSetChanCtrl
 /* 80238B00 00234760  9A D7 00 00 */	stb r22, 0(r23)
 /* 80238B04 00234764  80 1B 00 04 */	lwz r0, 4(r27)
 /* 80238B08 00234768  90 17 00 04 */	stw r0, 4(r23)
@@ -25573,7 +25573,7 @@ lbl_80238B70:
 /* 80238BA8 00234808  98 01 00 2E */	stb r0, 0x2e(r1)
 /* 80238BAC 0023480C  88 17 00 03 */	lbz r0, 3(r23)
 /* 80238BB0 00234810  98 01 00 2F */	stb r0, 0x2f(r1)
-/* 80238BB4 00234814  48 04 97 E5 */	bl func_80282398
+/* 80238BB4 00234814  48 04 97 E5 */	bl GXSetChanAmbColor
 /* 80238BB8 00234818  88 17 00 00 */	lbz r0, 0(r23)
 /* 80238BBC 0023481C  98 19 00 00 */	stb r0, 0(r25)
 /* 80238BC0 00234820  88 17 00 01 */	lbz r0, 1(r23)
@@ -25620,7 +25620,7 @@ lbl_80238C1C:
 /* 80238C54 002348B4  98 01 00 2A */	stb r0, 0x2a(r1)
 /* 80238C58 002348B8  88 16 00 03 */	lbz r0, 3(r22)
 /* 80238C5C 002348BC  98 01 00 2B */	stb r0, 0x2b(r1)
-/* 80238C60 002348C0  48 04 98 11 */	bl func_80282470
+/* 80238C60 002348C0  48 04 98 11 */	bl GXSetChanMatColor
 /* 80238C64 002348C4  88 16 00 00 */	lbz r0, 0(r22)
 /* 80238C68 002348C8  98 17 00 00 */	stb r0, 0(r23)
 /* 80238C6C 002348CC  88 16 00 01 */	lbz r0, 1(r22)
@@ -27948,7 +27948,7 @@ func_8023AE54:
 /* 8023AE80 00236AE0  38 BF 16 D2 */	addi r5, r31, 0x16d2
 /* 8023AE84 00236AE4  38 DF 16 D3 */	addi r6, r31, 0x16d3
 /* 8023AE88 00236AE8  38 FF 16 D4 */	addi r7, r31, 0x16d4
-/* 8023AE8C 00236AEC  48 04 41 BD */	bl func_8027F048
+/* 8023AE8C 00236AEC  48 04 41 BD */	bl GXGetGPStatus
 /* 8023AE90 00236AF0  A0 7F 16 FE */	lhz r3, 0x16fe(r31)
 /* 8023AE94 00236AF4  38 00 00 00 */	li r0, 0
 /* 8023AE98 00236AF8  98 1F 16 FC */	stb r0, 0x16fc(r31)
@@ -27960,7 +27960,7 @@ lbl_8023AEAC:
 /* 8023AEAC 00236B0C  A0 1F 16 FE */	lhz r0, 0x16fe(r31)
 /* 8023AEB0 00236B10  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 8023AEB4 00236B14  41 82 00 14 */	beq lbl_8023AEC8
-/* 8023AEB8 00236B18  48 04 5C ED */	bl func_80280BA4
+/* 8023AEB8 00236B18  48 04 5C ED */	bl GXPixModeSync
 /* 8023AEBC 00236B1C  A0 1F 16 FE */	lhz r0, 0x16fe(r31)
 /* 8023AEC0 00236B20  54 00 07 B8 */	rlwinm r0, r0, 0, 0x1e, 0x1c
 /* 8023AEC4 00236B24  B0 1F 16 FE */	sth r0, 0x16fe(r31)
@@ -27976,7 +27976,7 @@ lbl_8023AEE4:
 /* 8023AEE4 00236B44  A0 1F 16 FE */	lhz r0, 0x16fe(r31)
 /* 8023AEE8 00236B48  54 00 07 39 */	rlwinm. r0, r0, 0, 0x1c, 0x1c
 /* 8023AEEC 00236B4C  41 82 00 14 */	beq lbl_8023AF00
-/* 8023AEF0 00236B50  48 04 5C D9 */	bl func_80280BC8
+/* 8023AEF0 00236B50  48 04 5C D9 */	bl GXTexModeSync
 /* 8023AEF4 00236B54  A0 1F 16 FE */	lhz r0, 0x16fe(r31)
 /* 8023AEF8 00236B58  54 00 07 76 */	rlwinm r0, r0, 0, 0x1d, 0x1b
 /* 8023AEFC 00236B5C  B0 1F 16 FE */	sth r0, 0x16fe(r31)
@@ -28004,7 +28004,7 @@ lbl_8023AF4C:
 /* 8023AF4C 00236BAC  7F E3 FB 78 */	mr r3, r31
 /* 8023AF50 00236BB0  4B FF D3 B5 */	bl func_80238304
 lbl_8023AF54:
-/* 8023AF54 00236BB4  48 04 57 51 */	bl func_802806A4
+/* 8023AF54 00236BB4  48 04 57 51 */	bl GXFlush
 /* 8023AF58 00236BB8  80 01 00 14 */	lwz r0, 0x14(r1)
 /* 8023AF5C 00236BBC  83 E1 00 0C */	lwz r31, 0xc(r1)
 /* 8023AF60 00236BC0  7C 08 03 A6 */	mtlr r0
@@ -28628,7 +28628,7 @@ func_8023B704:
 /* 8023B750 002373B0  93 E4 00 0C */	stw r31, 0xc(r4)
 /* 8023B754 002373B4  93 E4 00 14 */	stw r31, 0x14(r4)
 /* 8023B758 002373B8  93 E4 00 1C */	stw r31, 0x1c(r4)
-/* 8023B75C 002373BC  48 04 55 85 */	bl func_80280CE0
+/* 8023B75C 002373BC  48 04 55 85 */	bl GXSetDrawSyncCallback
 /* 8023B760 002373C0  80 01 00 14 */	lwz r0, 0x14(r1)
 /* 8023B764 002373C4  83 E1 00 0C */	lwz r31, 0xc(r1)
 /* 8023B768 002373C8  7C 08 03 A6 */	mtlr r0
@@ -28692,7 +28692,7 @@ lbl_8023B810:
 /* 8023B824 00237484  38 60 00 01 */	li r3, 1
 /* 8023B828 00237488  48 00 00 28 */	b lbl_8023B850
 lbl_8023B82C:
-/* 8023B82C 0023748C  48 04 52 D5 */	bl func_80280B00
+/* 8023B82C 0023748C  48 04 52 D5 */	bl GXReadDrawSync
 /* 8023B830 00237490  A0 0D A4 86 */	lhz r0, lbl_8063F746-_SDA_BASE_(r13)
 /* 8023B834 00237494  54 64 04 3E */	clrlwi r4, r3, 0x10
 /* 8023B838 00237498  7C 04 00 40 */	cmplw r4, r0
@@ -28758,7 +28758,7 @@ lbl_8023B8CC:
 /* 8023B8F8 00237558  7C 64 1B 78 */	mr r4, r3
 /* 8023B8FC 0023755C  7C 66 1B 78 */	mr r6, r3
 /* 8023B900 00237560  7C 67 1B 78 */	mr r7, r3
-/* 8023B904 00237564  48 04 37 45 */	bl func_8027F048
+/* 8023B904 00237564  48 04 37 45 */	bl GXGetGPStatus
 /* 8023B908 00237568  88 01 00 09 */	lbz r0, 9(r1)
 /* 8023B90C 0023756C  28 00 00 01 */	cmplwi r0, 1
 /* 8023B910 00237570  41 82 00 14 */	beq lbl_8023B924
@@ -28800,7 +28800,7 @@ lbl_8023B96C:
 /* 8023B984 002375E4  48 00 00 3C */	b lbl_8023B9C0
 lbl_8023B988:
 /* 8023B988 002375E8  7F E3 FB 78 */	mr r3, r31
-/* 8023B98C 002375EC  48 04 50 C1 */	bl func_80280A4C
+/* 8023B98C 002375EC  48 04 50 C1 */	bl GXSetDrawSync
 /* 8023B990 002375F0  A0 6D A4 7E */	lhz r3, lbl_8063F73E-_SDA_BASE_(r13)
 /* 8023B994 002375F4  A0 0D A4 86 */	lhz r0, lbl_8063F746-_SDA_BASE_(r13)
 /* 8023B998 002375F8  38 83 00 01 */	addi r4, r3, 1
@@ -33011,7 +33011,7 @@ lbl_8023F224:
 /* 8023F234 0023AE94  C0 22 9E 04 */	lfs f1, lbl_80642404-_SDA2_BASE_(r2)
 /* 8023F238 0023AE98  A0 7F 00 06 */	lhz r3, 6(r31)
 /* 8023F23C 0023AE9C  D0 3F 00 68 */	stfs f1, 0x68(r31)
-/* 8023F240 0023AEA0  48 04 24 35 */	bl func_80281674
+/* 8023F240 0023AEA0  48 04 24 35 */	bl GXGetNumXfbLines
 /* 8023F244 0023AEA4  B0 7F 00 5E */	sth r3, 0x5e(r31)
 /* 8023F248 0023AEA8  48 00 00 0C */	b lbl_8023F254
 lbl_8023F24C:
@@ -33230,23 +33230,23 @@ func_8023F510:
 /* 8023F534 0023B194  38 60 00 00 */	li r3, 0
 /* 8023F538 0023B198  A0 DF 00 06 */	lhz r6, 6(r31)
 /* 8023F53C 0023B19C  38 80 00 00 */	li r4, 0
-/* 8023F540 0023B1A0  48 04 1F 2D */	bl func_8028146C
+/* 8023F540 0023B1A0  48 04 1F 2D */	bl GXSetDispCopySrc
 /* 8023F544 0023B1A4  A0 7F 00 04 */	lhz r3, 4(r31)
 /* 8023F548 0023B1A8  A0 9F 00 08 */	lhz r4, 8(r31)
-/* 8023F54C 0023B1AC  48 04 1F A1 */	bl func_802814EC
+/* 8023F54C 0023B1AC  48 04 1F A1 */	bl GXSetDispCopyDst
 /* 8023F550 0023B1B0  38 60 00 00 */	li r3, 0
-/* 8023F554 0023B1B4  48 04 20 D9 */	bl func_8028162C
+/* 8023F554 0023B1B4  48 04 20 D9 */	bl GXSetDispCopyFrame2Field
 /* 8023F558 0023B1B8  80 7F 00 60 */	lwz r3, 0x60(r31)
 /* 8023F55C 0023B1BC  48 04 26 FD */	bl GXSetDispCopyGamma
 /* 8023F560 0023B1C0  C0 3F 00 68 */	lfs f1, 0x68(r31)
-/* 8023F564 0023B1C4  48 04 23 CD */	bl func_80281930
+/* 8023F564 0023B1C4  48 04 23 CD */	bl GXSetDispCopyYScale
 /* 8023F568 0023B1C8  88 7F 00 19 */	lbz r3, 0x19(r31)
 /* 8023F56C 0023B1CC  38 9F 00 1A */	addi r4, r31, 0x1a
 /* 8023F570 0023B1D0  38 DF 00 32 */	addi r6, r31, 0x32
 /* 8023F574 0023B1D4  38 A0 00 01 */	li r5, 1
-/* 8023F578 0023B1D8  48 04 24 FD */	bl func_80281A74
+/* 8023F578 0023B1D8  48 04 24 FD */	bl GXSetCopyFilter
 /* 8023F57C 0023B1DC  38 60 00 03 */	li r3, 3
-/* 8023F580 0023B1E0  48 04 20 CD */	bl func_8028164C
+/* 8023F580 0023B1E0  48 04 20 CD */	bl GXSetCopyClamp
 /* 8023F584 0023B1E4  88 1F 00 D0 */	lbz r0, 0xd0(r31)
 /* 8023F588 0023B1E8  38 61 00 08 */	addi r3, r1, 8
 /* 8023F58C 0023B1EC  98 01 00 08 */	stb r0, 8(r1)
@@ -33257,7 +33257,7 @@ func_8023F510:
 /* 8023F5A0 0023B200  88 1F 00 D3 */	lbz r0, 0xd3(r31)
 /* 8023F5A4 0023B204  98 01 00 0B */	stb r0, 0xb(r1)
 /* 8023F5A8 0023B208  80 9F 00 D4 */	lwz r4, 0xd4(r31)
-/* 8023F5AC 0023B20C  48 04 24 51 */	bl func_802819FC
+/* 8023F5AC 0023B20C  48 04 24 51 */	bl GXSetCopyClear
 lbl_8023F5B0:
 /* 8023F5B0 0023B210  80 01 00 24 */	lwz r0, 0x24(r1)
 /* 8023F5B4 0023B214  83 E1 00 1C */	lwz r31, 0x1c(r1)
@@ -33274,7 +33274,7 @@ func_8023F5C4:
 /* 8023F5D4 0023B234  80 64 00 04 */	lwz r3, 4(r4)
 /* 8023F5D8 0023B238  90 04 00 00 */	stw r0, 0(r4)
 /* 8023F5DC 0023B23C  38 80 00 01 */	li r4, 1
-/* 8023F5E0 0023B240  48 04 26 8C */	b func_80281C6C
+/* 8023F5E0 0023B240  48 04 26 8C */	b GXCopyDisp
 /* 8023F5E4 0023B244  4E 80 00 20 */	blr
 
 .global func_8023F5E8
@@ -33340,7 +33340,7 @@ lbl_8023F6B4:
 lbl_8023F6C8:
 /* 8023F6C8 0023B328  54 E5 04 3E */	clrlwi r5, r7, 0x10
 /* 8023F6CC 0023B32C  55 06 04 3E */	clrlwi r6, r8, 0x10
-/* 8023F6D0 0023B330  48 04 1D DD */	bl func_802814AC
+/* 8023F6D0 0023B330  48 04 1D DD */	bl GXSetTexCopySrc
 /* 8023F6D4 0023B334  7F 63 DB 78 */	mr r3, r27
 /* 8023F6D8 0023B338  38 80 00 00 */	li r4, 0
 /* 8023F6DC 0023B33C  4B FF F0 0D */	bl func_8023E6E8
@@ -33348,14 +33348,14 @@ lbl_8023F6C8:
 /* 8023F6E4 0023B344  57 E3 04 3E */	clrlwi r3, r31, 0x10
 /* 8023F6E8 0023B348  57 C4 04 3E */	clrlwi r4, r30, 0x10
 /* 8023F6EC 0023B34C  57 86 06 3E */	clrlwi r6, r28, 0x18
-/* 8023F6F0 0023B350  48 04 1E 21 */	bl func_80281510
+/* 8023F6F0 0023B350  48 04 1E 21 */	bl GXSetTexCopyDst
 /* 8023F6F4 0023B354  38 60 00 00 */	li r3, 0
 /* 8023F6F8 0023B358  38 80 00 00 */	li r4, 0
 /* 8023F6FC 0023B35C  38 A0 00 00 */	li r5, 0
 /* 8023F700 0023B360  38 C0 00 00 */	li r6, 0
-/* 8023F704 0023B364  48 04 23 71 */	bl func_80281A74
+/* 8023F704 0023B364  48 04 23 71 */	bl GXSetCopyFilter
 /* 8023F708 0023B368  38 60 00 03 */	li r3, 3
-/* 8023F70C 0023B36C  48 04 1F 41 */	bl func_8028164C
+/* 8023F70C 0023B36C  48 04 1F 41 */	bl GXSetCopyClamp
 /* 8023F710 0023B370  88 1A 00 D0 */	lbz r0, 0xd0(r26)
 /* 8023F714 0023B374  38 61 00 18 */	addi r3, r1, 0x18
 /* 8023F718 0023B378  98 01 00 18 */	stb r0, 0x18(r1)
@@ -33366,12 +33366,12 @@ lbl_8023F6C8:
 /* 8023F72C 0023B38C  88 1A 00 D3 */	lbz r0, 0xd3(r26)
 /* 8023F730 0023B390  98 01 00 1B */	stb r0, 0x1b(r1)
 /* 8023F734 0023B394  80 9A 00 D4 */	lwz r4, 0xd4(r26)
-/* 8023F738 0023B398  48 04 22 C5 */	bl func_802819FC
+/* 8023F738 0023B398  48 04 22 C5 */	bl GXSetCopyClear
 /* 8023F73C 0023B39C  7F 63 DB 78 */	mr r3, r27
 /* 8023F740 0023B3A0  38 80 00 00 */	li r4, 0
 /* 8023F744 0023B3A4  4B FF ED 5D */	bl func_8023E4A0
 /* 8023F748 0023B3A8  57 A4 06 3E */	clrlwi r4, r29, 0x18
-/* 8023F74C 0023B3AC  48 04 26 5D */	bl func_80281DA8
+/* 8023F74C 0023B3AC  48 04 26 5D */	bl GXCopyTex
 /* 8023F750 0023B3B0  80 6D A3 D8 */	lwz r3, lbl_8063F698-_SDA_BASE_(r13)
 /* 8023F754 0023B3B4  7F 64 DB 78 */	mr r4, r27
 /* 8023F758 0023B3B8  4B FF C1 F1 */	bl func_8023B948
@@ -33642,7 +33642,7 @@ lbl_8023FAA8:
 /* 8023FACC 0023B72C  D0 0D 86 C8 */	stfs f0, lbl_8063D988-_SDA_BASE_(r13)
 /* 8023FAD0 0023B730  A0 7F 00 06 */	lhz r3, 6(r31)
 /* 8023FAD4 0023B734  A0 9F 00 08 */	lhz r4, 8(r31)
-/* 8023FAD8 0023B738  48 04 1C 29 */	bl func_80281700
+/* 8023FAD8 0023B738  48 04 1C 29 */	bl GXGetYScaleFactor
 /* 8023FADC 0023B73C  D0 3F 00 68 */	stfs f1, 0x68(r31)
 /* 8023FAE0 0023B740  38 60 00 01 */	li r3, 1
 lbl_8023FAE4:
@@ -33818,7 +33818,7 @@ lbl_8023FD08:
 /* 8023FD1C 0023B97C  7C 64 1B 78 */	mr r4, r3
 /* 8023FD20 0023B980  7C 66 1B 78 */	mr r6, r3
 /* 8023FD24 0023B984  7C 67 1B 78 */	mr r7, r3
-/* 8023FD28 0023B988  48 03 F3 21 */	bl func_8027F048
+/* 8023FD28 0023B988  48 03 F3 21 */	bl GXGetGPStatus
 /* 8023FD2C 0023B98C  88 01 00 09 */	lbz r0, 9(r1)
 /* 8023FD30 0023B990  28 00 00 01 */	cmplwi r0, 1
 /* 8023FD34 0023B994  40 82 FF 68 */	bne lbl_8023FC9C
@@ -33886,7 +33886,7 @@ lbl_8023FE04:
 lbl_8023FE10:
 /* 8023FE10 0023BA70  48 03 9A 99 */	bl VIGetNextField
 /* 8023FE14 0023BA74  98 7F 00 5A */	stb r3, 0x5a(r31)
-/* 8023FE18 0023BA78  48 04 08 8D */	bl func_802806A4
+/* 8023FE18 0023BA78  48 04 08 8D */	bl GXFlush
 /* 8023FE1C 0023BA7C  80 01 00 14 */	lwz r0, 0x14(r1)
 /* 8023FE20 0023BA80  83 E1 00 0C */	lwz r31, 0xc(r1)
 /* 8023FE24 0023BA84  7C 08 03 A6 */	mtlr r0