PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use const bool for CGX::SetZMode 

Former-commit-id: 357658defa
This commit is contained in:
Luke Street 2023-02-06 11:22:14 -05:00
parent 38b824cda0
commit 48dc03ee11
14 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/Kyoto/Graphics/CCubeMoviePlayer.s
View File

@ -2456,7 +2456,7 @@ MyTHPGXYuv2RgbSetup__Fb:
/* 8035D2EC 0035A24C 90 E1 00 68 */ stw r7, 0x68(r1)
/* 8035D2F0 0035A250 90 C1 00 6C */ stw r6, 0x6c(r1)
/* 8035D2F4 0035A254 90 01 00 70 */ stw r0, 0x70(r1)
/* 8035D2F8 0035A258 4B FA B5 85 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 8035D2F8 0035A258 4B FA B5 85 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 8035D2FC 0035A25C 38 60 00 00 */ li r3, 0
/* 8035D300 0035A260 38 80 00 01 */ li r4, 1
/* 8035D304 0035A264 38 A0 00 00 */ li r5, 0
@ -2771,7 +2771,7 @@ MyTHPGXRestore__Fv:
/* 8035D7BC 0035A71C 38 80 00 07 */ li r4, 7
/* 8035D7C0 0035A720 90 01 00 14 */ stw r0, 0x14(r1)
/* 8035D7C4 0035A724 38 A0 00 00 */ li r5, 0
/* 8035D7C8 0035A728 4B FA B0 B5 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 8035D7C8 0035A728 4B FA B0 B5 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 8035D7CC 0035A72C 38 60 00 00 */ li r3, 0
/* 8035D7D0 0035A730 38 80 00 01 */ li r4, 1
/* 8035D7D4 0035A734 38 A0 00 00 */ li r5, 0

4
asm/Kyoto/Graphics/CGX.s
View File

@ -951,8 +951,8 @@ lbl_80308868:
/* 80308874 003057D4 38 21 00 10 */ addi r1, r1, 0x10
/* 80308878 003057D8 4E 80 00 20 */ blr
.global SetZMode__3CGXFUi10_GXCompareUi
SetZMode__3CGXFUi10_GXCompareUi:
.global SetZMode__3CGXFUc10_GXCompareUc
SetZMode__3CGXFUc10_GXCompareUc:
/* 8030887C 003057DC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80308880 003057E0 7C 08 02 A6 */ mflr r0
/* 80308884 003057E4 3C C0 80 5A */ lis r6, sGXState__3CGX@ha

4
asm/Kyoto/Graphics/DolphinCGraphics.s
View File

@ -3107,7 +3107,7 @@ SetDepthWriteMode__9CGraphicsFb8ERglEnumb:
/* 8030BAA0 00308A00 54 A5 06 3E */ clrlwi r5, r5, 0x18
/* 8030BAA4 00308A04 90 01 00 14 */ stw r0, 0x14(r1)
/* 8030BAA8 00308A08 90 8D 9C 70 */ stw r4, mDepthFunc__9CGraphics@sda21(r13)
/* 8030BAAC 00308A0C 4B FF CD D1 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 8030BAAC 00308A0C 4B FF CD D1 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 8030BAB0 00308A10 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8030BAB4 00308A14 7C 08 03 A6 */ mtlr r0
/* 8030BAB8 00308A18 38 21 00 10 */ addi r1, r1, 0x10
@ -3124,7 +3124,7 @@ EndScene__9CGraphicsFv:
/* 8030BAD8 00308A38 93 E1 00 9C */ stw r31, 0x9c(r1)
/* 8030BADC 00308A3C 93 C1 00 98 */ stw r30, 0x98(r1)
/* 8030BAE0 00308A40 93 A1 00 94 */ stw r29, 0x94(r1)
/* 8030BAE4 00308A44 4B FF CD 99 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 8030BAE4 00308A44 4B FF CD 99 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 8030BAE8 00308A48 3B AD A8 0C */ addi r29, r13, mNumBreakpointsWaiting__9CGraphics@sda21
/* 8030BAEC 00308A4C 48 00 00 08 */ b lbl_8030BAF4
lbl_8030BAF0:

