From f1bc06bff1e93e2decaecd33f89aa305a69d158d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 17 Oct 2022 09:11:35 +0100 Subject: [PATCH] merge gx --- asm/gx/{GXAttr_800337a0.s => GXAttr.s} | 168 +++++++++++ asm/gx/GXAttr_80430a70.s | 150 ---------- asm/gx/GXAttr_80556570.s | 18 -- asm/gx/{GXBump_80037770.s => GXBump.s} | 8 + asm/gx/GXBump_8055e628.s | 8 - ...DisplayList_80038a50.s => GXDisplayList.s} | 0 asm/gx/{GXFifo_80032db0.s => GXFifo.s} | 66 +++++ asm/gx/GXFifo_80430a40.s | 22 -- asm/gx/GXFifo_8049ad80.s | 10 - asm/gx/GXFifo_8055c9f8.s | 34 --- .../{GXFrameBuf_80035600.s => GXFrameBuf.s} | 86 ++++++ asm/gx/GXFrameBuf_80430c60.s | 78 ----- asm/gx/GXFrameBuf_8055e5b0.s | 8 - .../{GXGeometry_80034ff0.s => GXGeometry.s} | 0 asm/gx/{GXInit_80031c20.s => GXInit.s} | 258 +++++++++++++++++ asm/gx/GXInit_80430800.s | 158 ----------- asm/gx/GXInit_8049a700.s | 10 - asm/gx/GXInit_80556568.s | 8 - asm/gx/GXInit_8055c9d0.s | 38 --- asm/gx/GXInit_8055e588.s | 44 --- asm/gx/{GXLight_80035e50.s => GXLight.s} | 68 +++++ asm/gx/GXLight_8055e5b8.s | 68 ----- asm/gx/{GXMisc_80034710.s => GXMisc.s} | 18 ++ asm/gx/GXMisc_8055ca18.s | 18 -- asm/gx/{GXPerf_800390c0.s => GXPerf.s} | 68 +++++ asm/gx/GXPerf_80431010.s | 68 ----- asm/gx/{GXPixel_80038290.s => GXPixel.s} | 84 ++++++ asm/gx/GXPixel_80430ff0.s | 14 - asm/gx/GXPixel_8055e630.s | 70 ----- asm/gx/{GXTev_80037bc0.s => GXTev.s} | 40 +++ asm/gx/GXTev_80430f78.s | 40 --- asm/gx/{GXTexture_800365c0.s => GXTexture.s} | 268 ++++++++++++++++++ asm/gx/GXTexture_80430d50.s | 152 ---------- asm/gx/GXTexture_80556580.s | 56 ---- asm/gx/GXTexture_8055e5f0.s | 60 ---- .../{GXTransform_80038ad0.s => GXTransform.s} | 28 ++ asm/gx/GXTransform_8055e680.s | 28 -- obj_files.mk | 52 +--- 38 files changed, 1175 insertions(+), 1197 deletions(-) rename asm/gx/{GXAttr_800337a0.s => GXAttr.s} (94%) delete mode 100644 asm/gx/GXAttr_80430a70.s delete mode 100644 asm/gx/GXAttr_80556570.s rename asm/gx/{GXBump_80037770.s => GXBump.s} (99%) delete mode 100644 asm/gx/GXBump_8055e628.s rename asm/gx/{GXDisplayList_80038a50.s => GXDisplayList.s} (100%) rename asm/gx/{GXFifo_80032db0.s => GXFifo.s} (97%) delete mode 100644 asm/gx/GXFifo_80430a40.s delete mode 100644 asm/gx/GXFifo_8049ad80.s delete mode 100644 asm/gx/GXFifo_8055c9f8.s rename asm/gx/{GXFrameBuf_80035600.s => GXFrameBuf.s} (95%) delete mode 100644 asm/gx/GXFrameBuf_80430c60.s delete mode 100644 asm/gx/GXFrameBuf_8055e5b0.s rename asm/gx/{GXGeometry_80034ff0.s => GXGeometry.s} (100%) rename asm/gx/{GXInit_80031c20.s => GXInit.s} (93%) delete mode 100644 asm/gx/GXInit_80430800.s delete mode 100644 asm/gx/GXInit_8049a700.s delete mode 100644 asm/gx/GXInit_80556568.s delete mode 100644 asm/gx/GXInit_8055c9d0.s delete mode 100644 asm/gx/GXInit_8055e588.s rename asm/gx/{GXLight_80035e50.s => GXLight.s} (97%) delete mode 100644 asm/gx/GXLight_8055e5b8.s rename asm/gx/{GXMisc_80034710.s => GXMisc.s} (99%) delete mode 100644 asm/gx/GXMisc_8055ca18.s rename asm/gx/{GXPerf_800390c0.s => GXPerf.s} (95%) delete mode 100644 asm/gx/GXPerf_80431010.s rename asm/gx/{GXPixel_80038290.s => GXPixel.s} (96%) delete mode 100644 asm/gx/GXPixel_80430ff0.s delete mode 100644 asm/gx/GXPixel_8055e630.s rename asm/gx/{GXTev_80037bc0.s => GXTev.s} (96%) delete mode 100644 asm/gx/GXTev_80430f78.s rename asm/gx/{GXTexture_800365c0.s => GXTexture.s} (93%) delete mode 100644 asm/gx/GXTexture_80430d50.s delete mode 100644 asm/gx/GXTexture_80556580.s delete mode 100644 asm/gx/GXTexture_8055e5f0.s rename asm/gx/{GXTransform_80038ad0.s => GXTransform.s} (98%) delete mode 100644 asm/gx/GXTransform_8055e680.s diff --git a/asm/gx/GXAttr_800337a0.s b/asm/gx/GXAttr.s similarity index 94% rename from asm/gx/GXAttr_800337a0.s rename to asm/gx/GXAttr.s index 8e141baa..20b67d5d 100644 --- a/asm/gx/GXAttr_800337a0.s +++ b/asm/gx/GXAttr.s @@ -1395,3 +1395,171 @@ GXSetNumTexGens: /* 80034704 00030544 00 00 00 00 */ .4byte 0x00000000 /* 80034708 00030548 00 00 00 00 */ .4byte 0x00000000 /* 8003470C 0003054C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@3194_80430A70" +"@3194_80430A70": + + .4byte lbl_800337C0 + .4byte lbl_800337D4 + .4byte lbl_800337E8 + .4byte lbl_800337FC + .4byte lbl_80033810 + .4byte lbl_80033824 + .4byte lbl_80033838 + .4byte lbl_8003384C + .4byte lbl_80033860 + .4byte lbl_80033874 + .4byte lbl_80033888 + .4byte lbl_800338F0 + .4byte lbl_80033904 + .4byte lbl_80033918 + .4byte lbl_8003392C + .4byte lbl_80033940 + .4byte lbl_80033954 + .4byte lbl_80033968 + .4byte lbl_8003397C + .4byte lbl_80033990 + .4byte lbl_800339A4 + .4byte lbl_800339B4 + .4byte lbl_800339B4 + .4byte lbl_800339B4 + .4byte lbl_800339B4 + .4byte lbl_800338BC + +.global "@3337" +"@3337": + + .4byte lbl_80033C10 + .4byte lbl_80033C20 + .4byte lbl_80033C30 + .4byte lbl_80033C40 + .4byte lbl_80033C50 + .4byte lbl_80033C60 + .4byte lbl_80033C70 + .4byte lbl_80033C80 + .4byte lbl_80033C90 + .4byte lbl_80033CA0 + .4byte lbl_80033CB0 + .4byte lbl_80033CF8 + .4byte lbl_80033D08 + .4byte lbl_80033D18 + .4byte lbl_80033D28 + .4byte lbl_80033D38 + .4byte lbl_80033D48 + .4byte lbl_80033D58 + .4byte lbl_80033D68 + .4byte lbl_80033D78 + .4byte lbl_80033D88 + .4byte lbl_80033D98 + .4byte lbl_80033D98 + .4byte lbl_80033D98 + .4byte lbl_80033D98 + .4byte lbl_80033CD4 + +.global "@3383_80430B40" +"@3383_80430B40": + + .4byte lbl_80033E20 + .4byte lbl_80033E38 + .4byte lbl_80033E74 + .4byte lbl_80033E88 + .4byte lbl_80033E9C + .4byte lbl_80033EB4 + .4byte lbl_80033ECC + .4byte lbl_80033EE4 + .4byte lbl_80033EFC + .4byte lbl_80033F1C + .4byte lbl_80033F34 + .4byte lbl_80033F4C + .4byte lbl_80033F60 + .4byte lbl_80033F60 + .4byte lbl_80033F60 + .4byte lbl_80033F60 + .4byte lbl_80033E38 + +.global "@3413" +"@3413": + + .4byte lbl_80033FD8 + .4byte lbl_80033FF0 + .4byte lbl_8003402C + .4byte lbl_80034040 + .4byte lbl_80034054 + .4byte lbl_8003406C + .4byte lbl_80034084 + .4byte lbl_8003409C + .4byte lbl_800340B4 + .4byte lbl_800340D4 + .4byte lbl_800340EC + .4byte lbl_80034104 + .4byte lbl_80034118 + .4byte lbl_80034118 + .4byte lbl_80034118 + .4byte lbl_80034118 + .4byte lbl_80033FF0 + +.global "@3456" +"@3456": + + .4byte lbl_80034210 + .4byte lbl_80034238 + .4byte lbl_8003429C + .4byte lbl_800342C0 + .4byte lbl_800342E4 + .4byte lbl_8003430C + .4byte lbl_80034334 + .4byte lbl_8003435C + .4byte lbl_80034384 + .4byte lbl_800343AC + .4byte lbl_800343D4 + .4byte lbl_800343FC + .4byte lbl_80034424 + .4byte lbl_80034424 + .4byte lbl_80034424 + .4byte lbl_80034424 + .4byte lbl_80034238 + +.global "@3589" +"@3589": + + .4byte lbl_800344BC + .4byte lbl_800344C8 + .4byte lbl_800344D4 + .4byte lbl_800344E0 + .4byte lbl_800344FC + .4byte lbl_80034504 + .4byte lbl_8003450C + .4byte lbl_80034514 + .4byte lbl_8003451C + .4byte lbl_80034524 + .4byte lbl_8003452C + .4byte lbl_80034534 + .4byte lbl_80034538 + .4byte lbl_80034538 + .4byte lbl_80034538 + .4byte lbl_80034538 + .4byte lbl_80034538 + .4byte lbl_80034538 + .4byte lbl_80034538 + .4byte lbl_800344EC + .4byte lbl_800344F4 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@LOCAL@__GXCalculateVLim__Fv@tbl1" +"@LOCAL@__GXCalculateVLim__Fv@tbl1": + + .4byte 0x00040102 + +.global "@LOCAL@__GXCalculateVLim__Fv@tbl2@0" +"@LOCAL@__GXCalculateVLim__Fv@tbl2@0": + + .4byte 0x00080102 + +.global "@LOCAL@__GXCalculateVLim__Fv@tbl3@1" +"@LOCAL@__GXCalculateVLim__Fv@tbl3@1": + + .4byte 0x000C0102 + .4byte 0 diff --git a/asm/gx/GXAttr_80430a70.s b/asm/gx/GXAttr_80430a70.s deleted file mode 100644 index bf644a5c..00000000 --- a/asm/gx/GXAttr_80430a70.s +++ /dev/null @@ -1,150 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@3194_80430A70" -"@3194_80430A70": - - .4byte lbl_800337C0 - .4byte lbl_800337D4 - .4byte lbl_800337E8 - .4byte lbl_800337FC - .4byte lbl_80033810 - .4byte lbl_80033824 - .4byte lbl_80033838 - .4byte lbl_8003384C - .4byte lbl_80033860 - .4byte lbl_80033874 - .4byte lbl_80033888 - .4byte lbl_800338F0 - .4byte lbl_80033904 - .4byte lbl_80033918 - .4byte lbl_8003392C - .4byte lbl_80033940 - .4byte lbl_80033954 - .4byte lbl_80033968 - .4byte lbl_8003397C - .4byte lbl_80033990 - .4byte lbl_800339A4 - .4byte lbl_800339B4 - .4byte lbl_800339B4 - .4byte lbl_800339B4 - .4byte lbl_800339B4 - .4byte lbl_800338BC - -.global "@3337" -"@3337": - - .4byte lbl_80033C10 - .4byte lbl_80033C20 - .4byte lbl_80033C30 - .4byte lbl_80033C40 - .4byte lbl_80033C50 - .4byte lbl_80033C60 - .4byte lbl_80033C70 - .4byte lbl_80033C80 - .4byte lbl_80033C90 - .4byte lbl_80033CA0 - .4byte lbl_80033CB0 - .4byte lbl_80033CF8 - .4byte lbl_80033D08 - .4byte lbl_80033D18 - .4byte lbl_80033D28 - .4byte lbl_80033D38 - .4byte lbl_80033D48 - .4byte lbl_80033D58 - .4byte lbl_80033D68 - .4byte lbl_80033D78 - .4byte lbl_80033D88 - .4byte lbl_80033D98 - .4byte lbl_80033D98 - .4byte lbl_80033D98 - .4byte lbl_80033D98 - .4byte lbl_80033CD4 - -.global "@3383_80430B40" -"@3383_80430B40": - - .4byte lbl_80033E20 - .4byte lbl_80033E38 - .4byte lbl_80033E74 - .4byte lbl_80033E88 - .4byte lbl_80033E9C - .4byte lbl_80033EB4 - .4byte lbl_80033ECC - .4byte lbl_80033EE4 - .4byte lbl_80033EFC - .4byte lbl_80033F1C - .4byte lbl_80033F34 - .4byte lbl_80033F4C - .4byte lbl_80033F60 - .4byte lbl_80033F60 - .4byte lbl_80033F60 - .4byte lbl_80033F60 - .4byte lbl_80033E38 - -.global "@3413" -"@3413": - - .4byte lbl_80033FD8 - .4byte lbl_80033FF0 - .4byte lbl_8003402C - .4byte lbl_80034040 - .4byte lbl_80034054 - .4byte lbl_8003406C - .4byte lbl_80034084 - .4byte lbl_8003409C - .4byte lbl_800340B4 - .4byte lbl_800340D4 - .4byte lbl_800340EC - .4byte lbl_80034104 - .4byte lbl_80034118 - .4byte lbl_80034118 - .4byte lbl_80034118 - .4byte lbl_80034118 - .4byte lbl_80033FF0 - -.global "@3456" -"@3456": - - .4byte lbl_80034210 - .4byte lbl_80034238 - .4byte lbl_8003429C - .4byte lbl_800342C0 - .4byte lbl_800342E4 - .4byte lbl_8003430C - .4byte lbl_80034334 - .4byte lbl_8003435C - .4byte lbl_80034384 - .4byte lbl_800343AC - .4byte lbl_800343D4 - .4byte lbl_800343FC - .4byte lbl_80034424 - .4byte lbl_80034424 - .4byte lbl_80034424 - .4byte lbl_80034424 - .4byte lbl_80034238 - -.global "@3589" -"@3589": - - .4byte lbl_800344BC - .4byte lbl_800344C8 - .4byte lbl_800344D4 - .4byte lbl_800344E0 - .4byte lbl_800344FC - .4byte lbl_80034504 - .4byte lbl_8003450C - .4byte lbl_80034514 - .4byte lbl_8003451C - .4byte lbl_80034524 - .4byte lbl_8003452C - .4byte lbl_80034534 - .4byte lbl_80034538 - .4byte lbl_80034538 - .4byte lbl_80034538 - .4byte lbl_80034538 - .4byte lbl_80034538 - .4byte lbl_80034538 - .4byte lbl_80034538 - .4byte lbl_800344EC - .4byte lbl_800344F4 diff --git a/asm/gx/GXAttr_80556570.s b/asm/gx/GXAttr_80556570.s deleted file mode 100644 index 8fe2dcaa..00000000 --- a/asm/gx/GXAttr_80556570.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@LOCAL@__GXCalculateVLim__Fv@tbl1" -"@LOCAL@__GXCalculateVLim__Fv@tbl1": - - .4byte 0x00040102 - -.global "@LOCAL@__GXCalculateVLim__Fv@tbl2@0" -"@LOCAL@__GXCalculateVLim__Fv@tbl2@0": - - .4byte 0x00080102 - -.global "@LOCAL@__GXCalculateVLim__Fv@tbl3@1" -"@LOCAL@__GXCalculateVLim__Fv@tbl3@1": - - .4byte 0x000C0102 - .4byte 0 diff --git a/asm/gx/GXBump_80037770.s b/asm/gx/GXBump.s similarity index 99% rename from asm/gx/GXBump_80037770.s rename to asm/gx/GXBump.s index 10f3d613..3e32b876 100644 --- a/asm/gx/GXBump_80037770.s +++ b/asm/gx/GXBump.s @@ -321,3 +321,11 @@ __GXFlushTextureState: /* 80037BB4 000339F4 00 00 00 00 */ .4byte 0x00000000 /* 80037BB8 000339F8 00 00 00 00 */ .4byte 0x00000000 /* 80037BBC 000339FC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@2555_8055E628" +"@2555_8055E628": + + .4byte 0x44800000 + .4byte 0 diff --git a/asm/gx/GXBump_8055e628.s b/asm/gx/GXBump_8055e628.s deleted file mode 100644 index b9b8c18c..00000000 --- a/asm/gx/GXBump_8055e628.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@2555_8055E628" -"@2555_8055E628": - - .4byte 0x44800000 - .4byte 0 diff --git a/asm/gx/GXDisplayList_80038a50.s b/asm/gx/GXDisplayList.s similarity index 100% rename from asm/gx/GXDisplayList_80038a50.s rename to asm/gx/GXDisplayList.s diff --git a/asm/gx/GXFifo_80032db0.s b/asm/gx/GXFifo.s similarity index 97% rename from asm/gx/GXFifo_80032db0.s rename to asm/gx/GXFifo.s index 3aa19b08..6c3d8f45 100644 --- a/asm/gx/GXFifo_80032db0.s +++ b/asm/gx/GXFifo.s @@ -707,3 +707,69 @@ GXResetOverflowCount: /* 80033794 0002F5D4 38 00 00 00 */ li r0, 0x0 /* 80033798 0002F5D8 90 0D E5 DC */ stw r0, __GXOverflowCount@sda21(r13) /* 8003379C 0002F5DC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@1961" +"@1961": + + .4byte 0x43505546 + .4byte 0x69666F3A + .4byte 0x20253038 + .4byte 0x58202D20 + .4byte 0x25303858 + .4byte 0x0A000000 + +.global "@1962" +"@1962": + + .4byte 0x47502046 + .4byte 0x69666F3A + .4byte 0x20253038 + .4byte 0x58202D20 + .4byte 0x25303858 + .4byte 0x0A000000 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global GPFifo +GPFifo: + .skip 0x24 + +.global CPUFifo +CPUFifo: + .skip 0x5C +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global CPUFifoReady +CPUFifoReady: + .skip 0x1 + +.global GPFifoReady +GPFifoReady: + .skip 0x3 + +.global __GXOverflowCount +__GXOverflowCount: + .skip 0x4 + +.global __GXCurrentBP +__GXCurrentBP: + .skip 0x4 + +.global BreakPointCB +BreakPointCB: + .skip 0x4 + +.global GXOverflowSuspendInProgress +GXOverflowSuspendInProgress: + .skip 0x4 + +.global __GXCurrentThread +__GXCurrentThread: + .skip 0x4 + +.global CPGPLinked +CPGPLinked: + .skip 0x8 diff --git a/asm/gx/GXFifo_80430a40.s b/asm/gx/GXFifo_80430a40.s deleted file mode 100644 index 8aab8cf5..00000000 --- a/asm/gx/GXFifo_80430a40.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@1961" -"@1961": - - .4byte 0x43505546 - .4byte 0x69666F3A - .4byte 0x20253038 - .4byte 0x58202D20 - .4byte 0x25303858 - .4byte 0x0A000000 - -.global "@1962" -"@1962": - - .4byte 0x47502046 - .4byte 0x69666F3A - .4byte 0x20253038 - .4byte 0x58202D20 - .4byte 0x25303858 - .4byte 0x0A000000 diff --git a/asm/gx/GXFifo_8049ad80.s b/asm/gx/GXFifo_8049ad80.s deleted file mode 100644 index b961828d..00000000 --- a/asm/gx/GXFifo_8049ad80.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global GPFifo -GPFifo: - .skip 0x24 - -.global CPUFifo -CPUFifo: - .skip 0x5C diff --git a/asm/gx/GXFifo_8055c9f8.s b/asm/gx/GXFifo_8055c9f8.s deleted file mode 100644 index 6bf5a83d..00000000 --- a/asm/gx/GXFifo_8055c9f8.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global CPUFifoReady -CPUFifoReady: - .skip 0x1 - -.global GPFifoReady -GPFifoReady: - .skip 0x3 - -.global __GXOverflowCount -__GXOverflowCount: - .skip 0x4 - -.global __GXCurrentBP -__GXCurrentBP: - .skip 0x4 - -.global BreakPointCB -BreakPointCB: - .skip 0x4 - -.global GXOverflowSuspendInProgress -GXOverflowSuspendInProgress: - .skip 0x4 - -.global __GXCurrentThread -__GXCurrentThread: - .skip 0x4 - -.global CPGPLinked -CPGPLinked: - .skip 0x8 diff --git a/asm/gx/GXFrameBuf_80035600.s b/asm/gx/GXFrameBuf.s similarity index 95% rename from asm/gx/GXFrameBuf_80035600.s rename to asm/gx/GXFrameBuf.s index 69f29b1e..c5804969 100644 --- a/asm/gx/GXFrameBuf_80035600.s +++ b/asm/gx/GXFrameBuf.s @@ -607,3 +607,89 @@ GXClearBoundingBox: /* 80035E44 00031C84 4E 80 00 20 */ blr /* 80035E48 00031C88 00 00 00 00 */ .4byte 0x00000000 /* 80035E4C 00031C8C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global GXNtsc480IntDf +GXNtsc480IntDf: + + .4byte 0 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 + +.global GXMpal480IntDf +GXMpal480IntDf: + + .4byte 0x00000008 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 + +.global GXPal528IntDf +GXPal528IntDf: + + .4byte 0x00000004 + .4byte 0x02800210 + .4byte 0x02100028 + .4byte 0x00170280 + .4byte 0x02100000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 + +.global GXEurgb60Hz480IntDf +GXEurgb60Hz480IntDf: + + .4byte 0x00000014 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@2195" +"@2195": + + .4byte 0x43800000 + .4byte 0 diff --git a/asm/gx/GXFrameBuf_80430c60.s b/asm/gx/GXFrameBuf_80430c60.s deleted file mode 100644 index e65202b2..00000000 --- a/asm/gx/GXFrameBuf_80430c60.s +++ /dev/null @@ -1,78 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global GXNtsc480IntDf -GXNtsc480IntDf: - - .4byte 0 - .4byte 0x028001E0 - .4byte 0x01E00028 - .4byte 0x00000280 - .4byte 0x01E00000 - .4byte 0x00000001 - .4byte 0x00000606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060808 - .4byte 0x0A0C0A08 - .4byte 0x08000000 - -.global GXMpal480IntDf -GXMpal480IntDf: - - .4byte 0x00000008 - .4byte 0x028001E0 - .4byte 0x01E00028 - .4byte 0x00000280 - .4byte 0x01E00000 - .4byte 0x00000001 - .4byte 0x00000606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060808 - .4byte 0x0A0C0A08 - .4byte 0x08000000 - -.global GXPal528IntDf -GXPal528IntDf: - - .4byte 0x00000004 - .4byte 0x02800210 - .4byte 0x02100028 - .4byte 0x00170280 - .4byte 0x02100000 - .4byte 0x00000001 - .4byte 0x00000606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060808 - .4byte 0x0A0C0A08 - .4byte 0x08000000 - -.global GXEurgb60Hz480IntDf -GXEurgb60Hz480IntDf: - - .4byte 0x00000014 - .4byte 0x028001E0 - .4byte 0x01E00028 - .4byte 0x00000280 - .4byte 0x01E00000 - .4byte 0x00000001 - .4byte 0x00000606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060808 - .4byte 0x0A0C0A08 - .4byte 0x08000000 diff --git a/asm/gx/GXFrameBuf_8055e5b0.s b/asm/gx/GXFrameBuf_8055e5b0.s deleted file mode 100644 index 136ad9bf..00000000 --- a/asm/gx/GXFrameBuf_8055e5b0.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@2195" -"@2195": - - .4byte 0x43800000 - .4byte 0 diff --git a/asm/gx/GXGeometry_80034ff0.s b/asm/gx/GXGeometry.s similarity index 100% rename from asm/gx/GXGeometry_80034ff0.s rename to asm/gx/GXGeometry.s diff --git a/asm/gx/GXInit_80031c20.s b/asm/gx/GXInit.s similarity index 93% rename from asm/gx/GXInit_80031c20.s rename to asm/gx/GXInit.s index 8fb35db7..6cd9ff5a 100644 --- a/asm/gx/GXInit_80031c20.s +++ b/asm/gx/GXInit.s @@ -1204,3 +1204,261 @@ lbl_80032CA8: /* 80032DA4 0002EBE4 7C 08 03 A6 */ mtlr r0 /* 80032DA8 0002EBE8 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80032DAC 0002EBEC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@1_80430800" +"@1_80430800": + + .4byte 0x3C3C2052 + .4byte 0x564C5F53 + .4byte 0x444B202D + .4byte 0x20475820 + .4byte 0x0972656C + .4byte 0x65617365 + .4byte 0x20627569 + .4byte 0x6C643A20 + .4byte 0x41756720 + .4byte 0x32332032 + .4byte 0x30313020 + .4byte 0x31373A33 + .4byte 0x323A3530 + .4byte 0x20283078 + .4byte 0x34333032 + .4byte 0x5F313435 + .4byte 0x29203E3E + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000A + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0 + .4byte 0x0000000C + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000E + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000F + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000010 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000011 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000012 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000013 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000014 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xC0000000 + .4byte 0 + .4byte 0 + +.global GXTexRegionAddrTable +GXTexRegionAddrTable: + + .4byte 0 + .4byte 0x00010000 + .4byte 0x00020000 + .4byte 0x00030000 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00008000 + .4byte 0x00018000 + .4byte 0x00028000 + .4byte 0x00038000 + .4byte 0x00048000 + .4byte 0x00058000 + .4byte 0x00068000 + .4byte 0x00078000 + .4byte 0 + .4byte 0x00090000 + .4byte 0x00020000 + .4byte 0x000B0000 + .4byte 0x00040000 + .4byte 0x00098000 + .4byte 0x00060000 + .4byte 0x000B8000 + .4byte 0x00080000 + .4byte 0x00010000 + .4byte 0x000A0000 + .4byte 0x00030000 + .4byte 0x00088000 + .4byte 0x00050000 + .4byte 0x000A8000 + .4byte 0x00070000 + .4byte 0 + .4byte 0x00090000 + .4byte 0x00020000 + .4byte 0x000B0000 + .4byte 0x00040000 + .4byte 0x00090000 + .4byte 0x00060000 + .4byte 0x000B0000 + .4byte 0x00080000 + .4byte 0x00010000 + .4byte 0x000A0000 + .4byte 0x00030000 + .4byte 0x00080000 + .4byte 0x00050000 + .4byte 0x000A0000 + .4byte 0x00070000 + +.global GXShutdownFuncInfo +GXShutdownFuncInfo: + + .4byte __GXShutdown + .4byte 0x0000007F + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global FifoObj +FifoObj: + .skip 0x80 + +.global gxData +gxData: + .skip 0x600 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global __GXVersion +__GXVersion: + + .4byte "@1_80430800" + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global __piReg +__piReg: + .skip 0x4 + +.global __cpReg +__cpReg: + .skip 0x4 + +.global __peReg +__peReg: + .skip 0x4 + +.global __memReg +__memReg: + .skip 0x4 + +.global "@LOCAL@__GXShutdown__FiUl@peCount" +"@LOCAL@__GXShutdown__FiUl@peCount": + .skip 0x8 + +.global "@LOCAL@__GXShutdown__FiUl@time@0" +"@LOCAL@__GXShutdown__FiUl@time@0": + .skip 0x4 + +.global lbl_8055C9EC +lbl_8055C9EC: + .skip 0x4 + +.global "@LOCAL@__GXShutdown__FiUl@calledOnce@1" +"@LOCAL@__GXShutdown__FiUl@calledOnce@1": + .skip 0x4 + +.global "@LOCAL@GXInit__FPvUl@shutdownFuncRegistered" +"@LOCAL@GXInit__FPvUl@shutdownFuncRegistered": + .skip 0x4 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global __GXData +__GXData: + + .4byte gxData + +.global "@2712" +"@2712": + + .4byte 0x4B800000 + +.global "@2713" +"@2713": + + .4byte 0 + +.global "@2366" +"@2366": + + .4byte 0x404040FF + +.global "@2370" +"@2370": + + .4byte 0xFFFFFFFF + +.global "@2746_8055E59C" +"@2746_8055E59C": + + .4byte 0x3F800000 + +.global "@2747_8055E5A0" +"@2747_8055E5A0": + + .4byte 0x3DCCCCCD + .4byte 0 + +.global "@2750_8055E5A8" +"@2750_8055E5A8": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/gx/GXInit_80430800.s b/asm/gx/GXInit_80430800.s deleted file mode 100644 index 416e4266..00000000 --- a/asm/gx/GXInit_80430800.s +++ /dev/null @@ -1,158 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@1_80430800" -"@1_80430800": - - .4byte 0x3C3C2052 - .4byte 0x564C5F53 - .4byte 0x444B202D - .4byte 0x20475820 - .4byte 0x0972656C - .4byte 0x65617365 - .4byte 0x20627569 - .4byte 0x6C643A20 - .4byte 0x41756720 - .4byte 0x32332032 - .4byte 0x30313020 - .4byte 0x31373A33 - .4byte 0x323A3530 - .4byte 0x20283078 - .4byte 0x34333032 - .4byte 0x5F313435 - .4byte 0x29203E3E - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0x00000009 - .4byte 0x00000001 - .4byte 0x00000004 - .4byte 0 - .4byte 0x0000000A - .4byte 0 - .4byte 0x00000004 - .4byte 0 - .4byte 0x0000000B - .4byte 0x00000001 - .4byte 0x00000005 - .4byte 0 - .4byte 0x0000000C - .4byte 0x00000001 - .4byte 0x00000005 - .4byte 0 - .4byte 0x0000000D - .4byte 0x00000001 - .4byte 0x00000004 - .4byte 0 - .4byte 0x0000000E - .4byte 0x00000001 - .4byte 0x00000004 - .4byte 0 - .4byte 0x0000000F - .4byte 0x00000001 - .4byte 0x00000004 - .4byte 0 - .4byte 0x00000010 - .4byte 0x00000001 - .4byte 0x00000004 - .4byte 0 - .4byte 0x00000011 - .4byte 0x00000001 - .4byte 0x00000004 - .4byte 0 - .4byte 0x00000012 - .4byte 0x00000001 - .4byte 0x00000004 - .4byte 0 - .4byte 0x00000013 - .4byte 0x00000001 - .4byte 0x00000004 - .4byte 0 - .4byte 0x00000014 - .4byte 0x00000001 - .4byte 0x00000004 - .4byte 0 - .4byte 0x000000FF - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x3F800000 - .4byte 0 - .4byte 0x3F800000 - .4byte 0 - .4byte 0xBF800000 - .4byte 0xC0000000 - .4byte 0 - .4byte 0 - -.global GXTexRegionAddrTable -GXTexRegionAddrTable: - - .4byte 0 - .4byte 0x00010000 - .4byte 0x00020000 - .4byte 0x00030000 - .4byte 0x00040000 - .4byte 0x00050000 - .4byte 0x00060000 - .4byte 0x00070000 - .4byte 0x00008000 - .4byte 0x00018000 - .4byte 0x00028000 - .4byte 0x00038000 - .4byte 0x00048000 - .4byte 0x00058000 - .4byte 0x00068000 - .4byte 0x00078000 - .4byte 0 - .4byte 0x00090000 - .4byte 0x00020000 - .4byte 0x000B0000 - .4byte 0x00040000 - .4byte 0x00098000 - .4byte 0x00060000 - .4byte 0x000B8000 - .4byte 0x00080000 - .4byte 0x00010000 - .4byte 0x000A0000 - .4byte 0x00030000 - .4byte 0x00088000 - .4byte 0x00050000 - .4byte 0x000A8000 - .4byte 0x00070000 - .4byte 0 - .4byte 0x00090000 - .4byte 0x00020000 - .4byte 0x000B0000 - .4byte 0x00040000 - .4byte 0x00090000 - .4byte 0x00060000 - .4byte 0x000B0000 - .4byte 0x00080000 - .4byte 0x00010000 - .4byte 0x000A0000 - .4byte 0x00030000 - .4byte 0x00080000 - .4byte 0x00050000 - .4byte 0x000A0000 - .4byte 0x00070000 - -.global GXShutdownFuncInfo -GXShutdownFuncInfo: - - .4byte __GXShutdown - .4byte 0x0000007F - .4byte 0 - .4byte 0 diff --git a/asm/gx/GXInit_8049a700.s b/asm/gx/GXInit_8049a700.s deleted file mode 100644 index 3beff9d2..00000000 --- a/asm/gx/GXInit_8049a700.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global FifoObj -FifoObj: - .skip 0x80 - -.global gxData -gxData: - .skip 0x600 diff --git a/asm/gx/GXInit_80556568.s b/asm/gx/GXInit_80556568.s deleted file mode 100644 index 52d7ea78..00000000 --- a/asm/gx/GXInit_80556568.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global __GXVersion -__GXVersion: - - .4byte "@1_80430800" - .4byte 0 diff --git a/asm/gx/GXInit_8055c9d0.s b/asm/gx/GXInit_8055c9d0.s deleted file mode 100644 index aca1536b..00000000 --- a/asm/gx/GXInit_8055c9d0.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global __piReg -__piReg: - .skip 0x4 - -.global __cpReg -__cpReg: - .skip 0x4 - -.global __peReg -__peReg: - .skip 0x4 - -.global __memReg -__memReg: - .skip 0x4 - -.global "@LOCAL@__GXShutdown__FiUl@peCount" -"@LOCAL@__GXShutdown__FiUl@peCount": - .skip 0x8 - -.global "@LOCAL@__GXShutdown__FiUl@time@0" -"@LOCAL@__GXShutdown__FiUl@time@0": - .skip 0x4 - -.global lbl_8055C9EC -lbl_8055C9EC: - .skip 0x4 - -.global "@LOCAL@__GXShutdown__FiUl@calledOnce@1" -"@LOCAL@__GXShutdown__FiUl@calledOnce@1": - .skip 0x4 - -.global "@LOCAL@GXInit__FPvUl@shutdownFuncRegistered" -"@LOCAL@GXInit__FPvUl@shutdownFuncRegistered": - .skip 0x4 diff --git a/asm/gx/GXInit_8055e588.s b/asm/gx/GXInit_8055e588.s deleted file mode 100644 index 897c09a8..00000000 --- a/asm/gx/GXInit_8055e588.s +++ /dev/null @@ -1,44 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global __GXData -__GXData: - - .4byte gxData - -.global "@2712" -"@2712": - - .4byte 0x4B800000 - -.global "@2713" -"@2713": - - .4byte 0 - -.global "@2366" -"@2366": - - .4byte 0x404040FF - -.global "@2370" -"@2370": - - .4byte 0xFFFFFFFF - -.global "@2746_8055E59C" -"@2746_8055E59C": - - .4byte 0x3F800000 - -.global "@2747_8055E5A0" -"@2747_8055E5A0": - - .4byte 0x3DCCCCCD - .4byte 0 - -.global "@2750_8055E5A8" -"@2750_8055E5A8": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/gx/GXLight_80035e50.s b/asm/gx/GXLight.s similarity index 97% rename from asm/gx/GXLight_80035e50.s rename to asm/gx/GXLight.s index 4aa3fe01..3c5d7210 100644 --- a/asm/gx/GXLight_80035e50.s +++ b/asm/gx/GXLight.s @@ -579,3 +579,71 @@ lbl_80036598: /* 800365B4 000323F4 00 00 00 00 */ .4byte 0x00000000 /* 800365B8 000323F8 00 00 00 00 */ .4byte 0x00000000 /* 800365BC 000323FC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@2975" +"@2975": + + .4byte 0 + +.global "@2976" +"@2976": + + .4byte 0x42B40000 + +.global "@2977" +"@2977": + + .4byte 0x40490FDB + +.global "@2978" +"@2978": + + .4byte 0x43340000 + +.global "@2979" +"@2979": + + .4byte 0xC47A0000 + +.global "@2980" +"@2980": + + .4byte 0x447A0000 + +.global "@2981" +"@2981": + + .4byte 0x3F800000 + +.global "@2982_8055E5D4" +"@2982_8055E5D4": + + .4byte 0x40000000 + +.global "@2983" +"@2983": + + .4byte 0xC0800000 + +.global "@2984" +"@2984": + + .4byte 0x40800000 + +.global "@2985" +"@2985": + + .4byte 0xC0000000 + +.global "@2997" +"@2997": + + .4byte 0x3F000000 + +.global "@3017_8055E5E8" +"@3017_8055E5E8": + + .4byte 0xDD5E0B6B + .4byte 0 diff --git a/asm/gx/GXLight_8055e5b8.s b/asm/gx/GXLight_8055e5b8.s deleted file mode 100644 index eec2dfd7..00000000 --- a/asm/gx/GXLight_8055e5b8.s +++ /dev/null @@ -1,68 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@2975" -"@2975": - - .4byte 0 - -.global "@2976" -"@2976": - - .4byte 0x42B40000 - -.global "@2977" -"@2977": - - .4byte 0x40490FDB - -.global "@2978" -"@2978": - - .4byte 0x43340000 - -.global "@2979" -"@2979": - - .4byte 0xC47A0000 - -.global "@2980" -"@2980": - - .4byte 0x447A0000 - -.global "@2981" -"@2981": - - .4byte 0x3F800000 - -.global "@2982_8055E5D4" -"@2982_8055E5D4": - - .4byte 0x40000000 - -.global "@2983" -"@2983": - - .4byte 0xC0800000 - -.global "@2984" -"@2984": - - .4byte 0x40800000 - -.global "@2985" -"@2985": - - .4byte 0xC0000000 - -.global "@2997" -"@2997": - - .4byte 0x3F000000 - -.global "@3017_8055E5E8" -"@3017_8055E5E8": - - .4byte 0xDD5E0B6B - .4byte 0 diff --git a/asm/gx/GXMisc_80034710.s b/asm/gx/GXMisc.s similarity index 99% rename from asm/gx/GXMisc_80034710.s rename to asm/gx/GXMisc.s index 2a1bd4cc..1c450d11 100644 --- a/asm/gx/GXMisc_80034710.s +++ b/asm/gx/GXMisc.s @@ -663,3 +663,21 @@ __GXPEInit: /* 80034FE4 00030E24 00 00 00 00 */ .4byte 0x00000000 /* 80034FE8 00030E28 00 00 00 00 */ .4byte 0x00000000 /* 80034FEC 00030E2C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global FinishQueue +FinishQueue: + .skip 0x8 + +.global DrawDone +DrawDone: + .skip 0x4 + +.global DrawDoneCB +DrawDoneCB: + .skip 0x4 + +.global TokenCB +TokenCB: + .skip 0x8 diff --git a/asm/gx/GXMisc_8055ca18.s b/asm/gx/GXMisc_8055ca18.s deleted file mode 100644 index 6433faac..00000000 --- a/asm/gx/GXMisc_8055ca18.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global FinishQueue -FinishQueue: - .skip 0x8 - -.global DrawDone -DrawDone: - .skip 0x4 - -.global DrawDoneCB -DrawDoneCB: - .skip 0x4 - -.global TokenCB -TokenCB: - .skip 0x8 diff --git a/asm/gx/GXPerf_800390c0.s b/asm/gx/GXPerf.s similarity index 95% rename from asm/gx/GXPerf_800390c0.s rename to asm/gx/GXPerf.s index a03f7265..e253b4dd 100644 --- a/asm/gx/GXPerf_800390c0.s +++ b/asm/gx/GXPerf.s @@ -720,3 +720,71 @@ GXClearGPMetric: /* 800398E4 00035724 38 00 00 04 */ li r0, 0x4 /* 800398E8 00035728 B0 03 00 04 */ sth r0, 0x4(r3) /* 800398EC 0003572C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@3023" +"@3023": + + .4byte lbl_80039600 + .4byte lbl_8003961C + .4byte lbl_80039638 + .4byte lbl_80039654 + .4byte lbl_800396A8 + .4byte lbl_800396C4 + .4byte lbl_800396E0 + .4byte lbl_800396FC + .4byte lbl_80039670 + .4byte lbl_80039718 + .4byte lbl_80039748 + .4byte lbl_80039778 + .4byte lbl_800397A8 + .4byte lbl_800397D8 + .4byte lbl_80039808 + .4byte lbl_80039838 + .4byte lbl_80039868 + .4byte lbl_80039894 + .4byte lbl_800398A4 + .4byte lbl_800398B4 + .4byte lbl_800398C4 + .4byte lbl_8003968C + +.global "@3022" +"@3022": + + .4byte lbl_800391DC + .4byte lbl_800391FC + .4byte lbl_8003921C + .4byte lbl_8003923C + .4byte lbl_8003925C + .4byte lbl_8003927C + .4byte lbl_8003929C + .4byte lbl_800392BC + .4byte lbl_800392DC + .4byte lbl_800392FC + .4byte lbl_8003933C + .4byte lbl_8003935C + .4byte lbl_80039378 + .4byte lbl_80039394 + .4byte lbl_800393B0 + .4byte lbl_800393CC + .4byte lbl_800393E8 + .4byte lbl_80039404 + .4byte lbl_80039420 + .4byte lbl_8003943C + .4byte lbl_80039458 + .4byte lbl_80039474 + .4byte lbl_80039490 + .4byte lbl_800394AC + .4byte lbl_800394C8 + .4byte lbl_800394E4 + .4byte lbl_80039500 + .4byte lbl_8003951C + .4byte lbl_80039538 + .4byte lbl_80039554 + .4byte lbl_80039570 + .4byte lbl_8003958C + .4byte lbl_800395A8 + .4byte lbl_800395C4 + .4byte lbl_8003931C + .4byte 0 diff --git a/asm/gx/GXPerf_80431010.s b/asm/gx/GXPerf_80431010.s deleted file mode 100644 index d8ee922c..00000000 --- a/asm/gx/GXPerf_80431010.s +++ /dev/null @@ -1,68 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@3023" -"@3023": - - .4byte lbl_80039600 - .4byte lbl_8003961C - .4byte lbl_80039638 - .4byte lbl_80039654 - .4byte lbl_800396A8 - .4byte lbl_800396C4 - .4byte lbl_800396E0 - .4byte lbl_800396FC - .4byte lbl_80039670 - .4byte lbl_80039718 - .4byte lbl_80039748 - .4byte lbl_80039778 - .4byte lbl_800397A8 - .4byte lbl_800397D8 - .4byte lbl_80039808 - .4byte lbl_80039838 - .4byte lbl_80039868 - .4byte lbl_80039894 - .4byte lbl_800398A4 - .4byte lbl_800398B4 - .4byte lbl_800398C4 - .4byte lbl_8003968C - -.global "@3022" -"@3022": - - .4byte lbl_800391DC - .4byte lbl_800391FC - .4byte lbl_8003921C - .4byte lbl_8003923C - .4byte lbl_8003925C - .4byte lbl_8003927C - .4byte lbl_8003929C - .4byte lbl_800392BC - .4byte lbl_800392DC - .4byte lbl_800392FC - .4byte lbl_8003933C - .4byte lbl_8003935C - .4byte lbl_80039378 - .4byte lbl_80039394 - .4byte lbl_800393B0 - .4byte lbl_800393CC - .4byte lbl_800393E8 - .4byte lbl_80039404 - .4byte lbl_80039420 - .4byte lbl_8003943C - .4byte lbl_80039458 - .4byte lbl_80039474 - .4byte lbl_80039490 - .4byte lbl_800394AC - .4byte lbl_800394C8 - .4byte lbl_800394E4 - .4byte lbl_80039500 - .4byte lbl_8003951C - .4byte lbl_80039538 - .4byte lbl_80039554 - .4byte lbl_80039570 - .4byte lbl_8003958C - .4byte lbl_800395A8 - .4byte lbl_800395C4 - .4byte lbl_8003931C - .4byte 0 diff --git a/asm/gx/GXPixel_80038290.s b/asm/gx/GXPixel.s similarity index 96% rename from asm/gx/GXPixel_80038290.s rename to asm/gx/GXPixel.s index 400ccc40..8eedeac0 100644 --- a/asm/gx/GXPixel_80038290.s +++ b/asm/gx/GXPixel.s @@ -563,3 +563,87 @@ GXSetFieldMode: /* 80038A44 00034884 7C 08 03 A6 */ mtlr r0 /* 80038A48 00034888 38 21 00 20 */ addi r1, r1, 0x20 /* 80038A4C 0003488C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@LOCAL@GXSetPixelFmt__F11_GXPixelFmt9_GXZFmt16@p2f" +"@LOCAL@GXSetPixelFmt__F11_GXPixelFmt9_GXZFmt16@p2f": + + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000005 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@2990" +"@2990": + + .4byte 0 + +.global "@2991" +"@2991": + + .4byte 0x3F800000 + +.global "@2992" +"@2992": + + .4byte 0x3F000000 + .4byte 0 + +.global "@2993" +"@2993": + + .4byte 0x3FF00000 + .4byte 0 + +.global "@2994_8055E648" +"@2994_8055E648": + + .4byte 0x40000000 + .4byte 0 + +.global "@2995" +"@2995": + + .4byte 0x3FE00000 + .4byte 0 + +.global "@2996" +"@2996": + + .4byte 0x4B00001E + .4byte 0 + +.global "@2999" +"@2999": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@3011_8055E668" +"@3011_8055E668": + + .4byte 0 + .4byte 0 + +.global "@3012_8055E670" +"@3012_8055E670": + + .4byte 0x3FDDB3D0 + +.global "@3013_8055E674" +"@3013_8055E674": + + .4byte 0x43800000 + +.global "@3017_8055E678" +"@3017_8055E678": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/gx/GXPixel_80430ff0.s b/asm/gx/GXPixel_80430ff0.s deleted file mode 100644 index b87c5cdd..00000000 --- a/asm/gx/GXPixel_80430ff0.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@LOCAL@GXSetPixelFmt__F11_GXPixelFmt9_GXZFmt16@p2f" -"@LOCAL@GXSetPixelFmt__F11_GXPixelFmt9_GXZFmt16@p2f": - - .4byte 0 - .4byte 0x00000001 - .4byte 0x00000002 - .4byte 0x00000003 - .4byte 0x00000004 - .4byte 0x00000004 - .4byte 0x00000004 - .4byte 0x00000005 diff --git a/asm/gx/GXPixel_8055e630.s b/asm/gx/GXPixel_8055e630.s deleted file mode 100644 index 04189522..00000000 --- a/asm/gx/GXPixel_8055e630.s +++ /dev/null @@ -1,70 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@2990" -"@2990": - - .4byte 0 - -.global "@2991" -"@2991": - - .4byte 0x3F800000 - -.global "@2992" -"@2992": - - .4byte 0x3F000000 - .4byte 0 - -.global "@2993" -"@2993": - - .4byte 0x3FF00000 - .4byte 0 - -.global "@2994_8055E648" -"@2994_8055E648": - - .4byte 0x40000000 - .4byte 0 - -.global "@2995" -"@2995": - - .4byte 0x3FE00000 - .4byte 0 - -.global "@2996" -"@2996": - - .4byte 0x4B00001E - .4byte 0 - -.global "@2999" -"@2999": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@3011_8055E668" -"@3011_8055E668": - - .4byte 0 - .4byte 0 - -.global "@3012_8055E670" -"@3012_8055E670": - - .4byte 0x3FDDB3D0 - -.global "@3013_8055E674" -"@3013_8055E674": - - .4byte 0x43800000 - -.global "@3017_8055E678" -"@3017_8055E678": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/gx/GXTev_80037bc0.s b/asm/gx/GXTev.s similarity index 96% rename from asm/gx/GXTev_80037bc0.s rename to asm/gx/GXTev.s index 4d9a4663..eb04388b 100644 --- a/asm/gx/GXTev_80037bc0.s +++ b/asm/gx/GXTev.s @@ -519,3 +519,43 @@ GXSetNumTevStages: /* 80038284 000340C4 00 00 00 00 */ .4byte 0x00000000 /* 80038288 000340C8 00 00 00 00 */ .4byte 0x00000000 /* 8003828C 000340CC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global TEVCOpTableST0 +TEVCOpTableST0: + + .4byte 0xC008F8AF + .4byte 0xC008A89F + .4byte 0xC008AC8F + .4byte 0xC008FFF8 + .4byte 0xC008FFFA + .4byte 0xC008F80F + .4byte 0xC008089F + .4byte 0xC0080C8F + .4byte 0xC008FFF8 + .4byte 0xC008FFF0 + .4byte 0xC108F2F0 + .4byte 0xC108FFD0 + .4byte 0xC108F2F0 + .4byte 0xC108FFC0 + .4byte 0xC108FFD0 + .4byte 0xC108F070 + .4byte 0xC108FF80 + .4byte 0xC108F070 + .4byte 0xC108FFC0 + .4byte 0xC108FF80 + +.global "@LOCAL@GXSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID@c2r" +"@LOCAL@GXSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID@c2r": + + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000007 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0 diff --git a/asm/gx/GXTev_80430f78.s b/asm/gx/GXTev_80430f78.s deleted file mode 100644 index 8d3f102f..00000000 --- a/asm/gx/GXTev_80430f78.s +++ /dev/null @@ -1,40 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global TEVCOpTableST0 -TEVCOpTableST0: - - .4byte 0xC008F8AF - .4byte 0xC008A89F - .4byte 0xC008AC8F - .4byte 0xC008FFF8 - .4byte 0xC008FFFA - .4byte 0xC008F80F - .4byte 0xC008089F - .4byte 0xC0080C8F - .4byte 0xC008FFF8 - .4byte 0xC008FFF0 - .4byte 0xC108F2F0 - .4byte 0xC108FFD0 - .4byte 0xC108F2F0 - .4byte 0xC108FFC0 - .4byte 0xC108FFD0 - .4byte 0xC108F070 - .4byte 0xC108FF80 - .4byte 0xC108F070 - .4byte 0xC108FFC0 - .4byte 0xC108FF80 - -.global "@LOCAL@GXSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID@c2r" -"@LOCAL@GXSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID@c2r": - - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0x00000001 - .4byte 0x00000007 - .4byte 0x00000005 - .4byte 0x00000006 - .4byte 0 diff --git a/asm/gx/GXTexture_800365c0.s b/asm/gx/GXTexture.s similarity index 93% rename from asm/gx/GXTexture_800365c0.s rename to asm/gx/GXTexture.s index bf31bfb2..923125f4 100644 --- a/asm/gx/GXTexture_800365c0.s +++ b/asm/gx/GXTexture.s @@ -1347,3 +1347,271 @@ lbl_80037760: /* 80037764 000335A4 83 C1 00 08 */ lwz r30, 0x8(r1) /* 80037768 000335A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8003776C 000335AC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@2689_80430D50" +"@2689_80430D50": + + .4byte lbl_800365E0 + .4byte lbl_800365EC + .4byte lbl_800365EC + .4byte lbl_800365F8 + .4byte lbl_800365F8 + .4byte lbl_800365F8 + .4byte lbl_800365F8 + .4byte lbl_80036604 + .4byte lbl_800365E0 + .4byte lbl_800365EC + .4byte lbl_800365F8 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_800365E0 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_800365EC + .4byte lbl_80036604 + .4byte lbl_800365F8 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_800365F8 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_800365E0 + .4byte lbl_80036604 + .4byte lbl_800365EC + .4byte lbl_800365F8 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_800365EC + .4byte lbl_800365EC + .4byte lbl_800365EC + .4byte lbl_800365EC + .4byte lbl_800365F8 + .4byte lbl_800365F8 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_800365E0 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_80036604 + .4byte lbl_800365EC + .4byte lbl_800365EC + .4byte lbl_80036604 + .4byte lbl_800365F8 + +.global "@2732" +"@2732": + + .4byte lbl_80036710 + .4byte lbl_8003671C + .4byte lbl_8003671C + .4byte lbl_80036728 + .4byte lbl_80036728 + .4byte lbl_80036728 + .4byte lbl_80036728 + .4byte lbl_80036734 + .4byte lbl_80036710 + .4byte lbl_8003671C + .4byte lbl_80036728 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036710 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_8003671C + .4byte lbl_80036734 + .4byte lbl_80036728 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036728 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036710 + .4byte lbl_80036734 + .4byte lbl_8003671C + .4byte lbl_80036728 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_8003671C + .4byte lbl_8003671C + .4byte lbl_8003671C + .4byte lbl_8003671C + .4byte lbl_80036728 + .4byte lbl_80036728 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036710 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_80036734 + .4byte lbl_8003671C + .4byte lbl_8003671C + .4byte lbl_80036734 + .4byte lbl_80036728 + +.global "@2762" +"@2762": + + .4byte lbl_800368F4 + .4byte lbl_80036908 + .4byte lbl_80036908 + .4byte lbl_8003691C + .4byte lbl_8003691C + .4byte lbl_8003691C + .4byte lbl_80036930 + .4byte lbl_80036958 + .4byte lbl_800368F4 + .4byte lbl_80036908 + .4byte lbl_8003691C + .4byte lbl_80036958 + .4byte lbl_80036958 + .4byte lbl_80036958 + .4byte lbl_80036944 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global GXTexMode0Ids +GXTexMode0Ids: + + .4byte 0x80818283 + .4byte 0xA0A1A2A3 + +.global GXTexMode1Ids +GXTexMode1Ids: + + .4byte 0x84858687 + .4byte 0xA4A5A6A7 + +.global GXTexImage0Ids +GXTexImage0Ids: + + .4byte 0x88898A8B + .4byte 0xA8A9AAAB + +.global GXTexImage1Ids +GXTexImage1Ids: + + .4byte 0x8C8D8E8F + .4byte 0xACADAEAF + +.global GXTexImage2Ids +GXTexImage2Ids: + + .4byte 0x90919293 + .4byte 0xB0B1B2B3 + +.global GXTexImage3Ids +GXTexImage3Ids: + + .4byte 0x94959697 + .4byte 0xB4B5B6B7 + +.global GXTexTlutIds +GXTexTlutIds: + + .4byte 0x98999A9B + .4byte 0xB8B9BABB + +.global GX2HWFiltConv +GX2HWFiltConv: + + .4byte 0x00040105 + .4byte 0x02060000 + +.global HW2GXFiltConv +HW2GXFiltConv: + + .4byte 0x00020400 + .4byte 0x01030500 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@2756_8055E5F0" +"@2756_8055E5F0": + + .4byte 0x41800000 + .4byte 0 + +.global "@2760" +"@2760": + + .4byte 0x43300000 + .4byte 0 + +.global "@2784" +"@2784": + + .4byte 0xC0800000 + +.global "@2785" +"@2785": + + .4byte 0x407F5C29 + +.global "@2786_8055E608" +"@2786_8055E608": + + .4byte 0x40800000 + +.global "@2787_8055E60C" +"@2787_8055E60C": + + .4byte 0x42000000 + +.global "@2788_8055E610" +"@2788_8055E610": + + .4byte 0 + +.global "@2789" +"@2789": + + .4byte 0x41200000 + +.global "@2862" +"@2862": + + .4byte 0x3D800000 + +.global "@2863" +"@2863": + + .4byte 0x3D000000 + +.global "@2875" +"@2875": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/gx/GXTexture_80430d50.s b/asm/gx/GXTexture_80430d50.s deleted file mode 100644 index 064b0944..00000000 --- a/asm/gx/GXTexture_80430d50.s +++ /dev/null @@ -1,152 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@2689_80430D50" -"@2689_80430D50": - - .4byte lbl_800365E0 - .4byte lbl_800365EC - .4byte lbl_800365EC - .4byte lbl_800365F8 - .4byte lbl_800365F8 - .4byte lbl_800365F8 - .4byte lbl_800365F8 - .4byte lbl_80036604 - .4byte lbl_800365E0 - .4byte lbl_800365EC - .4byte lbl_800365F8 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_800365E0 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_800365EC - .4byte lbl_80036604 - .4byte lbl_800365F8 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_800365F8 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_800365E0 - .4byte lbl_80036604 - .4byte lbl_800365EC - .4byte lbl_800365F8 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_800365EC - .4byte lbl_800365EC - .4byte lbl_800365EC - .4byte lbl_800365EC - .4byte lbl_800365F8 - .4byte lbl_800365F8 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_800365E0 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_80036604 - .4byte lbl_800365EC - .4byte lbl_800365EC - .4byte lbl_80036604 - .4byte lbl_800365F8 - -.global "@2732" -"@2732": - - .4byte lbl_80036710 - .4byte lbl_8003671C - .4byte lbl_8003671C - .4byte lbl_80036728 - .4byte lbl_80036728 - .4byte lbl_80036728 - .4byte lbl_80036728 - .4byte lbl_80036734 - .4byte lbl_80036710 - .4byte lbl_8003671C - .4byte lbl_80036728 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036710 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_8003671C - .4byte lbl_80036734 - .4byte lbl_80036728 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036728 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036710 - .4byte lbl_80036734 - .4byte lbl_8003671C - .4byte lbl_80036728 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_8003671C - .4byte lbl_8003671C - .4byte lbl_8003671C - .4byte lbl_8003671C - .4byte lbl_80036728 - .4byte lbl_80036728 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036710 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_80036734 - .4byte lbl_8003671C - .4byte lbl_8003671C - .4byte lbl_80036734 - .4byte lbl_80036728 - -.global "@2762" -"@2762": - - .4byte lbl_800368F4 - .4byte lbl_80036908 - .4byte lbl_80036908 - .4byte lbl_8003691C - .4byte lbl_8003691C - .4byte lbl_8003691C - .4byte lbl_80036930 - .4byte lbl_80036958 - .4byte lbl_800368F4 - .4byte lbl_80036908 - .4byte lbl_8003691C - .4byte lbl_80036958 - .4byte lbl_80036958 - .4byte lbl_80036958 - .4byte lbl_80036944 - .4byte 0 diff --git a/asm/gx/GXTexture_80556580.s b/asm/gx/GXTexture_80556580.s deleted file mode 100644 index 6fab068d..00000000 --- a/asm/gx/GXTexture_80556580.s +++ /dev/null @@ -1,56 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global GXTexMode0Ids -GXTexMode0Ids: - - .4byte 0x80818283 - .4byte 0xA0A1A2A3 - -.global GXTexMode1Ids -GXTexMode1Ids: - - .4byte 0x84858687 - .4byte 0xA4A5A6A7 - -.global GXTexImage0Ids -GXTexImage0Ids: - - .4byte 0x88898A8B - .4byte 0xA8A9AAAB - -.global GXTexImage1Ids -GXTexImage1Ids: - - .4byte 0x8C8D8E8F - .4byte 0xACADAEAF - -.global GXTexImage2Ids -GXTexImage2Ids: - - .4byte 0x90919293 - .4byte 0xB0B1B2B3 - -.global GXTexImage3Ids -GXTexImage3Ids: - - .4byte 0x94959697 - .4byte 0xB4B5B6B7 - -.global GXTexTlutIds -GXTexTlutIds: - - .4byte 0x98999A9B - .4byte 0xB8B9BABB - -.global GX2HWFiltConv -GX2HWFiltConv: - - .4byte 0x00040105 - .4byte 0x02060000 - -.global HW2GXFiltConv -HW2GXFiltConv: - - .4byte 0x00020400 - .4byte 0x01030500 diff --git a/asm/gx/GXTexture_8055e5f0.s b/asm/gx/GXTexture_8055e5f0.s deleted file mode 100644 index f612c4bf..00000000 --- a/asm/gx/GXTexture_8055e5f0.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@2756_8055E5F0" -"@2756_8055E5F0": - - .4byte 0x41800000 - .4byte 0 - -.global "@2760" -"@2760": - - .4byte 0x43300000 - .4byte 0 - -.global "@2784" -"@2784": - - .4byte 0xC0800000 - -.global "@2785" -"@2785": - - .4byte 0x407F5C29 - -.global "@2786_8055E608" -"@2786_8055E608": - - .4byte 0x40800000 - -.global "@2787_8055E60C" -"@2787_8055E60C": - - .4byte 0x42000000 - -.global "@2788_8055E610" -"@2788_8055E610": - - .4byte 0 - -.global "@2789" -"@2789": - - .4byte 0x41200000 - -.global "@2862" -"@2862": - - .4byte 0x3D800000 - -.global "@2863" -"@2863": - - .4byte 0x3D000000 - -.global "@2875" -"@2875": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/gx/GXTransform_80038ad0.s b/asm/gx/GXTransform.s similarity index 98% rename from asm/gx/GXTransform_80038ad0.s rename to asm/gx/GXTransform.s index cb08d97f..683bed6a 100644 --- a/asm/gx/GXTransform_80038ad0.s +++ b/asm/gx/GXTransform.s @@ -445,3 +445,31 @@ lbl_800390AC: /* 800390B4 00034EF4 4E 80 00 20 */ blr /* 800390B8 00034EF8 00 00 00 00 */ .4byte 0x00000000 /* 800390BC 00034EFC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@2517" +"@2517": + + .4byte 0 + +.global "@2518" +"@2518": + + .4byte 0x3F800000 + +.global "@2519_8055E688" +"@2519_8055E688": + + .4byte 0x3F000000 + +.global "@2610" +"@2610": + + .4byte 0x43AB0000 + +.global "@2629" +"@2629": + + .4byte 0x4B7FFFFF + .4byte 0 diff --git a/asm/gx/GXTransform_8055e680.s b/asm/gx/GXTransform_8055e680.s deleted file mode 100644 index 9bdea7cb..00000000 --- a/asm/gx/GXTransform_8055e680.s +++ /dev/null @@ -1,28 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@2517" -"@2517": - - .4byte 0 - -.global "@2518" -"@2518": - - .4byte 0x3F800000 - -.global "@2519_8055E688" -"@2519_8055E688": - - .4byte 0x3F000000 - -.global "@2610" -"@2610": - - .4byte 0x43AB0000 - -.global "@2629" -"@2629": - - .4byte 0x4B7FFFFF - .4byte 0 diff --git a/obj_files.mk b/obj_files.mk index 1564af98..2161effc 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -165,22 +165,23 @@ $(BUILD_DIR)/asm/mtx/mtx44vec.o \ $(BUILD_DIR)/asm/mtx/vec.o \ $(BUILD_DIR)/asm/mtx/quat.o \ \ +$(BUILD_DIR)/asm/gx/GXInit.o \ +$(BUILD_DIR)/asm/gx/GXFifo.o \ +$(BUILD_DIR)/asm/gx/GXAttr.o \ +$(BUILD_DIR)/asm/gx/GXMisc.o \ +$(BUILD_DIR)/asm/gx/GXGeometry.o \ +$(BUILD_DIR)/asm/gx/GXFrameBuf.o \ +$(BUILD_DIR)/asm/gx/GXLight.o \ +$(BUILD_DIR)/asm/gx/GXTexture.o \ +$(BUILD_DIR)/asm/gx/GXBump.o \ +$(BUILD_DIR)/asm/gx/GXTev.o \ +$(BUILD_DIR)/asm/gx/GXPixel.o \ +$(BUILD_DIR)/asm/gx/GXDisplayList.o \ +$(BUILD_DIR)/asm/gx/GXTransform.o \ +$(BUILD_DIR)/asm/gx/GXPerf.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/gx/GXInit_80031c20.o \ -$(BUILD_DIR)/asm/gx/GXFifo_80032db0.o \ -$(BUILD_DIR)/asm/gx/GXAttr_800337a0.o \ -$(BUILD_DIR)/asm/gx/GXMisc_80034710.o \ -$(BUILD_DIR)/asm/gx/GXGeometry_80034ff0.o \ -$(BUILD_DIR)/asm/gx/GXFrameBuf_80035600.o \ -$(BUILD_DIR)/asm/gx/GXLight_80035e50.o \ -$(BUILD_DIR)/asm/gx/GXTexture_800365c0.o \ -$(BUILD_DIR)/asm/gx/GXBump_80037770.o \ -$(BUILD_DIR)/asm/gx/GXTev_80037bc0.o \ -$(BUILD_DIR)/asm/gx/GXPixel_80038290.o \ -$(BUILD_DIR)/asm/gx/GXDisplayList_80038a50.o \ -$(BUILD_DIR)/asm/gx/GXTransform_80038ad0.o \ -$(BUILD_DIR)/asm/gx/GXPerf_800390c0.o \ $(BUILD_DIR)/asm/dvd/dvdfs_800398f0.o \ $(BUILD_DIR)/asm/dvd/dvd_8003a140.o \ $(BUILD_DIR)/asm/dvd/dvdqueue_8003f050.o \ @@ -3222,14 +3223,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \ $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \ $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \ -$(BUILD_DIR)/asm/gx/GXInit_80430800.o \ -$(BUILD_DIR)/asm/gx/GXFifo_80430a40.o \ -$(BUILD_DIR)/asm/gx/GXAttr_80430a70.o \ -$(BUILD_DIR)/asm/gx/GXFrameBuf_80430c60.o \ -$(BUILD_DIR)/asm/gx/GXTexture_80430d50.o \ -$(BUILD_DIR)/asm/gx/GXTev_80430f78.o \ -$(BUILD_DIR)/asm/gx/GXPixel_80430ff0.o \ -$(BUILD_DIR)/asm/gx/GXPerf_80431010.o \ $(BUILD_DIR)/asm/dvd/dvdfs_804310f8.o \ $(BUILD_DIR)/asm/dvd/dvd_80431260.o \ $(BUILD_DIR)/asm/dvd/dvderror_804316a8.o \ @@ -5037,8 +5030,6 @@ $(BUILD_DIR)/asm/src/WaveHandle_804966b8.o \ $(BUILD_DIR)/asm/src/StorageUtil_804966d0.o \ $(BUILD_DIR)/asm/src/Alarm_804966e0.o \ $(BUILD_DIR)/asm/src/StateChanger_804966f0.o \ -$(BUILD_DIR)/asm/gx/GXInit_8049a700.o \ -$(BUILD_DIR)/asm/gx/GXFifo_8049ad80.o \ $(BUILD_DIR)/asm/dvd/dvd_8049ae00.o \ $(BUILD_DIR)/asm/dvd/dvdqueue_8049fab0.o \ $(BUILD_DIR)/asm/dvd/dvderror_8049fae0.o \ @@ -5181,9 +5172,6 @@ $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \ $(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \ $(BUILD_DIR)/asm/src/Table_80556398.o \ -$(BUILD_DIR)/asm/gx/GXInit_80556568.o \ -$(BUILD_DIR)/asm/gx/GXAttr_80556570.o \ -$(BUILD_DIR)/asm/gx/GXTexture_80556580.o \ $(BUILD_DIR)/asm/dvd/dvdfs_805565c8.o \ $(BUILD_DIR)/asm/dvd/dvd_805565d8.o \ $(BUILD_DIR)/asm/dvd/dvdFatal_805565f0.o \ @@ -5630,9 +5618,6 @@ $(BUILD_DIR)/asm/src/StepMain_8055c688.o \ $(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \ $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \ -$(BUILD_DIR)/asm/gx/GXInit_8055c9d0.o \ -$(BUILD_DIR)/asm/gx/GXFifo_8055c9f8.o \ -$(BUILD_DIR)/asm/gx/GXMisc_8055ca18.o \ $(BUILD_DIR)/asm/dvd/dvdfs_8055ca30.o \ $(BUILD_DIR)/asm/dvd/dvd_8055ca60.o \ $(BUILD_DIR)/asm/dvd/dvderror_8055caf8.o \ @@ -5858,13 +5843,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \ $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \ $(BUILD_DIR)/asm/src/Alarm_8055df68.o \ -$(BUILD_DIR)/asm/gx/GXInit_8055e588.o \ -$(BUILD_DIR)/asm/gx/GXFrameBuf_8055e5b0.o \ -$(BUILD_DIR)/asm/gx/GXLight_8055e5b8.o \ -$(BUILD_DIR)/asm/gx/GXTexture_8055e5f0.o \ -$(BUILD_DIR)/asm/gx/GXBump_8055e628.o \ -$(BUILD_DIR)/asm/gx/GXPixel_8055e630.o \ -$(BUILD_DIR)/asm/gx/GXTransform_8055e680.o \ $(BUILD_DIR)/asm/dvd/dvdFatal_8055e698.o \ $(BUILD_DIR)/asm/dvd/dvdDeviceError_8055e6a0.o \ $(BUILD_DIR)/asm/ax/AXVPB_8055e6a8.o \