4
asm/Kyoto/Particles/CElementGen.s
View File

@ -2197,7 +2197,7 @@ RenderParticlesIndirectTexture__11CElementGenFv:
/* 80319408 00316368 38 60 00 01 */ li r3, 1
/* 8031940C 0031636C 38 80 00 03 */ li r4, 3
/* 80319410 00316370 38 A0 00 00 */ li r5, 0
/* 80319414 00316374 4B FE F4 69 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 80319414 00316374 4B FE F4 69 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 80319418 00316378 38 60 00 01 */ li r3, 1
/* 8031941C 0031637C 38 80 00 04 */ li r4, 4
/* 80319420 00316380 38 A0 00 01 */ li r5, 1
@ -2208,7 +2208,7 @@ lbl_80319430:
/* 80319430 00316390 54 65 E7 FE */ rlwinm r5, r3, 0x1c, 0x1f, 0x1f
/* 80319434 00316394 38 60 00 01 */ li r3, 1
/* 80319438 00316398 38 80 00 03 */ li r4, 3
/* 8031943C 0031639C 4B FE F4 41 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 8031943C 0031639C 4B FE F4 41 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 80319440 003163A0 38 60 00 01 */ li r3, 1
/* 80319444 003163A4 38 80 00 04 */ li r4, 4
/* 80319448 003163A8 38 A0 00 05 */ li r5, 5

34
asm/MetaRender/CCubeRenderer.s
View File

@ -939,7 +939,7 @@ lbl_802B6568:
/* 802B6700 002B3660 38 60 00 00 */ li r3, 0
/* 802B6704 002B3664 38 80 00 07 */ li r4, 7
/* 802B6708 002B3668 38 A0 00 00 */ li r5, 0
/* 802B670C 002B366C 48 05 21 71 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802B670C 002B366C 48 05 21 71 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802B6710 002B3670 38 60 00 00 */ li r3, 0
/* 802B6714 002B3674 48 0C 24 45 */ bl GXSetCullMode
/* 802B6718 002B3678 38 60 00 01 */ li r3, 1
@ -2684,7 +2684,7 @@ lbl_802B801C:
/* 802B8030 002B4F90 38 80 00 03 */ li r4, 3
lbl_802B8034:
/* 802B8034 002B4F94 54 A5 FF FE */ rlwinm r5, r5, 0x1f, 0x1f, 0x1f
/* 802B8038 002B4F98 48 05 08 45 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802B8038 002B4F98 48 05 08 45 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802B803C 002B4F9C 38 60 00 01 */ li r3, 1
/* 802B8040 002B4FA0 48 05 0C 51 */ bl SetNumTevStages__3CGXFUc
/* 802B8044 002B4FA4 38 60 00 01 */ li r3, 1
@ -2992,7 +2992,7 @@ DrawModelDisintegrate__13CCubeRendererFRC6CModelRC8CTextureRC6CColorPCfPCf:
/* 802B84EC 002B544C 38 60 00 01 */ li r3, 1
/* 802B84F0 002B5450 38 80 00 03 */ li r4, 3
/* 802B84F4 002B5454 38 A0 00 01 */ li r5, 1
/* 802B84F8 002B5458 48 05 03 85 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802B84F8 002B5458 48 05 03 85 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802B84FC 002B545C 7F A3 EB 78 */ mr r3, r29
/* 802B8500 002B5460 48 09 CC 21 */ bl UpdateLastFrame__6CModelFv
/* 802B8504 002B5464 80 7D 00 28 */ lwz r3, 0x28(r29)
@ -3162,7 +3162,7 @@ sub_802b85cc:
/* 802B877C 002B56DC 7C 00 00 34 */ cntlzw r0, r0
/* 802B8780 002B56E0 54 63 D9 7E */ srwi r3, r3, 5
/* 802B8784 002B56E4 54 05 D9 7E */ srwi r5, r0, 5
/* 802B8788 002B56E8 48 05 00 F5 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802B8788 002B56E8 48 05 00 F5 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802B878C 002B56EC A0 1F 00 02 */ lhz r0, 2(r31)
/* 802B8790 002B56F0 7F 83 E3 78 */ mr r3, r28
/* 802B8794 002B56F4 7F A4 EB 78 */ mr r4, r29
@ -4515,7 +4515,7 @@ lbl_802B9A98:
/* 802B9AC8 002B6A28 38 60 00 01 */ li r3, 1
/* 802B9ACC 002B6A2C 38 80 00 03 */ li r4, 3
/* 802B9AD0 002B6A30 38 A0 00 01 */ li r5, 1
/* 802B9AD4 002B6A34 48 04 ED A9 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802B9AD4 002B6A34 48 04 ED A9 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802B9AD8 002B6A38 38 60 00 01 */ li r3, 1
/* 802B9ADC 002B6A3C 48 04 F1 B5 */ bl SetNumTevStages__3CGXFUc
/* 802B9AE0 002B6A40 38 60 00 01 */ li r3, 1
@ -4548,7 +4548,7 @@ lbl_802B9A98:
/* 802B9B4C 002B6AAC 38 60 00 00 */ li r3, 0
/* 802B9B50 002B6AB0 38 80 00 07 */ li r4, 7
/* 802B9B54 002B6AB4 38 A0 00 00 */ li r5, 0
/* 802B9B58 002B6AB8 48 04 ED 25 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802B9B58 002B6AB8 48 04 ED 25 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802B9B5C 002B6ABC 7F 43 D3 78 */ mr r3, r26
/* 802B9B60 002B6AC0 7F 64 DB 78 */ mr r4, r27
/* 802B9B64 002B6AC4 7F E6 FB 78 */ mr r6, r31
@ -4558,7 +4558,7 @@ lbl_802B9A98:
/* 802B9B74 002B6AD4 38 60 00 01 */ li r3, 1
/* 802B9B78 002B6AD8 38 80 00 03 */ li r4, 3
/* 802B9B7C 002B6ADC 38 A0 00 01 */ li r5, 1
/* 802B9B80 002B6AE0 48 04 EC FD */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802B9B80 002B6AE0 48 04 EC FD */ bl SetZMode__3CGXFUc10_GXCompareUc
lbl_802B9B84:
/* 802B9B84 002B6AE4 38 60 00 01 */ li r3, 1
/* 802B9B88 002B6AE8 38 80 00 00 */ li r4, 0
@ -4586,7 +4586,7 @@ lbl_802B9B84:
/* 802B9BE0 002B6B40 38 60 00 01 */ li r3, 1
/* 802B9BE4 002B6B44 38 80 00 04 */ li r4, 4
/* 802B9BE8 002B6B48 38 A0 00 00 */ li r5, 0
/* 802B9BEC 002B6B4C 48 04 EC 91 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802B9BEC 002B6B4C 48 04 EC 91 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802B9BF0 002B6B50 7F 43 D3 78 */ mr r3, r26
/* 802B9BF4 002B6B54 7F 64 DB 78 */ mr r4, r27
/* 802B9BF8 002B6B58 7F E6 FB 78 */ mr r6, r31
@ -4596,7 +4596,7 @@ lbl_802B9B84:
/* 802B9C08 002B6B68 38 60 00 01 */ li r3, 1
/* 802B9C0C 002B6B6C 38 80 00 03 */ li r4, 3
/* 802B9C10 002B6B70 38 A0 00 01 */ li r5, 1
/* 802B9C14 002B6B74 48 04 EC 69 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802B9C14 002B6B74 48 04 EC 69 */ bl SetZMode__3CGXFUc10_GXCompareUc
lbl_802B9C18:
/* 802B9C18 002B6B78 80 61 03 28 */ lwz r3, 0x328(r1)
/* 802B9C1C 002B6B7C 38 80 00 00 */ li r4, 0
@ -4691,7 +4691,7 @@ lbl_802B9C18:
/* 802B9D80 002B6CE0 38 60 00 00 */ li r3, 0
/* 802B9D84 002B6CE4 38 80 00 07 */ li r4, 7
/* 802B9D88 002B6CE8 38 A0 00 00 */ li r5, 0
/* 802B9D8C 002B6CEC 48 04 EA F1 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802B9D8C 002B6CEC 48 04 EA F1 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802B9D90 002B6CF0 38 60 00 00 */ li r3, 0
/* 802B9D94 002B6CF4 48 0B ED C5 */ bl GXSetCullMode
/* 802B9D98 002B6CF8 38 60 00 00 */ li r3, 0
@ -5205,7 +5205,7 @@ DoThermalBlendHot__13CCubeRendererFv:
/* 802BA4F8 002B7458 38 A0 00 01 */ li r5, 1
/* 802BA4FC 002B745C 83 E6 00 08 */ lwz r31, 8(r6)
/* 802BA500 002B7460 83 C6 00 0C */ lwz r30, 0xc(r6)
/* 802BA504 002B7464 48 04 E3 79 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802BA504 002B7464 48 04 E3 79 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802BA508 002B7468 57 A3 04 3E */ clrlwi r3, r29, 0x10
/* 802BA50C 002B746C 57 84 04 3E */ clrlwi r4, r28, 0x10
/* 802BA510 002B7470 57 E5 04 3E */ clrlwi r5, r31, 0x10
@ -5269,7 +5269,7 @@ DoThermalBlendHot__13CCubeRendererFv:
/* 802BA5F8 002B7558 38 60 00 00 */ li r3, 0
/* 802BA5FC 002B755C 38 80 00 03 */ li r4, 3
/* 802BA600 002B7560 38 A0 00 00 */ li r5, 0
/* 802BA604 002B7564 48 04 E2 79 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802BA604 002B7564 48 04 E2 79 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802BA608 002B7568 3C 60 80 3D */ lis r3, lbl_803D6654@ha
/* 802BA60C 002B756C 38 63 66 54 */ addi r3, r3, lbl_803D6654@l
/* 802BA610 002B7570 48 04 D8 19 */ bl SetVtxDescv__3CGXFPC14_GXVtxDescList
@ -5426,7 +5426,7 @@ DoThermalBlendCold__13CCubeRendererFv:
/* 802BA860 002B77C0 38 A0 00 00 */ li r5, 0
/* 802BA864 002B77C4 83 C6 00 08 */ lwz r30, 8(r6)
/* 802BA868 002B77C8 83 A6 00 0C */ lwz r29, 0xc(r6)
/* 802BA86C 002B77CC 48 04 E0 11 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802BA86C 002B77CC 48 04 E0 11 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802BA870 002B77D0 57 E3 04 3E */ clrlwi r3, r31, 0x10
/* 802BA874 002B77D4 57 64 04 3E */ clrlwi r4, r27, 0x10
/* 802BA878 002B77D8 57 C5 04 3E */ clrlwi r5, r30, 0x10
@ -5664,7 +5664,7 @@ lbl_802BAA1C:
/* 802BAC08 002B7B68 38 60 00 00 */ li r3, 0
/* 802BAC0C 002B7B6C 38 80 00 07 */ li r4, 7
/* 802BAC10 002B7B70 38 A0 00 00 */ li r5, 0
/* 802BAC14 002B7B74 48 04 DC 69 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802BAC14 002B7B74 48 04 DC 69 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802BAC18 002B7B78 3C 60 80 3D */ lis r3, lbl_803D6624@ha
/* 802BAC1C 002B7B7C 38 63 66 24 */ addi r3, r3, lbl_803D6624@l
/* 802BAC20 002B7B80 48 04 D2 09 */ bl SetVtxDescv__3CGXFPC14_GXVtxDescList
@ -7128,7 +7128,7 @@ lbl_802BBEB8:
/* 802BC198 002B90F8 38 60 00 00 */ li r3, 0
/* 802BC19C 002B90FC 38 80 00 07 */ li r4, 7
/* 802BC1A0 002B9100 38 A0 00 00 */ li r5, 0
/* 802BC1A4 002B9104 48 04 C6 D9 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802BC1A4 002B9104 48 04 C6 D9 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802BC1A8 002B9108 38 60 00 00 */ li r3, 0
/* 802BC1AC 002B910C 48 0B C9 AD */ bl GXSetCullMode
/* 802BC1B0 002B9110 38 60 00 A0 */ li r3, 0xa0
@ -7332,7 +7332,7 @@ lbl_802BC424:
/* 802BC4A0 002B9400 38 60 00 01 */ li r3, 1
/* 802BC4A4 002B9404 38 80 00 03 */ li r4, 3
/* 802BC4A8 002B9408 38 A0 00 01 */ li r5, 1
/* 802BC4AC 002B940C 48 04 C3 D1 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802BC4AC 002B940C 48 04 C3 D1 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802BC4B0 002B9410 7F 63 DB 78 */ mr r3, r27
/* 802BC4B4 002B9414 38 80 00 01 */ li r4, 1
/* 802BC4B8 002B9418 48 0B D0 7D */ bl GXCopyTex
@ -7350,7 +7350,7 @@ lbl_802BC424:
/* 802BC4E8 002B9448 7C 1B 03 78 */ mr r27, r0
/* 802BC4EC 002B944C 38 80 00 03 */ li r4, 3
/* 802BC4F0 002B9450 38 A0 00 01 */ li r5, 1
/* 802BC4F4 002B9454 48 04 C3 89 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 802BC4F4 002B9454 48 04 C3 89 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 802BC4F8 002B9458 7F 63 DB 78 */ mr r3, r27
/* 802BC4FC 002B945C 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 802BC500 002B9460 48 0B D0 35 */ bl GXCopyTex

2
asm/MetroidPrime/CFluidPlaneCPU.s
View File

@ -2294,7 +2294,7 @@ lbl_8019B99C:
/* 8019B99C 001988FC 38 60 00 01 */ li r3, 1
/* 8019B9A0 00198900 38 80 00 03 */ li r4, 3
/* 8019B9A4 00198904 38 A0 00 00 */ li r5, 0
/* 8019B9A8 00198908 48 16 CE D5 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 8019B9A8 00198908 48 16 CE D5 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 8019B9AC 0019890C 38 60 00 07 */ li r3, 7
/* 8019B9B0 00198910 38 80 00 00 */ li r4, 0
/* 8019B9B4 00198914 38 A0 00 00 */ li r5, 0

2
asm/MetroidPrime/CFluidPlaneDoor.s
View File

@ -576,7 +576,7 @@ lbl_8019DBA4:
/* 8019DBB4 0019AB14 38 60 00 01 */ li r3, 1
/* 8019DBB8 0019AB18 38 80 00 03 */ li r4, 3
/* 8019DBBC 0019AB1C 38 A0 00 00 */ li r5, 0
/* 8019DBC0 0019AB20 48 16 AC BD */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 8019DBC0 0019AB20 48 16 AC BD */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 8019DBC4 0019AB24 38 60 00 07 */ li r3, 7
/* 8019DBC8 0019AB28 38 80 00 00 */ li r4, 0
/* 8019DBCC 0019AB2C 38 A0 00 00 */ li r5, 0

2
asm/MetroidPrime/CNESEmulator.s
View File

@ -387,7 +387,7 @@ sub_80293e2c:
/* 80294044 00290FA4 38 60 00 01 */ li r3, 1
/* 80294048 00290FA8 38 80 00 07 */ li r4, 7
/* 8029404C 00290FAC 38 A0 00 00 */ li r5, 0
/* 80294050 00290FB0 48 07 48 2D */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 80294050 00290FB0 48 07 48 2D */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 80294054 00290FB4 7F A4 EB 78 */ mr r4, r29
/* 80294058 00290FB8 38 60 00 00 */ li r3, 0
/* 8029405C 00290FBC 48 07 4B E9 */ bl SetTevKColor__3CGXF14_GXTevKColorIDRC8_GXColor

6
asm/MetroidPrime/CProjectedShadow.s
View File

@ -186,7 +186,7 @@ lbl_8029D928:
/* 8029D930 0029A890 38 60 00 01 */ li r3, 1
/* 8029D934 0029A894 38 80 00 02 */ li r4, 2
/* 8029D938 0029A898 38 A0 00 00 */ li r5, 0
/* 8029D93C 0029A89C 48 06 AF 41 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 8029D93C 0029A89C 48 06 AF 41 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 8029D940 0029A8A0 38 60 00 01 */ li r3, 1
/* 8029D944 0029A8A4 38 80 00 04 */ li r4, 4
/* 8029D948 0029A8A8 38 A0 00 05 */ li r5, 5
@ -354,7 +354,7 @@ lbl_8029DB80:
/* 8029DBC4 0029AB24 38 60 00 01 */ li r3, 1
/* 8029DBC8 0029AB28 38 80 00 03 */ li r4, 3
/* 8029DBCC 0029AB2C 38 A0 00 01 */ li r5, 1
/* 8029DBD0 0029AB30 48 06 AC AD */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 8029DBD0 0029AB30 48 06 AC AD */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 8029DBD4 0029AB34 38 60 00 07 */ li r3, 7
/* 8029DBD8 0029AB38 38 80 00 00 */ li r4, 0
/* 8029DBDC 0029AB3C 38 A0 00 00 */ li r5, 0
@ -716,7 +716,7 @@ RenderShadowBuffer__16CProjectedShadowFR13CStateManagerRC10CModelDataRC12CTransf
/* 8029E13C 0029B09C 38 60 00 01 */ li r3, 1
/* 8029E140 0029B0A0 38 80 00 03 */ li r4, 3
/* 8029E144 0029B0A4 38 A0 00 01 */ li r5, 1
/* 8029E148 0029B0A8 48 06 A7 35 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 8029E148 0029B0A8 48 06 A7 35 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 8029E14C 0029B0AC 57 A5 04 3E */ clrlwi r5, r29, 0x10
/* 8029E150 0029B0B0 57 86 04 3E */ clrlwi r6, r28, 0x10
/* 8029E154 0029B0B4 38 60 00 00 */ li r3, 0

2
asm/MetroidPrime/CRainSplashGenerator.s
View File

@ -442,7 +442,7 @@ DoDraw__20CRainSplashGeneratorCFRC12CTransform4f:
/* 8026A2A0 00267200 38 60 00 01 */ li r3, 1
/* 8026A2A4 00267204 38 80 00 03 */ li r4, 3
/* 8026A2A8 00267208 38 A0 00 00 */ li r5, 0
/* 8026A2AC 0026720C 48 09 E5 D1 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 8026A2AC 0026720C 48 09 E5 D1 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 8026A2B0 00267210 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 8026A2B4 00267214 38 60 00 00 */ li r3, 0
/* 8026A2B8 00267218 48 0A 00 01 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass

4
asm/MetroidPrime/CWorldTransManager.s
View File

@ -1052,7 +1052,7 @@ lbl_80209B80:
/* 80209BD8 00206B38 38 60 00 01 */ li r3, 1
/* 80209BDC 00206B3C 38 80 00 03 */ li r4, 3
/* 80209BE0 00206B40 38 A0 00 01 */ li r5, 1
/* 80209BE4 00206B44 48 0F EC 99 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 80209BE4 00206B44 48 0F EC 99 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 80209BE8 00206B48 57 E3 04 3E */ clrlwi r3, r31, 0x10
/* 80209BEC 00206B4C 57 C4 04 3E */ clrlwi r4, r30, 0x10
/* 80209BF0 00206B50 38 A0 00 04 */ li r5, 4
@ -1158,7 +1158,7 @@ lbl_80209B80:
/* 80209D80 00206CE0 38 60 00 00 */ li r3, 0
/* 80209D84 00206CE4 38 80 00 07 */ li r4, 7
/* 80209D88 00206CE8 38 A0 00 00 */ li r5, 0
/* 80209D8C 00206CEC 48 0F EA F1 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 80209D8C 00206CEC 48 0F EA F1 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 80209D90 00206CF0 38 60 00 A0 */ li r3, 0xa0
/* 80209D94 00206CF4 38 80 00 00 */ li r4, 0
/* 80209D98 00206CF8 38 A0 00 04 */ li r5, 4

8
asm/MetroidPrime/Player/CMorphBallShadow.s
View File

@ -320,7 +320,7 @@ lbl_80295F84:
/* 80295F90 00292EF0 38 80 00 02 */ li r4, 2
/* 80295F94 00292EF4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80295F98 00292EF8 38 A0 00 00 */ li r5, 0
/* 80295F9C 00292EFC 48 07 28 E1 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 80295F9C 00292EFC 48 07 28 E1 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 80295FA0 00292F00 38 60 00 01 */ li r3, 1
/* 80295FA4 00292F04 38 80 00 04 */ li r4, 4
/* 80295FA8 00292F08 38 A0 00 05 */ li r5, 5
@ -718,7 +718,7 @@ lbl_802963B0:
/* 8029658C 002934EC 38 60 00 01 */ li r3, 1
/* 80296590 002934F0 38 80 00 07 */ li r4, 7
/* 80296594 002934F4 38 A0 00 01 */ li r5, 1
/* 80296598 002934F8 48 07 22 E5 */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 80296598 002934F8 48 07 22 E5 */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 8029659C 002934FC 38 60 00 00 */ li r3, 0
/* 802965A0 00293500 48 07 54 D1 */ bl SetCullMode__9CGraphicsF12ERglCullMode
/* 802965A4 00293504 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha
@ -808,7 +808,7 @@ lbl_802963B0:
/* 802966F4 00293654 38 60 00 01 */ li r3, 1
/* 802966F8 00293658 38 80 00 03 */ li r4, 3
/* 802966FC 0029365C 38 A0 00 01 */ li r5, 1
/* 80296700 00293660 48 07 21 7D */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 80296700 00293660 48 07 21 7D */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 80296704 00293664 48 07 62 79 */ bl DisableAllLights__9CGraphicsFv
/* 80296708 00293668 38 60 00 01 */ li r3, 1
/* 8029670C 0029366C 48 0A F0 DD */ bl SetRenderModelBlack__10CCubeModelFb
@ -975,7 +975,7 @@ lbl_80296888:
/* 80296974 002938D4 38 60 00 01 */ li r3, 1
/* 80296978 002938D8 38 80 00 03 */ li r4, 3
/* 8029697C 002938DC 38 A0 00 01 */ li r5, 1
/* 80296980 002938E0 48 07 1E FD */ bl SetZMode__3CGXFUi10_GXCompareUi
/* 80296980 002938E0 48 07 1E FD */ bl SetZMode__3CGXFUc10_GXCompareUc
/* 80296984 002938E4 38 61 01 A0 */ addi r3, r1, 0x1a0
/* 80296988 002938E8 48 07 5D C5 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f
/* 8029698C 002938EC 38 61 00 94 */ addi r3, r1, 0x94

3
include/Kyoto/Graphics/CGX.hpp
View File

@ -107,8 +107,7 @@ public:
GXChannelID color);
static void SetBlendMode(GXBlendMode mode, GXBlendFactor srcFac, GXBlendFactor dstFac,
GXLogicOp op);
// TODO: GXBool doesn't work, why?
static void SetZMode(uint compareEnable, GXCompare func, uint updateEnable);
static void SetZMode(GXBool compareEnable, GXCompare func, GXBool updateEnable);
static void SetAlphaCompare(GXCompare comp0, uchar ref0, GXAlphaOp op, GXCompare comp1,
uchar ref1);
static void SetTevIndirect(GXTevStageID stageId, GXIndTexStageID indStage, GXIndTexFormat fmt,

3
src/Kyoto/Graphics/CGX.cpp
View File

@ -177,8 +177,7 @@ void CGX::SetBlendMode(GXBlendMode mode, GXBlendFactor srcFac, GXBlendFactor dst
}
}
// TODO: GXBool doesn't work, why?
void CGX::SetZMode(uint compareEnable, GXCompare func, uint updateEnable) {
void CGX::SetZMode(const GXBool compareEnable, GXCompare func, const GXBool updateEnable) {
uchar flags = MaskAndShiftLeft(compareEnable, 0xFF, 0) | MaskAndShiftLeft(updateEnable, 0xFF, 1) |
MaskAndShiftLeft(func, 0xFF, 2);
if (flags != sGXState.x52_zmode) {