diff options
| author | Julgodis <> | 2021-04-06 18:00:35 +0200 |
|---|---|---|
| committer | Julgodis <> | 2021-04-06 18:00:35 +0200 |
| commit | ed1ee30dd20ab15ba73b987f1e59b0dfc16d09b2 (patch) | |
| tree | 195784fbf8d317301238686d56db9d4425bce61f /asm/JSystem/J3DGraphBase | |
| parent | f6464a61cecc9b65cf010d2fb7876c23251761f5 (diff) | |
building RELs
Diffstat (limited to 'asm/JSystem/J3DGraphBase')
155 files changed, 673 insertions, 673 deletions
diff --git a/asm/JSystem/J3DGraphBase/J3DDrawBuffer/__sinit_J3DDrawBuffer_cpp.s b/asm/JSystem/J3DGraphBase/J3DDrawBuffer/__sinit_J3DDrawBuffer_cpp.s index 88f9ef9f16..9aaa286798 100644 --- a/asm/JSystem/J3DGraphBase/J3DDrawBuffer/__sinit_J3DDrawBuffer_cpp.s +++ b/asm/JSystem/J3DGraphBase/J3DDrawBuffer/__sinit_J3DDrawBuffer_cpp.s @@ -1,6 +1,6 @@ lbl_803255F0: -/* 803255F0 3C 60 80 3D */ lis r3, lit_992@ha -/* 803255F4 38 A3 EB E8 */ addi r5, r3, lit_992@l +/* 803255F0 3C 60 80 3D */ lis r3, lit_992@ha /* 0x803CEBE8@ha */ +/* 803255F4 38 A3 EB E8 */ addi r5, r3, lit_992@l /* 0x803CEBE8@l */ /* 803255F8 80 65 00 00 */ lwz r3, 0(r5) /* 803255FC 80 05 00 04 */ lwz r0, 4(r5) /* 80325600 90 65 00 48 */ stw r3, 0x48(r5) diff --git a/asm/JSystem/J3DGraphBase/J3DDrawBuffer/draw__13J3DDrawBufferCFv.s b/asm/JSystem/J3DGraphBase/J3DDrawBuffer/draw__13J3DDrawBufferCFv.s index 71119e45b5..902b793454 100644 --- a/asm/JSystem/J3DGraphBase/J3DDrawBuffer/draw__13J3DDrawBufferCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DDrawBuffer/draw__13J3DDrawBufferCFv.s @@ -4,8 +4,8 @@ lbl_803254AC: /* 803254B4 90 01 00 24 */ stw r0, 0x24(r1) /* 803254B8 80 03 00 08 */ lwz r0, 8(r3) /* 803254BC 1C A0 00 0C */ mulli r5, r0, 0xc -/* 803254C0 3C 80 80 3D */ lis r4, drawFuncTable__13J3DDrawBuffer@ha -/* 803254C4 38 04 EC 90 */ addi r0, r4, drawFuncTable__13J3DDrawBuffer@l +/* 803254C0 3C 80 80 3D */ lis r4, drawFuncTable__13J3DDrawBuffer@ha /* 0x803CEC90@ha */ +/* 803254C4 38 04 EC 90 */ addi r0, r4, drawFuncTable__13J3DDrawBuffer@l /* 0x803CEC90@l */ /* 803254C8 7C A0 2A 14 */ add r5, r0, r5 /* 803254CC 80 85 00 00 */ lwz r4, 0(r5) /* 803254D0 80 05 00 04 */ lwz r0, 4(r5) diff --git a/asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryMatSort__13J3DDrawBufferFP12J3DMatPacket.s b/asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryMatSort__13J3DDrawBufferFP12J3DMatPacket.s index 06dedcda36..72b73af1a6 100644 --- a/asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryMatSort__13J3DDrawBufferFP12J3DMatPacket.s +++ b/asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryMatSort__13J3DDrawBufferFP12J3DMatPacket.s @@ -23,8 +23,8 @@ lbl_8032509C: /* 803250F0 38 60 00 01 */ li r3, 1 /* 803250F4 48 00 00 D8 */ b lbl_803251CC lbl_803250F8: -/* 803250F8 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803250FC 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803250F8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803250FC 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80325100 83 A3 00 58 */ lwz r29, 0x58(r3) /* 80325104 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80325108 80 63 00 2C */ lwz r3, 0x2c(r3) diff --git a/asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryZSort__13J3DDrawBufferFP12J3DMatPacket.s b/asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryZSort__13J3DDrawBufferFP12J3DMatPacket.s index 339e229ef1..8c7b4d0452 100644 --- a/asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryZSort__13J3DDrawBufferFP12J3DMatPacket.s +++ b/asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryZSort__13J3DDrawBufferFP12J3DMatPacket.s @@ -25,8 +25,8 @@ lbl_8032529C: /* 803252F8 90 01 00 0C */ stw r0, 0xc(r1) /* 803252FC 80 01 00 1C */ lwz r0, 0x1c(r1) /* 80325300 90 01 00 10 */ stw r0, 0x10(r1) -/* 80325304 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80325308 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80325304 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80325308 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 8032530C C0 22 CA 00 */ lfs f1, lit_781(r2) /* 80325310 E0 01 00 08 */ psq_l f0, 8(r1), 0, 0 /* qr0 */ /* 80325314 C0 41 00 10 */ lfs f2, 0x10(r1) diff --git a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxImm3x3__FPA3_fUl.s b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxImm3x3__FPA3_fUl.s index 9653c05a04..b190b31b45 100644 --- a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxImm3x3__FPA3_fUl.s +++ b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxImm3x3__FPA3_fUl.s @@ -1,7 +1,7 @@ lbl_8030FBCC: /* 8030FBCC 38 00 00 10 */ li r0, 0x10 /* 8030FBD0 3C A0 CC 01 */ lis r5, 0xCC01 /* 0xCC008000@ha */ -/* 8030FBD4 98 05 80 00 */ stb r0, 0x8000(r5) +/* 8030FBD4 98 05 80 00 */ stb r0, 0x8000(r5) /* 0xCC008000@l */ /* 8030FBD8 38 00 00 08 */ li r0, 8 /* 8030FBDC B0 05 80 00 */ sth r0, -0x8000(r5) /* 8030FBE0 1C 84 00 03 */ mulli r4, r4, 3 diff --git a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxImm__FPA4_fUl.s b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxImm__FPA4_fUl.s index d15096c24f..ce503b7dbc 100644 --- a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxImm__FPA4_fUl.s +++ b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxImm__FPA4_fUl.s @@ -1,7 +1,7 @@ lbl_8030FB60: /* 8030FB60 38 00 00 10 */ li r0, 0x10 /* 8030FB64 3C A0 CC 01 */ lis r5, 0xCC01 /* 0xCC008000@ha */ -/* 8030FB68 98 05 80 00 */ stb r0, 0x8000(r5) +/* 8030FB68 98 05 80 00 */ stb r0, 0x8000(r5) /* 0xCC008000@l */ /* 8030FB6C 38 00 00 08 */ li r0, 8 /* 8030FB70 B0 05 80 00 */ sth r0, -0x8000(r5) /* 8030FB74 1C 84 00 03 */ mulli r4, r4, 3 diff --git a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl.s b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl.s index bf278983be..6f99d94bbe 100644 --- a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl.s +++ b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl.s @@ -2,7 +2,7 @@ lbl_8030FCD0: /* 8030FCD0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030FCD4 38 00 00 10 */ li r0, 0x10 /* 8030FCD8 3C A0 CC 01 */ lis r5, 0xCC01 /* 0xCC008000@ha */ -/* 8030FCDC 98 05 80 00 */ stb r0, 0x8000(r5) +/* 8030FCDC 98 05 80 00 */ stb r0, 0x8000(r5) /* 0xCC008000@l */ /* 8030FCE0 38 00 00 0B */ li r0, 0xb /* 8030FCE4 B0 05 80 00 */ sth r0, -0x8000(r5) /* 8030FCE8 54 80 14 3A */ rlwinm r0, r4, 2, 0x10, 0x1d diff --git a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl.s b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl.s index 74385e213e..843a3fbca7 100644 --- a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl.s +++ b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl.s @@ -2,7 +2,7 @@ lbl_8030FC38: /* 8030FC38 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030FC3C 38 00 00 10 */ li r0, 0x10 /* 8030FC40 3C A0 CC 01 */ lis r5, 0xCC01 /* 0xCC008000@ha */ -/* 8030FC44 98 05 80 00 */ stb r0, 0x8000(r5) +/* 8030FC44 98 05 80 00 */ stb r0, 0x8000(r5) /* 0xCC008000@l */ /* 8030FC48 38 00 00 0B */ li r0, 0xb /* 8030FC4C B0 05 80 00 */ sth r0, -0x8000(r5) /* 8030FC50 54 80 14 3A */ rlwinm r0, r4, 2, 0x10, 0x1d diff --git a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadPosMtxImm__FPA4_fUl.s b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadPosMtxImm__FPA4_fUl.s index a616ddba68..aa12320544 100644 --- a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadPosMtxImm__FPA4_fUl.s +++ b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadPosMtxImm__FPA4_fUl.s @@ -1,7 +1,7 @@ lbl_8030FAE0: /* 8030FAE0 38 00 00 10 */ li r0, 0x10 /* 8030FAE4 3C A0 CC 01 */ lis r5, 0xCC01 /* 0xCC008000@ha */ -/* 8030FAE8 98 05 80 00 */ stb r0, 0x8000(r5) +/* 8030FAE8 98 05 80 00 */ stb r0, 0x8000(r5) /* 0xCC008000@l */ /* 8030FAEC 38 00 00 0B */ li r0, 0xb /* 8030FAF0 B0 05 80 00 */ sth r0, -0x8000(r5) /* 8030FAF4 54 80 14 3A */ rlwinm r0, r4, 2, 0x10, 0x1d diff --git a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize.s b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize.s index 306065149b..38e4e1d552 100644 --- a/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize.s +++ b/asm/JSystem/J3DGraphBase/J3DGD/J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize.s @@ -1,7 +1,7 @@ lbl_8030FD68: /* 8030FD68 39 40 00 61 */ li r10, 0x61 /* 8030FD6C 3D 20 CC 01 */ lis r9, 0xCC01 /* 0xCC008000@ha */ -/* 8030FD70 99 49 80 00 */ stb r10, 0x8000(r9) +/* 8030FD70 99 49 80 00 */ stb r10, 0x8000(r9) /* 0xCC008000@l */ /* 8030FD74 39 0D 83 BC */ la r8, J3DTexImage1Ids(r13) /* 8045093C-_SDA_BASE_ */ /* 8030FD78 7C 08 18 AE */ lbzx r0, r8, r3 /* 8030FD7C 54 08 C0 0E */ slwi r8, r0, 0x18 diff --git a/asm/JSystem/J3DGraphBase/J3DGD/J3DGDSetTexCoordGen__F13_GXTexGenType12_GXTexGenSrc.s b/asm/JSystem/J3DGraphBase/J3DGD/J3DGDSetTexCoordGen__F13_GXTexGenType12_GXTexGenSrc.s index 0ed34501ad..27a4f2977f 100644 --- a/asm/JSystem/J3DGraphBase/J3DGD/J3DGDSetTexCoordGen__F13_GXTexGenType12_GXTexGenSrc.s +++ b/asm/JSystem/J3DGraphBase/J3DGD/J3DGDSetTexCoordGen__F13_GXTexGenType12_GXTexGenSrc.s @@ -6,8 +6,8 @@ lbl_8030E064: /* 8030E074 38 E0 00 00 */ li r7, 0 /* 8030E078 28 04 00 14 */ cmplwi r4, 0x14 /* 8030E07C 41 81 00 D0 */ bgt lbl_8030E14C -/* 8030E080 3C A0 80 3D */ lis r5, lit_951@ha -/* 8030E084 38 A5 D8 2C */ addi r5, r5, lit_951@l +/* 8030E080 3C A0 80 3D */ lis r5, lit_951@ha /* 0x803CD82C@ha */ +/* 8030E084 38 A5 D8 2C */ addi r5, r5, lit_951@l /* 0x803CD82C@l */ /* 8030E088 54 80 10 3A */ slwi r0, r4, 2 /* 8030E08C 7C 05 00 2E */ lwzx r0, r5, r0 /* 8030E090 7C 09 03 A6 */ mtctr r0 diff --git a/asm/JSystem/J3DGraphBase/J3DGD/J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb.s b/asm/JSystem/J3DGraphBase/J3DGD/J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb.s index aff57620ee..34e14af62f 100644 --- a/asm/JSystem/J3DGraphBase/J3DGD/J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb.s +++ b/asm/JSystem/J3DGraphBase/J3DGD/J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb.s @@ -61,8 +61,8 @@ lbl_8030DBEC: /* 8030DBEC 38 03 FF F7 */ addi r0, r3, -9 /* 8030DBF0 28 00 00 10 */ cmplwi r0, 0x10 /* 8030DBF4 41 81 01 3C */ bgt lbl_8030DD30 -/* 8030DBF8 3C 60 80 3D */ lis r3, lit_899@ha -/* 8030DBFC 38 63 D7 E8 */ addi r3, r3, lit_899@l +/* 8030DBF8 3C 60 80 3D */ lis r3, lit_899@ha /* 0x803CD7E8@ha */ +/* 8030DBFC 38 63 D7 E8 */ addi r3, r3, lit_899@l /* 0x803CD7E8@l */ /* 8030DC00 54 00 10 3A */ slwi r0, r0, 2 /* 8030DC04 7C 03 00 2E */ lwzx r0, r3, r0 /* 8030DC08 7C 09 03 A6 */ mtctr r0 diff --git a/asm/JSystem/J3DGraphBase/J3DGD/func_8030F108.s b/asm/JSystem/J3DGraphBase/J3DGD/func_8030F108.s index 13aec93f5f..ea0ac80efc 100644 --- a/asm/JSystem/J3DGraphBase/J3DGD/func_8030F108.s +++ b/asm/JSystem/J3DGraphBase/J3DGD/func_8030F108.s @@ -32,8 +32,8 @@ lbl_8030F16C: /* 8030F174 38 03 00 28 */ addi r0, r3, 0x28 /* 8030F178 54 00 C0 0E */ slwi r0, r0, 0x18 /* 8030F17C 57 44 07 3E */ clrlwi r4, r26, 0x1c -/* 8030F180 3C 60 80 3D */ lis r3, c2r@ha -/* 8030F184 38 63 D8 80 */ addi r3, r3, c2r@l +/* 8030F180 3C 60 80 3D */ lis r3, c2r@ha /* 0x803CD880@ha */ +/* 8030F184 38 63 D8 80 */ addi r3, r3, c2r@l /* 0x803CD880@l */ /* 8030F188 7C 63 20 AE */ lbzx r3, r3, r4 /* 8030F18C 54 6A 98 18 */ slwi r10, r3, 0x13 /* 8030F190 38 80 00 00 */ li r4, 0 @@ -47,8 +47,8 @@ lbl_8030F1A8: /* 8030F1AC 57 E8 78 20 */ slwi r8, r31, 0xf /* 8030F1B0 57 A7 64 66 */ rlwinm r7, r29, 0xc, 0x11, 0x13 /* 8030F1B4 57 84 07 3E */ clrlwi r4, r28, 0x1c -/* 8030F1B8 3C 60 80 3D */ lis r3, c2r@ha -/* 8030F1BC 38 63 D8 80 */ addi r3, r3, c2r@l +/* 8030F1B8 3C 60 80 3D */ lis r3, c2r@ha /* 0x803CD880@ha */ +/* 8030F1BC 38 63 D8 80 */ addi r3, r3, c2r@l /* 0x803CD880@l */ /* 8030F1C0 7C 63 20 AE */ lbzx r3, r3, r4 /* 8030F1C4 54 66 38 30 */ slwi r6, r3, 7 /* 8030F1C8 57 C5 18 38 */ slwi r5, r30, 3 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock1Fv.s index 11e22c7b6d..32f1815b35 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock1Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock1Fv.s @@ -5,12 +5,12 @@ lbl_803228F4: /* 80322900 93 E1 00 0C */ stw r31, 0xc(r1) /* 80322904 7C 7F 1B 79 */ or. r31, r3, r3 /* 80322908 41 82 00 30 */ beq lbl_80322938 -/* 8032290C 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock1@ha -/* 80322910 38 03 E3 7C */ addi r0, r3, __vt__12J3DTevBlock1@l +/* 8032290C 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock1@ha /* 0x803CE37C@ha */ +/* 80322910 38 03 E3 7C */ addi r0, r3, __vt__12J3DTevBlock1@l /* 0x803CE37C@l */ /* 80322914 90 1F 00 00 */ stw r0, 0(r31) /* 80322918 41 82 00 10 */ beq lbl_80322928 -/* 8032291C 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha -/* 80322920 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l +/* 8032291C 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha /* 0x803CE958@ha */ +/* 80322920 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l /* 0x803CE958@l */ /* 80322924 90 1F 00 00 */ stw r0, 0(r31) lbl_80322928: /* 80322928 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock2Fv.s index 6bc49afa69..3945ca8a17 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock2Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock2Fv.s @@ -5,12 +5,12 @@ lbl_80322714: /* 80322720 93 E1 00 0C */ stw r31, 0xc(r1) /* 80322724 7C 7F 1B 79 */ or. r31, r3, r3 /* 80322728 41 82 00 30 */ beq lbl_80322758 -/* 8032272C 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock2@ha -/* 80322730 38 03 E2 A0 */ addi r0, r3, __vt__12J3DTevBlock2@l +/* 8032272C 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock2@ha /* 0x803CE2A0@ha */ +/* 80322730 38 03 E2 A0 */ addi r0, r3, __vt__12J3DTevBlock2@l /* 0x803CE2A0@l */ /* 80322734 90 1F 00 00 */ stw r0, 0(r31) /* 80322738 41 82 00 10 */ beq lbl_80322748 -/* 8032273C 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha -/* 80322740 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l +/* 8032273C 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha /* 0x803CE958@ha */ +/* 80322740 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l /* 0x803CE958@l */ /* 80322744 90 1F 00 00 */ stw r0, 0(r31) lbl_80322748: /* 80322748 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock4Fv.s index 6bfad9cb68..eb5606277c 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock4Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__12J3DTevBlock4Fv.s @@ -5,12 +5,12 @@ lbl_80322350: /* 8032235C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80322360 7C 7F 1B 79 */ or. r31, r3, r3 /* 80322364 41 82 00 30 */ beq lbl_80322394 -/* 80322368 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock4@ha -/* 8032236C 38 03 E1 C4 */ addi r0, r3, __vt__12J3DTevBlock4@l +/* 80322368 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock4@ha /* 0x803CE1C4@ha */ +/* 8032236C 38 03 E1 C4 */ addi r0, r3, __vt__12J3DTevBlock4@l /* 0x803CE1C4@l */ /* 80322370 90 1F 00 00 */ stw r0, 0(r31) /* 80322374 41 82 00 10 */ beq lbl_80322384 -/* 80322378 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha -/* 8032237C 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l +/* 80322378 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha /* 0x803CE958@ha */ +/* 8032237C 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l /* 0x803CE958@l */ /* 80322380 90 1F 00 00 */ stw r0, 0(r31) lbl_80322384: /* 80322384 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockOpaFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockOpaFv.s index 9fc9ed8fc3..7f097a0c58 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockOpaFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockOpaFv.s @@ -5,12 +5,12 @@ lbl_80323334: /* 80323340 93 E1 00 0C */ stw r31, 0xc(r1) /* 80323344 7C 7F 1B 79 */ or. r31, r3, r3 /* 80323348 41 82 00 30 */ beq lbl_80323378 -/* 8032334C 3C 60 80 3D */ lis r3, __vt__13J3DPEBlockOpa@ha -/* 80323350 38 03 E8 90 */ addi r0, r3, __vt__13J3DPEBlockOpa@l +/* 8032334C 3C 60 80 3D */ lis r3, __vt__13J3DPEBlockOpa@ha /* 0x803CE890@ha */ +/* 80323350 38 03 E8 90 */ addi r0, r3, __vt__13J3DPEBlockOpa@l /* 0x803CE890@l */ /* 80323354 90 1F 00 00 */ stw r0, 0(r31) /* 80323358 41 82 00 10 */ beq lbl_80323368 -/* 8032335C 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha -/* 80323360 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l +/* 8032335C 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ +/* 80323360 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ /* 80323364 90 1F 00 00 */ stw r0, 0(r31) lbl_80323368: /* 80323368 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockXluFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockXluFv.s index 85195735cf..27b65838dd 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockXluFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DPEBlockXluFv.s @@ -5,12 +5,12 @@ lbl_80323264: /* 80323270 93 E1 00 0C */ stw r31, 0xc(r1) /* 80323274 7C 7F 1B 79 */ or. r31, r3, r3 /* 80323278 41 82 00 30 */ beq lbl_803232A8 -/* 8032327C 3C 60 80 3D */ lis r3, __vt__13J3DPEBlockXlu@ha -/* 80323280 38 03 E7 98 */ addi r0, r3, __vt__13J3DPEBlockXlu@l +/* 8032327C 3C 60 80 3D */ lis r3, __vt__13J3DPEBlockXlu@ha /* 0x803CE798@ha */ +/* 80323280 38 03 E7 98 */ addi r0, r3, __vt__13J3DPEBlockXlu@l /* 0x803CE798@l */ /* 80323284 90 1F 00 00 */ stw r0, 0(r31) /* 80323288 41 82 00 10 */ beq lbl_80323298 -/* 8032328C 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha -/* 80323290 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l +/* 8032328C 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ +/* 80323290 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ /* 80323294 90 1F 00 00 */ stw r0, 0(r31) lbl_80323298: /* 80323298 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DTevBlock16Fv.s index 0dbb49c380..ab1798bfaa 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DTevBlock16Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__13J3DTevBlock16Fv.s @@ -5,12 +5,12 @@ lbl_80321F84: /* 80321F90 93 E1 00 0C */ stw r31, 0xc(r1) /* 80321F94 7C 7F 1B 79 */ or. r31, r3, r3 /* 80321F98 41 82 00 30 */ beq lbl_80321FC8 -/* 80321F9C 3C 60 80 3D */ lis r3, __vt__13J3DTevBlock16@ha -/* 80321FA0 38 03 E0 E8 */ addi r0, r3, __vt__13J3DTevBlock16@l +/* 80321F9C 3C 60 80 3D */ lis r3, __vt__13J3DTevBlock16@ha /* 0x803CE0E8@ha */ +/* 80321FA0 38 03 E0 E8 */ addi r0, r3, __vt__13J3DTevBlock16@l /* 0x803CE0E8@l */ /* 80321FA4 90 1F 00 00 */ stw r0, 0(r31) /* 80321FA8 41 82 00 10 */ beq lbl_80321FB8 -/* 80321FAC 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha -/* 80321FB0 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l +/* 80321FAC 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha /* 0x803CE958@ha */ +/* 80321FB0 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l /* 0x803CE958@l */ /* 80321FB4 90 1F 00 00 */ stw r0, 0(r31) lbl_80321FB8: /* 80321FB8 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__14J3DPEBlockFullFv.s index c602760b39..0a4b01e2f6 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__14J3DPEBlockFullFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__14J3DPEBlockFullFv.s @@ -5,12 +5,12 @@ lbl_80321A70: /* 80321A7C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80321A80 7C 7F 1B 79 */ or. r31, r3, r3 /* 80321A84 41 82 00 30 */ beq lbl_80321AB4 -/* 80321A88 3C 60 80 3D */ lis r3, __vt__14J3DPEBlockFull@ha -/* 80321A8C 38 03 DF F0 */ addi r0, r3, __vt__14J3DPEBlockFull@l +/* 80321A88 3C 60 80 3D */ lis r3, __vt__14J3DPEBlockFull@ha /* 0x803CDFF0@ha */ +/* 80321A8C 38 03 DF F0 */ addi r0, r3, __vt__14J3DPEBlockFull@l /* 0x803CDFF0@l */ /* 80321A90 90 1F 00 00 */ stw r0, 0(r31) /* 80321A94 41 82 00 10 */ beq lbl_80321AA4 -/* 80321A98 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha -/* 80321A9C 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l +/* 80321A98 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ +/* 80321A9C 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ /* 80321AA0 90 1F 00 00 */ stw r0, 0(r31) lbl_80321AA4: /* 80321AA4 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DIndBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DIndBlockFullFv.s index 6e72cb597b..341381db23 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DIndBlockFullFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DIndBlockFullFv.s @@ -7,25 +7,25 @@ lbl_803234A0: /* 803234B4 7C 7E 1B 79 */ or. r30, r3, r3 /* 803234B8 7C 9F 23 78 */ mr r31, r4 /* 803234BC 41 82 00 64 */ beq lbl_80323520 -/* 803234C0 3C 60 80 3D */ lis r3, __vt__15J3DIndBlockFull@ha -/* 803234C4 38 03 E9 0C */ addi r0, r3, __vt__15J3DIndBlockFull@l +/* 803234C0 3C 60 80 3D */ lis r3, __vt__15J3DIndBlockFull@ha /* 0x803CE90C@ha */ +/* 803234C4 38 03 E9 0C */ addi r0, r3, __vt__15J3DIndBlockFull@l /* 0x803CE90C@l */ /* 803234C8 90 1E 00 00 */ stw r0, 0(r30) /* 803234CC 38 7E 00 6C */ addi r3, r30, 0x6c -/* 803234D0 3C 80 80 01 */ lis r4, __dt__19J3DIndTexCoordScaleFv@ha -/* 803234D4 38 84 E0 24 */ addi r4, r4, __dt__19J3DIndTexCoordScaleFv@l +/* 803234D0 3C 80 80 01 */ lis r4, __dt__19J3DIndTexCoordScaleFv@ha /* 0x8000E024@ha */ +/* 803234D4 38 84 E0 24 */ addi r4, r4, __dt__19J3DIndTexCoordScaleFv@l /* 0x8000E024@l */ /* 803234D8 38 A0 00 04 */ li r5, 4 /* 803234DC 38 C0 00 04 */ li r6, 4 /* 803234E0 48 03 E8 09 */ bl __destroy_arr /* 803234E4 38 7E 00 18 */ addi r3, r30, 0x18 -/* 803234E8 3C 80 80 01 */ lis r4, __dt__12J3DIndTexMtxFv@ha -/* 803234EC 38 84 E0 64 */ addi r4, r4, __dt__12J3DIndTexMtxFv@l +/* 803234E8 3C 80 80 01 */ lis r4, __dt__12J3DIndTexMtxFv@ha /* 0x8000E064@ha */ +/* 803234EC 38 84 E0 64 */ addi r4, r4, __dt__12J3DIndTexMtxFv@l /* 0x8000E064@l */ /* 803234F0 38 A0 00 1C */ li r5, 0x1c /* 803234F4 38 C0 00 03 */ li r6, 3 /* 803234F8 48 03 E7 F1 */ bl __destroy_arr /* 803234FC 28 1E 00 00 */ cmplwi r30, 0 /* 80323500 41 82 00 10 */ beq lbl_80323510 -/* 80323504 3C 60 80 3D */ lis r3, __vt__11J3DIndBlock@ha -/* 80323508 38 03 DD E8 */ addi r0, r3, __vt__11J3DIndBlock@l +/* 80323504 3C 60 80 3D */ lis r3, __vt__11J3DIndBlock@ha /* 0x803CDDE8@ha */ +/* 80323508 38 03 DD E8 */ addi r0, r3, __vt__11J3DIndBlock@l /* 0x803CDDE8@l */ /* 8032350C 90 1E 00 00 */ stw r0, 0(r30) lbl_80323510: /* 80323510 7F E0 07 35 */ extsh. r0, r31 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DTexGenBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DTexGenBlock4Fv.s index b95fa20e4b..b9c20dde9b 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DTexGenBlock4Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__15J3DTexGenBlock4Fv.s @@ -5,16 +5,16 @@ lbl_80322E04: /* 80322E10 93 E1 00 0C */ stw r31, 0xc(r1) /* 80322E14 7C 7F 1B 79 */ or. r31, r3, r3 /* 80322E18 41 82 00 40 */ beq lbl_80322E58 -/* 80322E1C 3C 60 80 3D */ lis r3, __vt__15J3DTexGenBlock4@ha -/* 80322E20 38 03 E5 A0 */ addi r0, r3, __vt__15J3DTexGenBlock4@l +/* 80322E1C 3C 60 80 3D */ lis r3, __vt__15J3DTexGenBlock4@ha /* 0x803CE5A0@ha */ +/* 80322E20 38 03 E5 A0 */ addi r0, r3, __vt__15J3DTexGenBlock4@l /* 0x803CE5A0@l */ /* 80322E24 90 1F 00 00 */ stw r0, 0(r31) /* 80322E28 41 82 00 20 */ beq lbl_80322E48 -/* 80322E2C 3C 60 80 3D */ lis r3, __vt__21J3DTexGenBlockPatched@ha -/* 80322E30 38 03 E6 0C */ addi r0, r3, __vt__21J3DTexGenBlockPatched@l +/* 80322E2C 3C 60 80 3D */ lis r3, __vt__21J3DTexGenBlockPatched@ha /* 0x803CE60C@ha */ +/* 80322E30 38 03 E6 0C */ addi r0, r3, __vt__21J3DTexGenBlockPatched@l /* 0x803CE60C@l */ /* 80322E34 90 1F 00 00 */ stw r0, 0(r31) /* 80322E38 41 82 00 10 */ beq lbl_80322E48 -/* 80322E3C 3C 60 80 3D */ lis r3, __vt__14J3DTexGenBlock@ha -/* 80322E40 38 03 DE 34 */ addi r0, r3, __vt__14J3DTexGenBlock@l +/* 80322E3C 3C 60 80 3D */ lis r3, __vt__14J3DTexGenBlock@ha /* 0x803CDE34@ha */ +/* 80322E40 38 03 DE 34 */ addi r0, r3, __vt__14J3DTexGenBlock@l /* 0x803CDE34@l */ /* 80322E44 90 1F 00 00 */ stw r0, 0(r31) lbl_80322E48: /* 80322E48 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__16J3DPEBlockFogOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__16J3DPEBlockFogOffFv.s index 9b4cfb82eb..8bbfa06eb4 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__16J3DPEBlockFogOffFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__16J3DPEBlockFogOffFv.s @@ -5,12 +5,12 @@ lbl_80321BC4: /* 80321BD0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80321BD4 7C 7F 1B 79 */ or. r31, r3, r3 /* 80321BD8 41 82 00 30 */ beq lbl_80321C08 -/* 80321BDC 3C 60 80 3D */ lis r3, __vt__16J3DPEBlockFogOff@ha -/* 80321BE0 38 03 E0 6C */ addi r0, r3, __vt__16J3DPEBlockFogOff@l +/* 80321BDC 3C 60 80 3D */ lis r3, __vt__16J3DPEBlockFogOff@ha /* 0x803CE06C@ha */ +/* 80321BE0 38 03 E0 6C */ addi r0, r3, __vt__16J3DPEBlockFogOff@l /* 0x803CE06C@l */ /* 80321BE4 90 1F 00 00 */ stw r0, 0(r31) /* 80321BE8 41 82 00 10 */ beq lbl_80321BF8 -/* 80321BEC 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha -/* 80321BF0 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l +/* 80321BEC 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ +/* 80321BF0 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ /* 80321BF4 90 1F 00 00 */ stw r0, 0(r31) lbl_80321BF8: /* 80321BF8 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__17J3DPEBlockTexEdgeFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__17J3DPEBlockTexEdgeFv.s index 6c56dc3f76..0ce008ca23 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__17J3DPEBlockTexEdgeFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__17J3DPEBlockTexEdgeFv.s @@ -5,12 +5,12 @@ lbl_803232CC: /* 803232D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 803232DC 7C 7F 1B 79 */ or. r31, r3, r3 /* 803232E0 41 82 00 30 */ beq lbl_80323310 -/* 803232E4 3C 60 80 3D */ lis r3, __vt__17J3DPEBlockTexEdge@ha -/* 803232E8 38 03 E8 14 */ addi r0, r3, __vt__17J3DPEBlockTexEdge@l +/* 803232E4 3C 60 80 3D */ lis r3, __vt__17J3DPEBlockTexEdge@ha /* 0x803CE814@ha */ +/* 803232E8 38 03 E8 14 */ addi r0, r3, __vt__17J3DPEBlockTexEdge@l /* 0x803CE814@l */ /* 803232EC 90 1F 00 00 */ stw r0, 0(r31) /* 803232F0 41 82 00 10 */ beq lbl_80323300 -/* 803232F4 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha -/* 803232F8 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l +/* 803232F4 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ +/* 803232F8 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ /* 803232FC 90 1F 00 00 */ stw r0, 0(r31) lbl_80323300: /* 80323300 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__18J3DTevBlockPatchedFv.s index 756fb5ec54..027f890650 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__18J3DTevBlockPatchedFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__18J3DTevBlockPatchedFv.s @@ -5,12 +5,12 @@ lbl_80322C10: /* 80322C1C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80322C20 7C 7F 1B 79 */ or. r31, r3, r3 /* 80322C24 41 82 00 30 */ beq lbl_80322C54 -/* 80322C28 3C 60 80 3D */ lis r3, __vt__18J3DTevBlockPatched@ha -/* 80322C2C 38 03 E4 58 */ addi r0, r3, __vt__18J3DTevBlockPatched@l +/* 80322C28 3C 60 80 3D */ lis r3, __vt__18J3DTevBlockPatched@ha /* 0x803CE458@ha */ +/* 80322C2C 38 03 E4 58 */ addi r0, r3, __vt__18J3DTevBlockPatched@l /* 0x803CE458@l */ /* 80322C30 90 1F 00 00 */ stw r0, 0(r31) /* 80322C34 41 82 00 10 */ beq lbl_80322C44 -/* 80322C38 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha -/* 80322C3C 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l +/* 80322C38 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha /* 0x803CE958@ha */ +/* 80322C3C 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l /* 0x803CE958@l */ /* 80322C40 90 1F 00 00 */ stw r0, 0(r31) lbl_80322C44: /* 80322C44 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__19J3DTexGenBlockBasicFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__19J3DTexGenBlockBasicFv.s index 43037832be..ca6f4a17fc 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__19J3DTexGenBlockBasicFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__19J3DTexGenBlockBasicFv.s @@ -5,16 +5,16 @@ lbl_80322CC8: /* 80322CD4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80322CD8 7C 7F 1B 79 */ or. r31, r3, r3 /* 80322CDC 41 82 00 40 */ beq lbl_80322D1C -/* 80322CE0 3C 60 80 3D */ lis r3, __vt__19J3DTexGenBlockBasic@ha -/* 80322CE4 38 03 E5 34 */ addi r0, r3, __vt__19J3DTexGenBlockBasic@l +/* 80322CE0 3C 60 80 3D */ lis r3, __vt__19J3DTexGenBlockBasic@ha /* 0x803CE534@ha */ +/* 80322CE4 38 03 E5 34 */ addi r0, r3, __vt__19J3DTexGenBlockBasic@l /* 0x803CE534@l */ /* 80322CE8 90 1F 00 00 */ stw r0, 0(r31) /* 80322CEC 41 82 00 20 */ beq lbl_80322D0C -/* 80322CF0 3C 60 80 3D */ lis r3, __vt__21J3DTexGenBlockPatched@ha -/* 80322CF4 38 03 E6 0C */ addi r0, r3, __vt__21J3DTexGenBlockPatched@l +/* 80322CF0 3C 60 80 3D */ lis r3, __vt__21J3DTexGenBlockPatched@ha /* 0x803CE60C@ha */ +/* 80322CF4 38 03 E6 0C */ addi r0, r3, __vt__21J3DTexGenBlockPatched@l /* 0x803CE60C@l */ /* 80322CF8 90 1F 00 00 */ stw r0, 0(r31) /* 80322CFC 41 82 00 10 */ beq lbl_80322D0C -/* 80322D00 3C 60 80 3D */ lis r3, __vt__14J3DTexGenBlock@ha -/* 80322D04 38 03 DE 34 */ addi r0, r3, __vt__14J3DTexGenBlock@l +/* 80322D00 3C 60 80 3D */ lis r3, __vt__14J3DTexGenBlock@ha /* 0x803CDE34@ha */ +/* 80322D04 38 03 DE 34 */ addi r0, r3, __vt__14J3DTexGenBlock@l /* 0x803CDE34@l */ /* 80322D08 90 1F 00 00 */ stw r0, 0(r31) lbl_80322D0C: /* 80322D0C 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__20J3DColorBlockLightOnFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__20J3DColorBlockLightOnFv.s index 0228256eb2..ee65ba5d68 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__20J3DColorBlockLightOnFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__20J3DColorBlockLightOnFv.s @@ -5,12 +5,12 @@ lbl_80323018: /* 80323024 93 E1 00 0C */ stw r31, 0xc(r1) /* 80323028 7C 7F 1B 79 */ or. r31, r3, r3 /* 8032302C 41 82 00 30 */ beq lbl_8032305C -/* 80323030 3C 60 80 3D */ lis r3, __vt__20J3DColorBlockLightOn@ha -/* 80323034 38 03 E6 78 */ addi r0, r3, __vt__20J3DColorBlockLightOn@l +/* 80323030 3C 60 80 3D */ lis r3, __vt__20J3DColorBlockLightOn@ha /* 0x803CE678@ha */ +/* 80323034 38 03 E6 78 */ addi r0, r3, __vt__20J3DColorBlockLightOn@l /* 0x803CE678@l */ /* 80323038 90 1F 00 00 */ stw r0, 0(r31) /* 8032303C 41 82 00 10 */ beq lbl_8032304C -/* 80323040 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha -/* 80323044 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l +/* 80323040 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha /* 0x803CDEA0@ha */ +/* 80323044 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l /* 0x803CDEA0@l */ /* 80323048 90 1F 00 00 */ stw r0, 0(r31) lbl_8032304C: /* 8032304C 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__22J3DColorBlockAmbientOnFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__22J3DColorBlockAmbientOnFv.s index 7b874b985c..36f7ecedfc 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__22J3DColorBlockAmbientOnFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/__dt__22J3DColorBlockAmbientOnFv.s @@ -5,16 +5,16 @@ lbl_803230EC: /* 803230F8 93 E1 00 0C */ stw r31, 0xc(r1) /* 803230FC 7C 7F 1B 79 */ or. r31, r3, r3 /* 80323100 41 82 00 40 */ beq lbl_80323140 -/* 80323104 3C 60 80 3D */ lis r3, __vt__22J3DColorBlockAmbientOn@ha -/* 80323108 38 03 E7 08 */ addi r0, r3, __vt__22J3DColorBlockAmbientOn@l +/* 80323104 3C 60 80 3D */ lis r3, __vt__22J3DColorBlockAmbientOn@ha /* 0x803CE708@ha */ +/* 80323108 38 03 E7 08 */ addi r0, r3, __vt__22J3DColorBlockAmbientOn@l /* 0x803CE708@l */ /* 8032310C 90 1F 00 00 */ stw r0, 0(r31) /* 80323110 41 82 00 20 */ beq lbl_80323130 -/* 80323114 3C 60 80 3D */ lis r3, __vt__21J3DColorBlockLightOff@ha -/* 80323118 38 03 EA 34 */ addi r0, r3, __vt__21J3DColorBlockLightOff@l +/* 80323114 3C 60 80 3D */ lis r3, __vt__21J3DColorBlockLightOff@ha /* 0x803CEA34@ha */ +/* 80323118 38 03 EA 34 */ addi r0, r3, __vt__21J3DColorBlockLightOff@l /* 0x803CEA34@l */ /* 8032311C 90 1F 00 00 */ stw r0, 0(r31) /* 80323120 41 82 00 10 */ beq lbl_80323130 -/* 80323124 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha -/* 80323128 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l +/* 80323124 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha /* 0x803CDEA0@ha */ +/* 80323128 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l /* 0x803CDEA0@l */ /* 8032312C 90 1F 00 00 */ stw r0, 0(r31) lbl_80323130: /* 80323130 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf.s index 04675308af..1b318df797 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf.s @@ -20,8 +20,8 @@ lbl_80321840: /* 80321860 B0 04 00 0C */ sth r0, 0xc(r4) /* 80321864 28 06 00 0B */ cmplwi r6, 0xb /* 80321868 41 81 00 8C */ bgt lbl_803218F4 -/* 8032186C 3C 60 80 3D */ lis r3, lit_5187@ha -/* 80321870 38 63 DF C0 */ addi r3, r3, lit_5187@l +/* 8032186C 3C 60 80 3D */ lis r3, lit_5187@ha /* 0x803CDFC0@ha */ +/* 80321870 38 63 DF C0 */ addi r3, r3, lit_5187@l /* 0x803CDFC0@l */ /* 80321874 54 C0 10 3A */ slwi r0, r6, 2 /* 80321878 7C 03 00 2E */ lwzx r0, r3, r0 /* 8032187C 7C 09 03 A6 */ mtctr r0 @@ -29,37 +29,37 @@ lbl_80321840: /* 80321884 38 00 00 1E */ li r0, 0x1e /* 80321888 B0 04 00 0C */ sth r0, 0xc(r4) /* 8032188C 7C 7E 28 2E */ lwzx r3, r30, r5 -/* 80321890 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 80321894 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 80321890 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 80321894 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 80321898 48 00 23 75 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 8032189C 48 00 00 70 */ b lbl_8032190C /* 803218A0 38 00 00 00 */ li r0, 0 /* 803218A4 B0 04 00 0C */ sth r0, 0xc(r4) /* 803218A8 7C 7E 28 2E */ lwzx r3, r30, r5 -/* 803218AC 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 803218B0 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 803218AC 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 803218B0 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 803218B4 48 00 23 59 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 803218B8 48 00 00 54 */ b lbl_8032190C /* 803218BC 38 00 00 00 */ li r0, 0 /* 803218C0 B0 04 00 0C */ sth r0, 0xc(r4) /* 803218C4 7C 7E 28 2E */ lwzx r3, r30, r5 -/* 803218C8 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 803218CC 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 803218C8 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 803218CC 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 803218D0 48 00 23 3D */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 803218D4 48 00 00 38 */ b lbl_8032190C /* 803218D8 38 00 00 1E */ li r0, 0x1e /* 803218DC B0 04 00 0C */ sth r0, 0xc(r4) /* 803218E0 7C 7E 28 2E */ lwzx r3, r30, r5 -/* 803218E4 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 803218E8 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 803218E4 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 803218E8 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 803218EC 48 00 23 21 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 803218F0 48 00 00 1C */ b lbl_8032190C lbl_803218F4: /* 803218F4 38 00 00 3C */ li r0, 0x3c /* 803218F8 B0 04 00 0C */ sth r0, 0xc(r4) /* 803218FC 7C 7E 28 2E */ lwzx r3, r30, r5 -/* 80321900 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 80321904 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 80321900 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 80321904 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 80321908 48 00 23 05 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf lbl_8032190C: /* 8032190C 3B FF 00 01 */ addi r31, r31, 1 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf.s index 45a908b207..bdd78de838 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf.s @@ -20,8 +20,8 @@ lbl_803216FC: /* 8032171C B0 1F 00 0C */ sth r0, 0xc(r31) /* 80321720 28 04 00 0B */ cmplwi r4, 0xb /* 80321724 41 81 00 B4 */ bgt lbl_803217D8 -/* 80321728 3C 60 80 3D */ lis r3, lit_5150@ha -/* 8032172C 38 63 DF 90 */ addi r3, r3, lit_5150@l +/* 80321728 3C 60 80 3D */ lis r3, lit_5150@ha /* 0x803CDF90@ha */ +/* 8032172C 38 63 DF 90 */ addi r3, r3, lit_5150@l /* 0x803CDF90@l */ /* 80321730 54 80 10 3A */ slwi r0, r4, 2 /* 80321734 7C 03 00 2E */ lwzx r0, r3, r0 /* 80321738 7C 09 03 A6 */ mtctr r0 @@ -29,12 +29,12 @@ lbl_803216FC: /* 80321740 38 00 00 1E */ li r0, 0x1e /* 80321744 B0 1F 00 0C */ sth r0, 0xc(r31) /* 80321748 7C 7C F0 2E */ lwzx r3, r28, r30 -/* 8032174C 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 80321750 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 8032174C 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 80321750 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 80321754 48 00 24 B9 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 80321758 48 00 00 98 */ b lbl_803217F0 -/* 8032175C 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80321760 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 8032175C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80321760 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80321764 38 81 00 38 */ addi r4, r1, 0x38 /* 80321768 48 02 4E 49 */ bl PSMTXInverse /* 8032176C 38 00 00 00 */ li r0, 0 @@ -46,12 +46,12 @@ lbl_803216FC: /* 80321784 38 00 00 00 */ li r0, 0 /* 80321788 B0 1F 00 0C */ sth r0, 0xc(r31) /* 8032178C 7C 7C F0 2E */ lwzx r3, r28, r30 -/* 80321790 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 80321794 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 80321790 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 80321794 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 80321798 48 00 24 75 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 8032179C 48 00 00 54 */ b lbl_803217F0 -/* 803217A0 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803217A4 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803217A0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803217A4 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803217A8 38 81 00 08 */ addi r4, r1, 8 /* 803217AC 48 02 4E 05 */ bl PSMTXInverse /* 803217B0 C0 02 C9 AC */ lfs f0, lit_5060(r2) @@ -68,8 +68,8 @@ lbl_803217D8: /* 803217D8 38 00 00 3C */ li r0, 0x3c /* 803217DC B0 1F 00 0C */ sth r0, 0xc(r31) /* 803217E0 7C 7C F0 2E */ lwzx r3, r28, r30 -/* 803217E4 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 803217E8 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 803217E4 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 803217E8 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 803217EC 48 00 24 21 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf lbl_803217F0: /* 803217F0 3B BD 00 01 */ addi r29, r29, 1 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf.s index 7f626e6b32..eb0905f3a1 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf.s @@ -9,8 +9,8 @@ lbl_80321584: /* 803215A0 3B A0 00 00 */ li r29, 0 /* 803215A4 3B 40 00 00 */ li r26, 0 /* 803215A8 3B 20 00 00 */ li r25, 0 -/* 803215AC 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803215B0 3B E3 4A C8 */ addi r31, r3, j3dSys@l +/* 803215AC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803215B0 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ lbl_803215B4: /* 803215B4 3B D9 00 38 */ addi r30, r25, 0x38 /* 803215B8 7C 7B F0 2E */ lwzx r3, r27, r30 @@ -23,15 +23,15 @@ lbl_803215B4: /* 803215D4 B0 03 00 0C */ sth r0, 0xc(r3) /* 803215D8 28 04 00 0B */ cmplwi r4, 0xb /* 803215DC 41 81 00 C0 */ bgt lbl_8032169C -/* 803215E0 3C 60 80 3D */ lis r3, lit_5110@ha -/* 803215E4 38 63 DF 60 */ addi r3, r3, lit_5110@l +/* 803215E0 3C 60 80 3D */ lis r3, lit_5110@ha /* 0x803CDF60@ha */ +/* 803215E4 38 63 DF 60 */ addi r3, r3, lit_5110@l /* 0x803CDF60@l */ /* 803215E8 54 80 10 3A */ slwi r0, r4, 2 /* 803215EC 7C 03 00 2E */ lwzx r0, r3, r0 /* 803215F0 7C 09 03 A6 */ mtctr r0 /* 803215F4 4E 80 04 20 */ bctr /* 803215F8 7C 7B F0 2E */ lwzx r3, r27, r30 -/* 803215FC 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 80321600 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 803215FC 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 80321600 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 80321604 48 00 22 FD */ bl calc__9J3DTexMtxFPA4_Cf /* 80321608 48 00 00 A4 */ b lbl_803216AC /* 8032160C 80 1F 00 34 */ lwz r0, 0x34(r31) @@ -43,13 +43,13 @@ lbl_803215B4: /* 80321624 48 00 00 88 */ b lbl_803216AC lbl_80321628: /* 80321628 7C 7B F0 2E */ lwzx r3, r27, r30 -/* 8032162C 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 80321630 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 8032162C 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 80321630 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 80321634 48 00 22 CD */ bl calc__9J3DTexMtxFPA4_Cf /* 80321638 48 00 00 74 */ b lbl_803216AC /* 8032163C 7C 7B F0 2E */ lwzx r3, r27, r30 -/* 80321640 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 80321644 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 80321640 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 80321644 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 80321648 48 00 22 B9 */ bl calc__9J3DTexMtxFPA4_Cf /* 8032164C 48 00 00 60 */ b lbl_803216AC /* 80321650 80 1F 00 34 */ lwz r0, 0x34(r31) @@ -68,14 +68,14 @@ lbl_80321628: /* 80321684 48 00 00 28 */ b lbl_803216AC lbl_80321688: /* 80321688 7C 7B F0 2E */ lwzx r3, r27, r30 -/* 8032168C 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 80321690 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 8032168C 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 80321690 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 80321694 48 00 22 6D */ bl calc__9J3DTexMtxFPA4_Cf /* 80321698 48 00 00 14 */ b lbl_803216AC lbl_8032169C: /* 8032169C 7C 7B F0 2E */ lwzx r3, r27, r30 -/* 803216A0 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 803216A4 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 803216A0 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 803216A4 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 803216A8 48 00 22 59 */ bl calc__9J3DTexMtxFPA4_Cf lbl_803216AC: /* 803216AC 3B BD 00 01 */ addi r29, r29, 1 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/calc__21J3DTexGenBlockPatchedFPA4_Cf.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/calc__21J3DTexGenBlockPatchedFPA4_Cf.s index b00c7b5e38..d797ff71af 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/calc__21J3DTexGenBlockPatchedFPA4_Cf.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/calc__21J3DTexGenBlockPatchedFPA4_Cf.s @@ -9,8 +9,8 @@ lbl_803213C0: /* 803213DC 3B A0 00 00 */ li r29, 0 /* 803213E0 3B 40 00 00 */ li r26, 0 /* 803213E4 3B 20 00 00 */ li r25, 0 -/* 803213E8 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803213EC 3B E3 4A C8 */ addi r31, r3, j3dSys@l +/* 803213E8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803213EC 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ lbl_803213F0: /* 803213F0 3B D9 00 38 */ addi r30, r25, 0x38 /* 803213F4 7C 7B F0 2E */ lwzx r3, r27, r30 @@ -23,8 +23,8 @@ lbl_803213F0: /* 80321410 B0 03 00 0C */ sth r0, 0xc(r3) /* 80321414 28 04 00 0B */ cmplwi r4, 0xb /* 80321418 41 81 01 30 */ bgt lbl_80321548 -/* 8032141C 3C 60 80 3D */ lis r3, lit_5062@ha -/* 80321420 38 63 DF 30 */ addi r3, r3, lit_5062@l +/* 8032141C 3C 60 80 3D */ lis r3, lit_5062@ha /* 0x803CDF30@ha */ +/* 80321420 38 63 DF 30 */ addi r3, r3, lit_5062@l /* 0x803CDF30@l */ /* 80321424 54 80 10 3A */ slwi r0, r4, 2 /* 80321428 7C 03 00 2E */ lwzx r0, r3, r0 /* 8032142C 7C 09 03 A6 */ mtctr r0 @@ -32,15 +32,15 @@ lbl_803213F0: /* 80321434 80 1F 00 34 */ lwz r0, 0x34(r31) /* 80321438 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 8032143C 40 82 00 1C */ bne lbl_80321458 -/* 80321440 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80321444 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80321440 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80321444 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80321448 7F 84 E3 78 */ mr r4, r28 /* 8032144C 38 A1 00 08 */ addi r5, r1, 8 /* 80321450 48 02 50 95 */ bl PSMTXConcat /* 80321454 48 00 00 14 */ b lbl_80321468 lbl_80321458: -/* 80321458 3C 60 80 43 */ lis r3, j3dSys@ha -/* 8032145C 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80321458 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 8032145C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80321460 38 81 00 08 */ addi r4, r1, 8 /* 80321464 48 02 50 4D */ bl PSMTXCopy lbl_80321468: @@ -61,15 +61,15 @@ lbl_80321468: /* 803214A0 48 00 00 B8 */ b lbl_80321558 lbl_803214A4: /* 803214A4 7C 7B F0 2E */ lwzx r3, r27, r30 -/* 803214A8 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 803214AC 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 803214A8 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 803214AC 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 803214B0 48 00 24 51 */ bl calc__9J3DTexMtxFPA4_Cf /* 803214B4 48 00 00 A4 */ b lbl_80321558 /* 803214B8 80 1F 00 34 */ lwz r0, 0x34(r31) /* 803214BC 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 803214C0 40 82 00 28 */ bne lbl_803214E8 -/* 803214C4 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803214C8 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803214C4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803214C8 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803214CC 7F 84 E3 78 */ mr r4, r28 /* 803214D0 38 A1 00 08 */ addi r5, r1, 8 /* 803214D4 48 02 50 11 */ bl PSMTXConcat @@ -79,8 +79,8 @@ lbl_803214A4: /* 803214E4 48 00 00 74 */ b lbl_80321558 lbl_803214E8: /* 803214E8 7C 7B F0 2E */ lwzx r3, r27, r30 -/* 803214EC 3C 80 80 43 */ lis r4, j3dSys@ha -/* 803214F0 38 84 4A C8 */ addi r4, r4, j3dSys@l +/* 803214EC 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ +/* 803214F0 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */ /* 803214F4 48 00 24 0D */ bl calc__9J3DTexMtxFPA4_Cf /* 803214F8 48 00 00 60 */ b lbl_80321558 /* 803214FC 80 1F 00 34 */ lwz r0, 0x34(r31) @@ -99,14 +99,14 @@ lbl_803214E8: /* 80321530 48 00 00 28 */ b lbl_80321558 lbl_80321534: /* 80321534 7C 7B F0 2E */ lwzx r3, r27, r30 -/* 80321538 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 8032153C 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 80321538 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 8032153C 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 80321540 48 00 23 C1 */ bl calc__9J3DTexMtxFPA4_Cf /* 80321544 48 00 00 14 */ b lbl_80321558 lbl_80321548: /* 80321548 7C 7B F0 2E */ lwzx r3, r27, r30 -/* 8032154C 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha -/* 80321550 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l +/* 8032154C 3C 80 80 3A */ lis r4, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ +/* 80321550 38 84 1E 5C */ addi r4, r4, j3dDefaultMtx@l /* 0x803A1E5C@l */ /* 80321554 48 00 23 AD */ bl calc__9J3DTexMtxFPA4_Cf lbl_80321558: /* 80321558 3B BD 00 01 */ addi r29, r29, 1 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__14J3DPEBlockFullFv.s index 8ade990c0e..9b3a64d34a 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__14J3DPEBlockFullFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__14J3DPEBlockFullFv.s @@ -147,8 +147,8 @@ lbl_8031FBB4: /* 8031FBD8 38 03 00 01 */ addi r0, r3, 1 /* 8031FBDC 90 04 00 08 */ stw r0, 8(r4) /* 8031FBE0 98 A3 00 00 */ stb r5, 0(r3) -/* 8031FBE4 3C 60 80 43 */ lis r3, j3dZModeTable@ha -/* 8031FBE8 38 83 71 60 */ addi r4, r3, j3dZModeTable@l +/* 8031FBE4 3C 60 80 43 */ lis r3, j3dZModeTable@ha /* 0x80437160@ha */ +/* 8031FBE8 38 83 71 60 */ addi r4, r3, j3dZModeTable@l /* 0x80437160@l */ /* 8031FBEC A0 1F 00 38 */ lhz r0, 0x38(r31) /* 8031FBF0 1C 00 00 03 */ mulli r0, r0, 3 /* 8031FBF4 7C 64 02 14 */ add r3, r4, r0 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__16J3DPEBlockFogOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__16J3DPEBlockFogOffFv.s index 3c2a8c3fb7..cb39dece9d 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__16J3DPEBlockFogOffFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffBlend__16J3DPEBlockFogOffFv.s @@ -147,8 +147,8 @@ lbl_8031F2D4: /* 8031F2F8 38 03 00 01 */ addi r0, r3, 1 /* 8031F2FC 90 04 00 08 */ stw r0, 8(r4) /* 8031F300 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F304 3C 60 80 43 */ lis r3, j3dZModeTable@ha -/* 8031F308 38 83 71 60 */ addi r4, r3, j3dZModeTable@l +/* 8031F304 3C 60 80 43 */ lis r3, j3dZModeTable@ha /* 0x80437160@ha */ +/* 8031F308 38 83 71 60 */ addi r4, r3, j3dZModeTable@l /* 0x80437160@l */ /* 8031F30C A0 1F 00 0C */ lhz r0, 0xc(r31) /* 8031F310 1C 00 00 03 */ mulli r0, r0, 3 /* 8031F314 7C 64 02 14 */ add r3, r4, r0 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock1Fv.s index e386117ecb..5edc717202 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock1Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock1Fv.s @@ -4,8 +4,8 @@ lbl_8031D368: /* 8031D370 90 01 00 14 */ stw r0, 0x14(r1) /* 8031D374 88 03 00 0B */ lbz r0, 0xb(r3) /* 8031D378 54 05 1E B8 */ rlwinm r5, r0, 3, 0x1a, 0x1c -/* 8031D37C 3C 80 80 43 */ lis r4, sTexCoordScaleTable__6J3DSys@ha -/* 8031D380 38 04 4C 2C */ addi r0, r4, sTexCoordScaleTable__6J3DSys@l +/* 8031D37C 3C 80 80 43 */ lis r4, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031D380 38 04 4C 2C */ addi r0, r4, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031D384 7D 00 2A 14 */ add r8, r0, r5 /* 8031D388 88 63 00 0A */ lbz r3, 0xa(r3) /* 8031D38C A0 88 00 00 */ lhz r4, 0(r8) diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock2Fv.s index b630c16b43..90e29ac1cd 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock2Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock2Fv.s @@ -6,8 +6,8 @@ lbl_8031D694: /* 8031D6A4 7C 7F 1B 78 */ mr r31, r3 /* 8031D6A8 88 03 00 0D */ lbz r0, 0xd(r3) /* 8031D6AC 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031D6B0 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031D6B4 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031D6B0 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031D6B4 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031D6B8 7D 00 22 14 */ add r8, r0, r4 /* 8031D6BC 88 7F 00 0C */ lbz r3, 0xc(r31) /* 8031D6C0 A0 88 00 00 */ lhz r4, 0(r8) @@ -25,8 +25,8 @@ lbl_8031D694: /* 8031D6F0 4B FF 0B 45 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031D6F4 88 1F 00 11 */ lbz r0, 0x11(r31) /* 8031D6F8 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031D6FC 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031D700 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031D6FC 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031D700 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031D704 7D 00 22 14 */ add r8, r0, r4 /* 8031D708 88 1F 00 10 */ lbz r0, 0x10(r31) /* 8031D70C 54 03 07 7E */ clrlwi r3, r0, 0x1d diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock4Fv.s index 695856c10b..2afb3c4cf6 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock4Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__12J3DTevBlock4Fv.s @@ -8,8 +8,8 @@ lbl_8031DA1C: /* 8031DA34 8B C3 00 20 */ lbz r30, 0x20(r3) /* 8031DA38 3B A0 00 00 */ li r29, 0 /* 8031DA3C 3B 60 00 00 */ li r27, 0 -/* 8031DA40 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031DA44 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031DA40 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031DA44 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031DA48 48 00 00 AC */ b lbl_8031DAF4 lbl_8031DA4C: /* 8031DA4C 7C 7C DA 14 */ add r3, r28, r27 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__13J3DTevBlock16Fv.s index b03a0a02e8..f29f44a659 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__13J3DTevBlock16Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__13J3DTevBlock16Fv.s @@ -8,8 +8,8 @@ lbl_8031DDD8: /* 8031DDF0 8B C3 00 58 */ lbz r30, 0x58(r3) /* 8031DDF4 3B A0 00 00 */ li r29, 0 /* 8031DDF8 3B 60 00 00 */ li r27, 0 -/* 8031DDFC 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031DE00 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031DDFC 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031DE00 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031DE04 48 00 00 AC */ b lbl_8031DEB0 lbl_8031DE08: /* 8031DE08 7C 7C DA 14 */ add r3, r28, r27 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__18J3DTevBlockPatchedFv.s index 46df5cfda3..f2a68a7e82 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__18J3DTevBlockPatchedFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffTexCoordScale__18J3DTevBlockPatchedFv.s @@ -8,8 +8,8 @@ lbl_8031D0C4: /* 8031D0DC 8B C3 00 D0 */ lbz r30, 0xd0(r3) /* 8031D0E0 3B A0 00 00 */ li r29, 0 /* 8031D0E4 3B 60 00 00 */ li r27, 0 -/* 8031D0E8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031D0EC 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031D0E8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031D0EC 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031D0F0 48 00 00 AC */ b lbl_8031D19C lbl_8031D0F4: /* 8031D0F4 7C 7C DA 14 */ add r3, r28, r27 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__15J3DIndBlockFullFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__15J3DIndBlockFullFUl.s index f68a3efaa7..6e9376c5a5 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__15J3DIndBlockFullFUl.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__15J3DIndBlockFullFUl.s @@ -21,8 +21,8 @@ lbl_8031E328: /* 8031E374 4B FF 0A 9D */ bl J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale /* 8031E378 88 1E 00 06 */ lbz r0, 6(r30) /* 8031E37C 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031E380 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031E384 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031E380 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031E384 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031E388 7D 00 22 14 */ add r8, r0, r4 /* 8031E38C 88 7E 00 05 */ lbz r3, 5(r30) /* 8031E390 A0 88 00 00 */ lhz r4, 0(r8) diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock1Fv.s index acaa1307bb..d9586b948d 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock1Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock1Fv.s @@ -34,8 +34,8 @@ lbl_8031ADC0: /* 8031ADDC 4B FF 43 2D */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031ADE0 88 1F 00 0B */ lbz r0, 0xb(r31) /* 8031ADE4 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031ADE8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031ADEC 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031ADE8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031ADEC 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031ADF0 7D 00 22 14 */ add r8, r0, r4 /* 8031ADF4 88 7F 00 0A */ lbz r3, 0xa(r31) /* 8031ADF8 A0 88 00 00 */ lhz r4, 0(r8) diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock2Fv.s index b9989d994f..1bef6eed4a 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock2Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock2Fv.s @@ -36,8 +36,8 @@ lbl_8031AFF8: /* 8031B024 4B FF 40 E5 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031B028 88 1E 00 0D */ lbz r0, 0xd(r30) /* 8031B02C 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031B030 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031B034 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031B030 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031B034 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031B038 7D 00 22 14 */ add r8, r0, r4 /* 8031B03C 88 7E 00 0C */ lbz r3, 0xc(r30) /* 8031B040 A0 88 00 00 */ lhz r4, 0(r8) @@ -55,8 +55,8 @@ lbl_8031AFF8: /* 8031B070 4B FF 31 C5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031B074 88 1E 00 11 */ lbz r0, 0x11(r30) /* 8031B078 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031B07C 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031B080 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031B07C 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031B080 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031B084 7D 00 22 14 */ add r8, r0, r4 /* 8031B088 88 1E 00 10 */ lbz r0, 0x10(r30) /* 8031B08C 54 03 07 7E */ clrlwi r3, r0, 0x1d @@ -214,8 +214,8 @@ lbl_8031B15C: /* 8031B2E0 42 00 FE 7C */ bdnz lbl_8031B15C lbl_8031B2E4: /* 8031B2E4 38 A0 00 00 */ li r5, 0 -/* 8031B2E8 3C 60 80 43 */ lis r3, j3dTevSwapTableTable@ha -/* 8031B2EC 38 63 6A 60 */ addi r3, r3, j3dTevSwapTableTable@l +/* 8031B2E8 3C 60 80 43 */ lis r3, j3dTevSwapTableTable@ha /* 0x80436A60@ha */ +/* 8031B2EC 38 63 6A 60 */ addi r3, r3, j3dTevSwapTableTable@l /* 0x80436A60@l */ /* 8031B2F0 38 00 00 04 */ li r0, 4 /* 8031B2F4 7C 09 03 A6 */ mtctr r0 lbl_8031B2F8: diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock4Fv.s index 7f71483844..608a81fea7 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock4Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__12J3DTevBlock4Fv.s @@ -28,8 +28,8 @@ lbl_8031B514: /* 8031B520 41 80 FF D8 */ blt lbl_8031B4F8 /* 8031B524 3B 60 00 00 */ li r27, 0 /* 8031B528 3B 40 00 00 */ li r26, 0 -/* 8031B52C 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031B530 3B C3 4C 2C */ addi r30, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031B52C 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031B530 3B C3 4C 2C */ addi r30, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031B534 48 00 00 CC */ b lbl_8031B600 lbl_8031B538: /* 8031B538 38 1B 00 01 */ addi r0, r27, 1 @@ -226,8 +226,8 @@ lbl_8031B6A0: /* 8031B824 42 00 FE 7C */ bdnz lbl_8031B6A0 lbl_8031B828: /* 8031B828 38 A0 00 00 */ li r5, 0 -/* 8031B82C 3C 60 80 43 */ lis r3, j3dTevSwapTableTable@ha -/* 8031B830 38 63 6A 60 */ addi r3, r3, j3dTevSwapTableTable@l +/* 8031B82C 3C 60 80 43 */ lis r3, j3dTevSwapTableTable@ha /* 0x80436A60@ha */ +/* 8031B830 38 63 6A 60 */ addi r3, r3, j3dTevSwapTableTable@l /* 0x80436A60@l */ /* 8031B834 38 00 00 04 */ li r0, 4 /* 8031B838 7C 09 03 A6 */ mtctr r0 lbl_8031B83C: diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__13J3DTevBlock16Fv.s index c1050c9e66..df729e2437 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__13J3DTevBlock16Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__13J3DTevBlock16Fv.s @@ -28,8 +28,8 @@ lbl_8031BA58: /* 8031BA64 41 80 FF D8 */ blt lbl_8031BA3C /* 8031BA68 3B 60 00 00 */ li r27, 0 /* 8031BA6C 3B 40 00 00 */ li r26, 0 -/* 8031BA70 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031BA74 3B C3 4C 2C */ addi r30, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031BA70 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031BA74 3B C3 4C 2C */ addi r30, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031BA78 48 00 00 CC */ b lbl_8031BB44 lbl_8031BA7C: /* 8031BA7C 38 1B 00 01 */ addi r0, r27, 1 @@ -226,8 +226,8 @@ lbl_8031BBE4: /* 8031BD68 42 00 FE 7C */ bdnz lbl_8031BBE4 lbl_8031BD6C: /* 8031BD6C 38 C0 00 00 */ li r6, 0 -/* 8031BD70 3C 60 80 43 */ lis r3, j3dTevSwapTableTable@ha -/* 8031BD74 38 63 6A 60 */ addi r3, r3, j3dTevSwapTableTable@l +/* 8031BD70 3C 60 80 43 */ lis r3, j3dTevSwapTableTable@ha /* 0x80436A60@ha */ +/* 8031BD74 38 63 6A 60 */ addi r3, r3, j3dTevSwapTableTable@l /* 0x80436A60@l */ /* 8031BD78 38 00 00 04 */ li r0, 4 /* 8031BD7C 7C 09 03 A6 */ mtctr r0 lbl_8031BD80: diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__14J3DPEBlockFullFv.s index 0662b77e74..b08a320386 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__14J3DPEBlockFullFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__14J3DPEBlockFullFv.s @@ -31,8 +31,8 @@ lbl_8031F404: /* 8031F430 38 BF 00 1C */ addi r5, r31, 0x1c /* 8031F434 4B FF 05 61 */ bl J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable /* 8031F438 88 FF 00 33 */ lbz r7, 0x33(r31) -/* 8031F43C 3C 60 80 43 */ lis r3, j3dAlphaCmpTable@ha -/* 8031F440 38 83 6E 60 */ addi r4, r3, j3dAlphaCmpTable@l +/* 8031F43C 3C 60 80 43 */ lis r3, j3dAlphaCmpTable@ha /* 0x80436E60@ha */ +/* 8031F440 38 83 6E 60 */ addi r4, r3, j3dAlphaCmpTable@l /* 0x80436E60@l */ /* 8031F444 A0 1F 00 30 */ lhz r0, 0x30(r31) /* 8031F448 1C 00 00 03 */ mulli r0, r0, 3 /* 8031F44C 7C 64 02 14 */ add r3, r4, r0 @@ -210,8 +210,8 @@ lbl_8031F6B8: /* 8031F6DC 38 03 00 01 */ addi r0, r3, 1 /* 8031F6E0 90 04 00 08 */ stw r0, 8(r4) /* 8031F6E4 98 A3 00 00 */ stb r5, 0(r3) -/* 8031F6E8 3C 60 80 43 */ lis r3, j3dZModeTable@ha -/* 8031F6EC 38 83 71 60 */ addi r4, r3, j3dZModeTable@l +/* 8031F6E8 3C 60 80 43 */ lis r3, j3dZModeTable@ha /* 0x80437160@ha */ +/* 8031F6EC 38 83 71 60 */ addi r4, r3, j3dZModeTable@l /* 0x80437160@l */ /* 8031F6F0 A0 1F 00 38 */ lhz r0, 0x38(r31) /* 8031F6F4 1C 00 00 03 */ mulli r0, r0, 3 /* 8031F6F8 7C 64 02 14 */ add r3, r4, r0 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__15J3DIndBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__15J3DIndBlockFullFv.s index 117c3e8f32..7f0ed7cefe 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__15J3DIndBlockFullFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__15J3DIndBlockFullFv.s @@ -39,8 +39,8 @@ lbl_8031E1AC: /* 8031E1B0 41 80 FF D8 */ blt lbl_8031E188 /* 8031E1B4 88 1F 00 06 */ lbz r0, 6(r31) /* 8031E1B8 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031E1BC 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031E1C0 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031E1BC 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031E1C0 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031E1C4 7D 00 22 14 */ add r8, r0, r4 /* 8031E1C8 88 7F 00 05 */ lbz r3, 5(r31) /* 8031E1CC A0 88 00 00 */ lhz r4, 0(r8) @@ -58,8 +58,8 @@ lbl_8031E1AC: /* 8031E1FC 4B FF 00 39 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031E200 88 1F 00 0A */ lbz r0, 0xa(r31) /* 8031E204 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031E208 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031E20C 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031E208 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031E20C 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031E210 7D 00 22 14 */ add r8, r0, r4 /* 8031E214 88 7F 00 09 */ lbz r3, 9(r31) /* 8031E218 A0 88 00 00 */ lhz r4, 0(r8) @@ -77,8 +77,8 @@ lbl_8031E1AC: /* 8031E248 4B FE FF ED */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031E24C 88 1F 00 0E */ lbz r0, 0xe(r31) /* 8031E250 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031E254 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031E258 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031E254 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031E258 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031E25C 7D 00 22 14 */ add r8, r0, r4 /* 8031E260 88 7F 00 0D */ lbz r3, 0xd(r31) /* 8031E264 A0 88 00 00 */ lhz r4, 0(r8) @@ -96,8 +96,8 @@ lbl_8031E1AC: /* 8031E294 4B FE FF A1 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031E298 88 1F 00 12 */ lbz r0, 0x12(r31) /* 8031E29C 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031E2A0 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031E2A4 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031E2A0 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031E2A4 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031E2A8 7D 00 22 14 */ add r8, r0, r4 /* 8031E2AC 88 7F 00 11 */ lbz r3, 0x11(r31) /* 8031E2B0 A0 88 00 00 */ lhz r4, 0(r8) diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__16J3DPEBlockFogOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__16J3DPEBlockFogOffFv.s index f57edd4354..a775089727 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__16J3DPEBlockFogOffFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__16J3DPEBlockFogOffFv.s @@ -13,8 +13,8 @@ lbl_8031EC50: /* 8031EC7C 48 04 24 59 */ bl GDOverflowed lbl_8031EC80: /* 8031EC80 88 FF 00 07 */ lbz r7, 7(r31) -/* 8031EC84 3C 60 80 43 */ lis r3, j3dAlphaCmpTable@ha -/* 8031EC88 38 83 6E 60 */ addi r4, r3, j3dAlphaCmpTable@l +/* 8031EC84 3C 60 80 43 */ lis r3, j3dAlphaCmpTable@ha /* 0x80436E60@ha */ +/* 8031EC88 38 83 6E 60 */ addi r4, r3, j3dAlphaCmpTable@l /* 0x80436E60@l */ /* 8031EC8C A0 1F 00 04 */ lhz r0, 4(r31) /* 8031EC90 1C 00 00 03 */ mulli r0, r0, 3 /* 8031EC94 7C 64 02 14 */ add r3, r4, r0 @@ -192,8 +192,8 @@ lbl_8031EF00: /* 8031EF24 38 03 00 01 */ addi r0, r3, 1 /* 8031EF28 90 04 00 08 */ stw r0, 8(r4) /* 8031EF2C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031EF30 3C 60 80 43 */ lis r3, j3dZModeTable@ha -/* 8031EF34 38 83 71 60 */ addi r4, r3, j3dZModeTable@l +/* 8031EF30 3C 60 80 43 */ lis r3, j3dZModeTable@ha /* 0x80437160@ha */ +/* 8031EF34 38 83 71 60 */ addi r4, r3, j3dZModeTable@l /* 0x80437160@l */ /* 8031EF38 A0 1F 00 0C */ lhz r0, 0xc(r31) /* 8031EF3C 1C 00 00 03 */ mulli r0, r0, 3 /* 8031EF40 7C 64 02 14 */ add r3, r4, r0 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock1Fv.s index 7c37504f00..4f1a21e8a1 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock1Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock1Fv.s @@ -29,8 +29,8 @@ lbl_8031C334: /* 8031C350 4B FF 2D B9 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031C354 88 1E 00 0B */ lbz r0, 0xb(r30) /* 8031C358 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031C35C 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031C360 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031C35C 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031C360 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031C364 7D 00 22 14 */ add r8, r0, r4 /* 8031C368 88 7E 00 0A */ lbz r3, 0xa(r30) /* 8031C36C A0 88 00 00 */ lhz r4, 0(r8) diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock2Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock2Fv.s index bb4a0fe1eb..c697fe9893 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock2Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock2Fv.s @@ -37,8 +37,8 @@ lbl_8031C5B0: /* 8031C5DC 4B FF 2B 2D */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031C5E0 88 1E 00 0D */ lbz r0, 0xd(r30) /* 8031C5E4 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031C5E8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031C5EC 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031C5E8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031C5EC 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031C5F0 7D 00 22 14 */ add r8, r0, r4 /* 8031C5F4 88 7E 00 0C */ lbz r3, 0xc(r30) /* 8031C5F8 A0 88 00 00 */ lhz r4, 0(r8) @@ -56,8 +56,8 @@ lbl_8031C5B0: /* 8031C628 4B FF 1C 0D */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031C62C 88 1E 00 11 */ lbz r0, 0x11(r30) /* 8031C630 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c -/* 8031C634 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031C638 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031C634 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031C638 38 03 4C 2C */ addi r0, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031C63C 7D 00 22 14 */ add r8, r0, r4 /* 8031C640 88 1E 00 10 */ lbz r0, 0x10(r30) /* 8031C644 54 03 07 7E */ clrlwi r3, r0, 0x1d diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock4Fv.s index a4de41e510..686e65db4e 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock4Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__12J3DTevBlock4Fv.s @@ -30,8 +30,8 @@ lbl_8031C8B0: /* 8031C8BC 41 80 FF D8 */ blt lbl_8031C894 /* 8031C8C0 3B 60 00 00 */ li r27, 0 /* 8031C8C4 3B 20 00 00 */ li r25, 0 -/* 8031C8C8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031C8CC 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031C8C8 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031C8CC 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031C8D0 48 00 00 CC */ b lbl_8031C99C lbl_8031C8D4: /* 8031C8D4 38 1B 00 01 */ addi r0, r27, 1 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__13J3DTevBlock16Fv.s index 63f7e9bab3..f1245fed14 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__13J3DTevBlock16Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__13J3DTevBlock16Fv.s @@ -30,8 +30,8 @@ lbl_8031CBD8: /* 8031CBE4 41 80 FF D8 */ blt lbl_8031CBBC /* 8031CBE8 3B 60 00 00 */ li r27, 0 /* 8031CBEC 3B 20 00 00 */ li r25, 0 -/* 8031CBF0 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031CBF4 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031CBF0 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031CBF4 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031CBF8 48 00 00 CC */ b lbl_8031CCC4 lbl_8031CBFC: /* 8031CBFC 38 1B 00 01 */ addi r0, r27, 1 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv.s index a038a4c311..ea7a07bb00 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv.s @@ -30,8 +30,8 @@ lbl_8031C108: /* 8031C114 41 80 FF D8 */ blt lbl_8031C0EC /* 8031C118 3B 60 00 00 */ li r27, 0 /* 8031C11C 3B 20 00 00 */ li r25, 0 -/* 8031C120 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 8031C124 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l +/* 8031C120 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8031C124 3B E3 4C 2C */ addi r31, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8031C128 48 00 00 CC */ b lbl_8031C1F4 lbl_8031C12C: /* 8031C12C 38 1B 00 01 */ addi r0, r27, 1 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__13J3DTevBlock16Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__13J3DTevBlock16Fv.s index 1bd54e3979..072cd6f4cc 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__13J3DTevBlock16Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__13J3DTevBlock16Fv.s @@ -15,8 +15,8 @@ lbl_8031DED0: /* 8031DF04 3B E0 00 00 */ li r31, 0 /* 8031DF08 3B C0 00 00 */ li r30, 0 /* 8031DF0C 3B 80 00 00 */ li r28, 0 -/* 8031DF10 3C 60 80 43 */ lis r3, j3dSys@ha -/* 8031DF14 3B 63 4A C8 */ addi r27, r3, j3dSys@l +/* 8031DF10 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 8031DF14 3B 63 4A C8 */ addi r27, r3, j3dSys@l /* 0x80434AC8@l */ lbl_8031DF18: /* 8031DF18 3B 3C 00 08 */ addi r25, r28, 8 /* 8031DF1C 7F 3D CA 14 */ add r25, r29, r25 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__18J3DTevBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__18J3DTevBlockPatchedFv.s index f15f8368c5..fe442d649f 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__18J3DTevBlockPatchedFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/ptrToIndex__18J3DTevBlockPatchedFv.s @@ -15,8 +15,8 @@ lbl_8031DFB4: /* 8031DFE8 3B E0 00 00 */ li r31, 0 /* 8031DFEC 3B C0 00 00 */ li r30, 0 /* 8031DFF0 3B 80 00 00 */ li r28, 0 -/* 8031DFF4 3C 60 80 43 */ lis r3, j3dSys@ha -/* 8031DFF8 3B 63 4A C8 */ addi r27, r3, j3dSys@l +/* 8031DFF4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 8031DFF8 3B 63 4A C8 */ addi r27, r3, j3dSys@l /* 0x80434AC8@l */ lbl_8031DFFC: /* 8031DFFC 3B 3C 00 08 */ addi r25, r28, 8 /* 8031E000 7F 3D CA 14 */ add r25, r29, r25 diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__15J3DTexGenBlock4FP14J3DTexGenBlock.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__15J3DTexGenBlock4FP14J3DTexGenBlock.s index 108d8979eb..751380a063 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__15J3DTexGenBlock4FP14J3DTexGenBlock.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__15J3DTexGenBlock4FP14J3DTexGenBlock.s @@ -58,8 +58,8 @@ lbl_80320218: /* 80320278 48 01 B3 65 */ bl DCStoreRange /* 8032027C 48 00 00 18 */ b lbl_80320294 lbl_80320280: -/* 80320280 3C 60 80 3A */ lis r3, J3DMatBlock__stringBase0@ha -/* 80320284 38 63 1E A8 */ addi r3, r3, J3DMatBlock__stringBase0@l +/* 80320280 3C 60 80 3A */ lis r3, J3DMatBlock__stringBase0@ha /* 0x803A1EA8@ha */ +/* 80320284 38 63 1E A8 */ addi r3, r3, J3DMatBlock__stringBase0@l /* 0x803A1EA8@l */ /* 80320288 7F A4 EB 78 */ mr r4, r29 /* 8032028C 4C C6 31 82 */ crclr 6 /* 80320290 4B CE 68 2D */ bl OSReport diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock.s index 79305e0560..7e1de0ba12 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock.s @@ -58,8 +58,8 @@ lbl_80320354: /* 803203B4 48 01 B2 29 */ bl DCStoreRange /* 803203B8 48 00 00 18 */ b lbl_803203D0 lbl_803203BC: -/* 803203BC 3C 60 80 3A */ lis r3, J3DMatBlock__stringBase0@ha -/* 803203C0 38 63 1E A8 */ addi r3, r3, J3DMatBlock__stringBase0@l +/* 803203BC 3C 60 80 3A */ lis r3, J3DMatBlock__stringBase0@ha /* 0x803A1EA8@ha */ +/* 803203C0 38 63 1E A8 */ addi r3, r3, J3DMatBlock__stringBase0@l /* 0x803A1EA8@l */ /* 803203C4 7F A4 EB 78 */ mr r4, r29 /* 803203C8 4C C6 31 82 */ crclr 6 /* 803203CC 4B CE 66 F1 */ bl OSReport diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock.s index 93a3c1f56b..147315252e 100644 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock.s +++ b/asm/JSystem/J3DGraphBase/J3DMatBlock/reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock.s @@ -58,8 +58,8 @@ lbl_803200FC: /* 8032015C 48 01 B4 81 */ bl DCStoreRange /* 80320160 48 00 00 18 */ b lbl_80320178 lbl_80320164: -/* 80320164 3C 60 80 3A */ lis r3, J3DMatBlock__stringBase0@ha -/* 80320168 38 63 1E A8 */ addi r3, r3, J3DMatBlock__stringBase0@l +/* 80320164 3C 60 80 3A */ lis r3, J3DMatBlock__stringBase0@ha /* 0x803A1EA8@ha */ +/* 80320168 38 63 1E A8 */ addi r3, r3, J3DMatBlock__stringBase0@l /* 0x803A1EA8@l */ /* 8032016C 7F A4 EB 78 */ mr r4, r29 /* 80320170 4C C6 31 82 */ crclr 6 /* 80320174 4B CE 69 49 */ bl OSReport diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__10J3DPEBlockFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__10J3DPEBlockFv.s index 16331085f3..756f185437 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__10J3DPEBlockFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__10J3DPEBlockFv.s @@ -5,8 +5,8 @@ lbl_803172B4: /* 803172C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 803172C4 7C 7F 1B 79 */ or. r31, r3, r3 /* 803172C8 41 82 00 1C */ beq lbl_803172E4 -/* 803172CC 3C A0 80 3D */ lis r5, __vt__10J3DPEBlock@ha -/* 803172D0 38 05 DD 20 */ addi r0, r5, __vt__10J3DPEBlock@l +/* 803172CC 3C A0 80 3D */ lis r5, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ +/* 803172D0 38 05 DD 20 */ addi r0, r5, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ /* 803172D4 90 1F 00 00 */ stw r0, 0(r31) /* 803172D8 7C 80 07 35 */ extsh. r0, r4 /* 803172DC 40 81 00 08 */ ble lbl_803172E4 diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__11J3DIndBlockFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__11J3DIndBlockFv.s index d6d6cc1122..034903859a 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__11J3DIndBlockFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__11J3DIndBlockFv.s @@ -5,8 +5,8 @@ lbl_8031726C: /* 80317278 93 E1 00 0C */ stw r31, 0xc(r1) /* 8031727C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80317280 41 82 00 1C */ beq lbl_8031729C -/* 80317284 3C A0 80 3D */ lis r5, __vt__11J3DIndBlock@ha -/* 80317288 38 05 DD E8 */ addi r0, r5, __vt__11J3DIndBlock@l +/* 80317284 3C A0 80 3D */ lis r5, __vt__11J3DIndBlock@ha /* 0x803CDDE8@ha */ +/* 80317288 38 05 DD E8 */ addi r0, r5, __vt__11J3DIndBlock@l /* 0x803CDDE8@l */ /* 8031728C 90 1F 00 00 */ stw r0, 0(r31) /* 80317290 7C 80 07 35 */ extsh. r0, r4 /* 80317294 40 81 00 08 */ ble lbl_8031729C diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__11J3DTevBlockFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__11J3DTevBlockFv.s index a60737eb9a..e00e831f04 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__11J3DTevBlockFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__11J3DTevBlockFv.s @@ -5,8 +5,8 @@ lbl_80317224: /* 80317230 93 E1 00 0C */ stw r31, 0xc(r1) /* 80317234 7C 7F 1B 79 */ or. r31, r3, r3 /* 80317238 41 82 00 1C */ beq lbl_80317254 -/* 8031723C 3C A0 80 3D */ lis r5, __vt__11J3DTevBlock@ha -/* 80317240 38 05 E9 58 */ addi r0, r5, __vt__11J3DTevBlock@l +/* 8031723C 3C A0 80 3D */ lis r5, __vt__11J3DTevBlock@ha /* 0x803CE958@ha */ +/* 80317240 38 05 E9 58 */ addi r0, r5, __vt__11J3DTevBlock@l /* 0x803CE958@l */ /* 80317244 90 1F 00 00 */ stw r0, 0(r31) /* 80317248 7C 80 07 35 */ extsh. r0, r4 /* 8031724C 40 81 00 08 */ ble lbl_80317254 diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__13J3DColorBlockFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__13J3DColorBlockFv.s index 9e90797fbf..2c6183d1fc 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__13J3DColorBlockFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__13J3DColorBlockFv.s @@ -5,8 +5,8 @@ lbl_80317138: /* 80317144 93 E1 00 0C */ stw r31, 0xc(r1) /* 80317148 7C 7F 1B 79 */ or. r31, r3, r3 /* 8031714C 41 82 00 1C */ beq lbl_80317168 -/* 80317150 3C A0 80 3D */ lis r5, __vt__13J3DColorBlock@ha -/* 80317154 38 05 DE A0 */ addi r0, r5, __vt__13J3DColorBlock@l +/* 80317150 3C A0 80 3D */ lis r5, __vt__13J3DColorBlock@ha /* 0x803CDEA0@ha */ +/* 80317154 38 05 DE A0 */ addi r0, r5, __vt__13J3DColorBlock@l /* 0x803CDEA0@l */ /* 80317158 90 1F 00 00 */ stw r0, 0(r31) /* 8031715C 7C 80 07 35 */ extsh. r0, r4 /* 80317160 40 81 00 08 */ ble lbl_80317168 diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__14J3DTexGenBlockFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__14J3DTexGenBlockFv.s index 0dba359745..eab98003d5 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__14J3DTexGenBlockFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__14J3DTexGenBlockFv.s @@ -5,8 +5,8 @@ lbl_803171DC: /* 803171E8 93 E1 00 0C */ stw r31, 0xc(r1) /* 803171EC 7C 7F 1B 79 */ or. r31, r3, r3 /* 803171F0 41 82 00 1C */ beq lbl_8031720C -/* 803171F4 3C A0 80 3D */ lis r5, __vt__14J3DTexGenBlock@ha -/* 803171F8 38 05 DE 34 */ addi r0, r5, __vt__14J3DTexGenBlock@l +/* 803171F4 3C A0 80 3D */ lis r5, __vt__14J3DTexGenBlock@ha /* 0x803CDE34@ha */ +/* 803171F8 38 05 DE 34 */ addi r0, r5, __vt__14J3DTexGenBlock@l /* 0x803CDE34@l */ /* 803171FC 90 1F 00 00 */ stw r0, 0(r31) /* 80317200 7C 80 07 35 */ extsh. r0, r4 /* 80317204 40 81 00 08 */ ble lbl_8031720C diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__15J3DIndBlockNullFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__15J3DIndBlockNullFv.s index 0d7270fcb5..bfb355f4e0 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__15J3DIndBlockNullFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__15J3DIndBlockNullFv.s @@ -5,12 +5,12 @@ lbl_803173B0: /* 803173BC 93 E1 00 0C */ stw r31, 0xc(r1) /* 803173C0 7C 7F 1B 79 */ or. r31, r3, r3 /* 803173C4 41 82 00 30 */ beq lbl_803173F4 -/* 803173C8 3C 60 80 3D */ lis r3, __vt__15J3DIndBlockNull@ha -/* 803173CC 38 03 DD 9C */ addi r0, r3, __vt__15J3DIndBlockNull@l +/* 803173C8 3C 60 80 3D */ lis r3, __vt__15J3DIndBlockNull@ha /* 0x803CDD9C@ha */ +/* 803173CC 38 03 DD 9C */ addi r0, r3, __vt__15J3DIndBlockNull@l /* 0x803CDD9C@l */ /* 803173D0 90 1F 00 00 */ stw r0, 0(r31) /* 803173D4 41 82 00 10 */ beq lbl_803173E4 -/* 803173D8 3C 60 80 3D */ lis r3, __vt__11J3DIndBlock@ha -/* 803173DC 38 03 DD E8 */ addi r0, r3, __vt__11J3DIndBlock@l +/* 803173D8 3C 60 80 3D */ lis r3, __vt__11J3DIndBlock@ha /* 0x803CDDE8@ha */ +/* 803173DC 38 03 DD E8 */ addi r0, r3, __vt__11J3DIndBlock@l /* 0x803CDDE8@l */ /* 803173E0 90 1F 00 00 */ stw r0, 0(r31) lbl_803173E4: /* 803173E4 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__21J3DColorBlockLightOffFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__21J3DColorBlockLightOffFv.s index 814108ec7a..79e507a56f 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__21J3DColorBlockLightOffFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__21J3DColorBlockLightOffFv.s @@ -5,12 +5,12 @@ lbl_803170DC: /* 803170E8 93 E1 00 0C */ stw r31, 0xc(r1) /* 803170EC 7C 7F 1B 79 */ or. r31, r3, r3 /* 803170F0 41 82 00 30 */ beq lbl_80317120 -/* 803170F4 3C 60 80 3D */ lis r3, __vt__21J3DColorBlockLightOff@ha -/* 803170F8 38 03 EA 34 */ addi r0, r3, __vt__21J3DColorBlockLightOff@l +/* 803170F4 3C 60 80 3D */ lis r3, __vt__21J3DColorBlockLightOff@ha /* 0x803CEA34@ha */ +/* 803170F8 38 03 EA 34 */ addi r0, r3, __vt__21J3DColorBlockLightOff@l /* 0x803CEA34@l */ /* 803170FC 90 1F 00 00 */ stw r0, 0(r31) /* 80317100 41 82 00 10 */ beq lbl_80317110 -/* 80317104 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha -/* 80317108 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l +/* 80317104 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha /* 0x803CDEA0@ha */ +/* 80317108 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l /* 0x803CDEA0@l */ /* 8031710C 90 1F 00 00 */ stw r0, 0(r31) lbl_80317110: /* 80317110 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__21J3DTexGenBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__21J3DTexGenBlockPatchedFv.s index 6aef4c8786..409b32f7dc 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__21J3DTexGenBlockPatchedFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/__dt__21J3DTexGenBlockPatchedFv.s @@ -5,12 +5,12 @@ lbl_80317180: /* 8031718C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80317190 7C 7F 1B 79 */ or. r31, r3, r3 /* 80317194 41 82 00 30 */ beq lbl_803171C4 -/* 80317198 3C 60 80 3D */ lis r3, __vt__21J3DTexGenBlockPatched@ha -/* 8031719C 38 03 E6 0C */ addi r0, r3, __vt__21J3DTexGenBlockPatched@l +/* 80317198 3C 60 80 3D */ lis r3, __vt__21J3DTexGenBlockPatched@ha /* 0x803CE60C@ha */ +/* 8031719C 38 03 E6 0C */ addi r0, r3, __vt__21J3DTexGenBlockPatched@l /* 0x803CE60C@l */ /* 803171A0 90 1F 00 00 */ stw r0, 0(r31) /* 803171A4 41 82 00 10 */ beq lbl_803171B4 -/* 803171A8 3C 60 80 3D */ lis r3, __vt__14J3DTexGenBlock@ha -/* 803171AC 38 03 DE 34 */ addi r0, r3, __vt__14J3DTexGenBlock@l +/* 803171A8 3C 60 80 3D */ lis r3, __vt__14J3DTexGenBlock@ha /* 0x803CDE34@ha */ +/* 803171AC 38 03 DE 34 */ addi r0, r3, __vt__14J3DTexGenBlock@l /* 0x803CDE34@l */ /* 803171B0 90 1F 00 00 */ stw r0, 0(r31) lbl_803171B4: /* 803171B4 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/calcCurrentMtx__11J3DMaterialFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/calcCurrentMtx__11J3DMaterialFv.s index 757ce3a0b0..9ac253a188 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/calcCurrentMtx__11J3DMaterialFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/calcCurrentMtx__11J3DMaterialFv.s @@ -5,8 +5,8 @@ lbl_80316AC8: /* 80316AD4 39 61 00 30 */ addi r11, r1, 0x30 /* 80316AD8 48 04 B6 F1 */ bl _savegpr_24 /* 80316ADC 7C 7B 1B 78 */ mr r27, r3 -/* 80316AE0 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80316AE4 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80316AE0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80316AE4 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80316AE8 80 03 00 34 */ lwz r0, 0x34(r3) /* 80316AEC 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 /* 80316AF0 40 82 01 28 */ bne lbl_80316C18 diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/calcDiffTexMtx__11J3DMaterialFPA4_Cf.s b/asm/JSystem/J3DGraphBase/J3DMaterial/calcDiffTexMtx__11J3DMaterialFPA4_Cf.s index 730f99b53c..69cb5a88b4 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/calcDiffTexMtx__11J3DMaterialFPA4_Cf.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/calcDiffTexMtx__11J3DMaterialFPA4_Cf.s @@ -2,8 +2,8 @@ lbl_80316A54: /* 80316A54 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80316A58 7C 08 02 A6 */ mflr r0 /* 80316A5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80316A60 3C A0 80 43 */ lis r5, j3dSys@ha -/* 80316A64 38 A5 4A C8 */ addi r5, r5, j3dSys@l +/* 80316A60 3C A0 80 43 */ lis r5, j3dSys@ha /* 0x80434AC8@ha */ +/* 80316A64 38 A5 4A C8 */ addi r5, r5, j3dSys@l /* 0x80434AC8@l */ /* 80316A68 80 05 00 34 */ lwz r0, 0x34(r5) /* 80316A6C 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 /* 80316A70 41 82 00 1C */ beq lbl_80316A8C diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/calc__11J3DMaterialFPA4_Cf.s b/asm/JSystem/J3DGraphBase/J3DMaterial/calc__11J3DMaterialFPA4_Cf.s index 3e7b3614cb..aab2443a09 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/calc__11J3DMaterialFPA4_Cf.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/calc__11J3DMaterialFPA4_Cf.s @@ -4,8 +4,8 @@ lbl_803169DC: /* 803169E4 90 01 00 14 */ stw r0, 0x14(r1) /* 803169E8 93 E1 00 0C */ stw r31, 0xc(r1) /* 803169EC 7C 7F 1B 78 */ mr r31, r3 -/* 803169F0 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803169F4 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803169F0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803169F4 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803169F8 80 03 00 34 */ lwz r0, 0x34(r3) /* 803169FC 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 /* 80316A00 41 82 00 1C */ beq lbl_80316A1C diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/createColorBlock__11J3DMaterialFUl.s b/asm/JSystem/J3DGraphBase/J3DMaterial/createColorBlock__11J3DMaterialFUl.s index 1e7bedb790..08712e3624 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/createColorBlock__11J3DMaterialFUl.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/createColorBlock__11J3DMaterialFUl.s @@ -23,22 +23,22 @@ lbl_803157E8: /* 803157EC 4B FB 94 61 */ bl __nw__FUl /* 803157F0 7C 7F 1B 79 */ or. r31, r3, r3 /* 803157F4 41 82 00 5C */ beq lbl_80315850 -/* 803157F8 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha -/* 803157FC 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l +/* 803157F8 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha /* 0x803CDEA0@ha */ +/* 803157FC 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l /* 0x803CDEA0@l */ /* 80315800 90 1F 00 00 */ stw r0, 0(r31) -/* 80315804 3C 60 80 3D */ lis r3, __vt__21J3DColorBlockLightOff@ha -/* 80315808 38 03 EA 34 */ addi r0, r3, __vt__21J3DColorBlockLightOff@l +/* 80315804 3C 60 80 3D */ lis r3, __vt__21J3DColorBlockLightOff@ha /* 0x803CEA34@ha */ +/* 80315808 38 03 EA 34 */ addi r0, r3, __vt__21J3DColorBlockLightOff@l /* 0x803CEA34@l */ /* 8031580C 90 1F 00 00 */ stw r0, 0(r31) /* 80315810 38 7F 00 04 */ addi r3, r31, 4 -/* 80315814 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha -/* 80315818 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l +/* 80315814 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha /* 0x8000E538@ha */ +/* 80315818 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 0x8000E538@l */ /* 8031581C 38 A0 00 00 */ li r5, 0 /* 80315820 38 C0 00 04 */ li r6, 4 /* 80315824 38 E0 00 02 */ li r7, 2 /* 80315828 48 04 C5 39 */ bl __construct_array /* 8031582C 38 7F 00 0E */ addi r3, r31, 0xe -/* 80315830 3C 80 80 01 */ lis r4, __ct__12J3DColorChanFv@ha -/* 80315834 38 84 E4 7C */ addi r4, r4, __ct__12J3DColorChanFv@l +/* 80315830 3C 80 80 01 */ lis r4, __ct__12J3DColorChanFv@ha /* 0x8000E47C@ha */ +/* 80315834 38 84 E4 7C */ addi r4, r4, __ct__12J3DColorChanFv@l /* 0x8000E47C@l */ /* 80315838 38 A0 00 00 */ li r5, 0 /* 8031583C 38 C0 00 02 */ li r6, 2 /* 80315840 38 E0 00 04 */ li r7, 4 @@ -53,29 +53,29 @@ lbl_80315858: /* 8031585C 4B FB 93 F1 */ bl __nw__FUl /* 80315860 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315864 41 82 00 78 */ beq lbl_803158DC -/* 80315868 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha -/* 8031586C 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l +/* 80315868 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha /* 0x803CDEA0@ha */ +/* 8031586C 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l /* 0x803CDEA0@l */ /* 80315870 90 1F 00 00 */ stw r0, 0(r31) -/* 80315874 3C 60 80 3D */ lis r3, __vt__20J3DColorBlockLightOn@ha -/* 80315878 38 03 E6 78 */ addi r0, r3, __vt__20J3DColorBlockLightOn@l +/* 80315874 3C 60 80 3D */ lis r3, __vt__20J3DColorBlockLightOn@ha /* 0x803CE678@ha */ +/* 80315878 38 03 E6 78 */ addi r0, r3, __vt__20J3DColorBlockLightOn@l /* 0x803CE678@l */ /* 8031587C 90 1F 00 00 */ stw r0, 0(r31) /* 80315880 38 7F 00 04 */ addi r3, r31, 4 -/* 80315884 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha -/* 80315888 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l +/* 80315884 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha /* 0x8000E538@ha */ +/* 80315888 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 0x8000E538@l */ /* 8031588C 38 A0 00 00 */ li r5, 0 /* 80315890 38 C0 00 04 */ li r6, 4 /* 80315894 38 E0 00 02 */ li r7, 2 /* 80315898 48 04 C4 C9 */ bl __construct_array /* 8031589C 38 7F 00 0C */ addi r3, r31, 0xc -/* 803158A0 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha -/* 803158A4 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l +/* 803158A0 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha /* 0x8000E538@ha */ +/* 803158A4 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 0x8000E538@l */ /* 803158A8 38 A0 00 00 */ li r5, 0 /* 803158AC 38 C0 00 04 */ li r6, 4 /* 803158B0 38 E0 00 02 */ li r7, 2 /* 803158B4 48 04 C4 AD */ bl __construct_array /* 803158B8 38 7F 00 16 */ addi r3, r31, 0x16 -/* 803158BC 3C 80 80 01 */ lis r4, __ct__12J3DColorChanFv@ha -/* 803158C0 38 84 E4 7C */ addi r4, r4, __ct__12J3DColorChanFv@l +/* 803158BC 3C 80 80 01 */ lis r4, __ct__12J3DColorChanFv@ha /* 0x8000E47C@ha */ +/* 803158C0 38 84 E4 7C */ addi r4, r4, __ct__12J3DColorChanFv@l /* 0x8000E47C@l */ /* 803158C4 38 A0 00 00 */ li r5, 0 /* 803158C8 38 C0 00 02 */ li r6, 2 /* 803158CC 38 E0 00 04 */ li r7, 4 @@ -91,34 +91,34 @@ lbl_803158E4: /* 803158EC 7C 7F 1B 79 */ or. r31, r3, r3 /* 803158F0 41 82 00 90 */ beq lbl_80315980 /* 803158F4 7F FE FB 78 */ mr r30, r31 -/* 803158F8 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha -/* 803158FC 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l +/* 803158F8 3C 60 80 3D */ lis r3, __vt__13J3DColorBlock@ha /* 0x803CDEA0@ha */ +/* 803158FC 38 03 DE A0 */ addi r0, r3, __vt__13J3DColorBlock@l /* 0x803CDEA0@l */ /* 80315900 90 1F 00 00 */ stw r0, 0(r31) -/* 80315904 3C 60 80 3D */ lis r3, __vt__21J3DColorBlockLightOff@ha -/* 80315908 38 03 EA 34 */ addi r0, r3, __vt__21J3DColorBlockLightOff@l +/* 80315904 3C 60 80 3D */ lis r3, __vt__21J3DColorBlockLightOff@ha /* 0x803CEA34@ha */ +/* 80315908 38 03 EA 34 */ addi r0, r3, __vt__21J3DColorBlockLightOff@l /* 0x803CEA34@l */ /* 8031590C 90 1F 00 00 */ stw r0, 0(r31) /* 80315910 38 7F 00 04 */ addi r3, r31, 4 -/* 80315914 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha -/* 80315918 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l +/* 80315914 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha /* 0x8000E538@ha */ +/* 80315918 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 0x8000E538@l */ /* 8031591C 38 A0 00 00 */ li r5, 0 /* 80315920 38 C0 00 04 */ li r6, 4 /* 80315924 38 E0 00 02 */ li r7, 2 /* 80315928 48 04 C4 39 */ bl __construct_array /* 8031592C 38 7F 00 0E */ addi r3, r31, 0xe -/* 80315930 3C 80 80 01 */ lis r4, __ct__12J3DColorChanFv@ha -/* 80315934 38 84 E4 7C */ addi r4, r4, __ct__12J3DColorChanFv@l +/* 80315930 3C 80 80 01 */ lis r4, __ct__12J3DColorChanFv@ha /* 0x8000E47C@ha */ +/* 80315934 38 84 E4 7C */ addi r4, r4, __ct__12J3DColorChanFv@l /* 0x8000E47C@l */ /* 80315938 38 A0 00 00 */ li r5, 0 /* 8031593C 38 C0 00 02 */ li r6, 2 /* 80315940 38 E0 00 04 */ li r7, 4 /* 80315944 48 04 C4 1D */ bl __construct_array /* 80315948 7F E3 FB 78 */ mr r3, r31 /* 8031594C 48 00 1B 31 */ bl initialize__21J3DColorBlockLightOffFv -/* 80315950 3C 60 80 3D */ lis r3, __vt__22J3DColorBlockAmbientOn@ha -/* 80315954 38 03 E7 08 */ addi r0, r3, __vt__22J3DColorBlockAmbientOn@l +/* 80315950 3C 60 80 3D */ lis r3, __vt__22J3DColorBlockAmbientOn@ha /* 0x803CE708@ha */ +/* 80315954 38 03 E7 08 */ addi r0, r3, __vt__22J3DColorBlockAmbientOn@l /* 0x803CE708@l */ /* 80315958 90 1E 00 00 */ stw r0, 0(r30) /* 8031595C 38 7E 00 20 */ addi r3, r30, 0x20 -/* 80315960 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha -/* 80315964 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l +/* 80315960 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha /* 0x8000E538@ha */ +/* 80315964 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 0x8000E538@l */ /* 80315968 38 A0 00 00 */ li r5, 0 /* 8031596C 38 C0 00 04 */ li r6, 4 /* 80315970 38 E0 00 02 */ li r7, 2 diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/createIndBlock__11J3DMaterialFi.s b/asm/JSystem/J3DGraphBase/J3DMaterial/createIndBlock__11J3DMaterialFi.s index 37e48e9ba4..a93ae24b14 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/createIndBlock__11J3DMaterialFi.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/createIndBlock__11J3DMaterialFi.s @@ -9,32 +9,32 @@ lbl_80315E78: /* 80315E94 4B FB 8D B9 */ bl __nw__FUl /* 80315E98 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315E9C 41 82 00 80 */ beq lbl_80315F1C -/* 80315EA0 3C 60 80 3D */ lis r3, __vt__11J3DIndBlock@ha -/* 80315EA4 38 03 DD E8 */ addi r0, r3, __vt__11J3DIndBlock@l +/* 80315EA0 3C 60 80 3D */ lis r3, __vt__11J3DIndBlock@ha /* 0x803CDDE8@ha */ +/* 80315EA4 38 03 DD E8 */ addi r0, r3, __vt__11J3DIndBlock@l /* 0x803CDDE8@l */ /* 80315EA8 90 1F 00 00 */ stw r0, 0(r31) -/* 80315EAC 3C 60 80 3D */ lis r3, __vt__15J3DIndBlockFull@ha -/* 80315EB0 38 03 E9 0C */ addi r0, r3, __vt__15J3DIndBlockFull@l +/* 80315EAC 3C 60 80 3D */ lis r3, __vt__15J3DIndBlockFull@ha /* 0x803CE90C@ha */ +/* 80315EB0 38 03 E9 0C */ addi r0, r3, __vt__15J3DIndBlockFull@l /* 0x803CE90C@l */ /* 80315EB4 90 1F 00 00 */ stw r0, 0(r31) /* 80315EB8 38 7F 00 05 */ addi r3, r31, 5 -/* 80315EBC 3C 80 80 01 */ lis r4, __ct__14J3DIndTexOrderFv@ha -/* 80315EC0 38 84 E1 28 */ addi r4, r4, __ct__14J3DIndTexOrderFv@l +/* 80315EBC 3C 80 80 01 */ lis r4, __ct__14J3DIndTexOrderFv@ha /* 0x8000E128@ha */ +/* 80315EC0 38 84 E1 28 */ addi r4, r4, __ct__14J3DIndTexOrderFv@l /* 0x8000E128@l */ /* 80315EC4 38 A0 00 00 */ li r5, 0 /* 80315EC8 38 C0 00 04 */ li r6, 4 /* 80315ECC 38 E0 00 04 */ li r7, 4 /* 80315ED0 48 04 BE 91 */ bl __construct_array /* 80315ED4 38 7F 00 18 */ addi r3, r31, 0x18 -/* 80315ED8 3C 80 80 01 */ lis r4, __ct__12J3DIndTexMtxFv@ha -/* 80315EDC 38 84 E0 F0 */ addi r4, r4, __ct__12J3DIndTexMtxFv@l -/* 80315EE0 3C A0 80 01 */ lis r5, __dt__12J3DIndTexMtxFv@ha -/* 80315EE4 38 A5 E0 64 */ addi r5, r5, __dt__12J3DIndTexMtxFv@l +/* 80315ED8 3C 80 80 01 */ lis r4, __ct__12J3DIndTexMtxFv@ha /* 0x8000E0F0@ha */ +/* 80315EDC 38 84 E0 F0 */ addi r4, r4, __ct__12J3DIndTexMtxFv@l /* 0x8000E0F0@l */ +/* 80315EE0 3C A0 80 01 */ lis r5, __dt__12J3DIndTexMtxFv@ha /* 0x8000E064@ha */ +/* 80315EE4 38 A5 E0 64 */ addi r5, r5, __dt__12J3DIndTexMtxFv@l /* 0x8000E064@l */ /* 80315EE8 38 C0 00 1C */ li r6, 0x1c /* 80315EEC 38 E0 00 03 */ li r7, 3 /* 80315EF0 48 04 BE 71 */ bl __construct_array /* 80315EF4 38 7F 00 6C */ addi r3, r31, 0x6c -/* 80315EF8 3C 80 80 01 */ lis r4, __ct__19J3DIndTexCoordScaleFv@ha -/* 80315EFC 38 84 E0 E4 */ addi r4, r4, __ct__19J3DIndTexCoordScaleFv@l -/* 80315F00 3C A0 80 01 */ lis r5, __dt__19J3DIndTexCoordScaleFv@ha -/* 80315F04 38 A5 E0 24 */ addi r5, r5, __dt__19J3DIndTexCoordScaleFv@l +/* 80315EF8 3C 80 80 01 */ lis r4, __ct__19J3DIndTexCoordScaleFv@ha /* 0x8000E0E4@ha */ +/* 80315EFC 38 84 E0 E4 */ addi r4, r4, __ct__19J3DIndTexCoordScaleFv@l /* 0x8000E0E4@l */ +/* 80315F00 3C A0 80 01 */ lis r5, __dt__19J3DIndTexCoordScaleFv@ha /* 0x8000E024@ha */ +/* 80315F04 38 A5 E0 24 */ addi r5, r5, __dt__19J3DIndTexCoordScaleFv@l /* 0x8000E024@l */ /* 80315F08 38 C0 00 04 */ li r6, 4 /* 80315F0C 38 E0 00 04 */ li r7, 4 /* 80315F10 48 04 BE 51 */ bl __construct_array @@ -48,11 +48,11 @@ lbl_80315F24: /* 80315F28 4B FB 8D 25 */ bl __nw__FUl /* 80315F2C 28 03 00 00 */ cmplwi r3, 0 /* 80315F30 41 82 00 1C */ beq lbl_80315F4C -/* 80315F34 3C 80 80 3D */ lis r4, __vt__11J3DIndBlock@ha -/* 80315F38 38 04 DD E8 */ addi r0, r4, __vt__11J3DIndBlock@l +/* 80315F34 3C 80 80 3D */ lis r4, __vt__11J3DIndBlock@ha /* 0x803CDDE8@ha */ +/* 80315F38 38 04 DD E8 */ addi r0, r4, __vt__11J3DIndBlock@l /* 0x803CDDE8@l */ /* 80315F3C 90 03 00 00 */ stw r0, 0(r3) -/* 80315F40 3C 80 80 3D */ lis r4, __vt__15J3DIndBlockNull@ha -/* 80315F44 38 04 DD 9C */ addi r0, r4, __vt__15J3DIndBlockNull@l +/* 80315F40 3C 80 80 3D */ lis r4, __vt__15J3DIndBlockNull@ha /* 0x803CDD9C@ha */ +/* 80315F44 38 04 DD 9C */ addi r0, r4, __vt__15J3DIndBlockNull@l /* 0x803CDD9C@l */ /* 80315F48 90 03 00 00 */ stw r0, 0(r3) lbl_80315F4C: /* 80315F4C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s b/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s index df012f2efc..48d044540a 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s @@ -12,11 +12,11 @@ lbl_80315F60: /* 80315F88 4B FB 8C C5 */ bl __nw__FUl /* 80315F8C 28 03 00 00 */ cmplwi r3, 0 /* 80315F90 41 82 01 5C */ beq lbl_803160EC -/* 80315F94 3C 80 80 3D */ lis r4, __vt__10J3DPEBlock@ha -/* 80315F98 38 04 DD 20 */ addi r0, r4, __vt__10J3DPEBlock@l +/* 80315F94 3C 80 80 3D */ lis r4, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ +/* 80315F98 38 04 DD 20 */ addi r0, r4, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ /* 80315F9C 90 03 00 00 */ stw r0, 0(r3) -/* 80315FA0 3C 80 80 3D */ lis r4, __vt__13J3DPEBlockOpa@ha -/* 80315FA4 38 04 E8 90 */ addi r0, r4, __vt__13J3DPEBlockOpa@l +/* 80315FA0 3C 80 80 3D */ lis r4, __vt__13J3DPEBlockOpa@ha /* 0x803CE890@ha */ +/* 80315FA4 38 04 E8 90 */ addi r0, r4, __vt__13J3DPEBlockOpa@l /* 0x803CE890@l */ /* 80315FA8 90 03 00 00 */ stw r0, 0(r3) /* 80315FAC 48 00 01 40 */ b lbl_803160EC lbl_80315FB0: @@ -26,11 +26,11 @@ lbl_80315FB0: /* 80315FBC 4B FB 8C 91 */ bl __nw__FUl /* 80315FC0 28 03 00 00 */ cmplwi r3, 0 /* 80315FC4 41 82 01 28 */ beq lbl_803160EC -/* 80315FC8 3C 80 80 3D */ lis r4, __vt__10J3DPEBlock@ha -/* 80315FCC 38 04 DD 20 */ addi r0, r4, __vt__10J3DPEBlock@l +/* 80315FC8 3C 80 80 3D */ lis r4, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ +/* 80315FCC 38 04 DD 20 */ addi r0, r4, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ /* 80315FD0 90 03 00 00 */ stw r0, 0(r3) -/* 80315FD4 3C 80 80 3D */ lis r4, __vt__17J3DPEBlockTexEdge@ha -/* 80315FD8 38 04 E8 14 */ addi r0, r4, __vt__17J3DPEBlockTexEdge@l +/* 80315FD4 3C 80 80 3D */ lis r4, __vt__17J3DPEBlockTexEdge@ha /* 0x803CE814@ha */ +/* 80315FD8 38 04 E8 14 */ addi r0, r4, __vt__17J3DPEBlockTexEdge@l /* 0x803CE814@l */ /* 80315FDC 90 03 00 00 */ stw r0, 0(r3) /* 80315FE0 48 00 01 0C */ b lbl_803160EC lbl_80315FE4: @@ -40,11 +40,11 @@ lbl_80315FE4: /* 80315FF0 4B FB 8C 5D */ bl __nw__FUl /* 80315FF4 28 03 00 00 */ cmplwi r3, 0 /* 80315FF8 41 82 00 F4 */ beq lbl_803160EC -/* 80315FFC 3C 80 80 3D */ lis r4, __vt__10J3DPEBlock@ha -/* 80316000 38 04 DD 20 */ addi r0, r4, __vt__10J3DPEBlock@l +/* 80315FFC 3C 80 80 3D */ lis r4, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ +/* 80316000 38 04 DD 20 */ addi r0, r4, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ /* 80316004 90 03 00 00 */ stw r0, 0(r3) -/* 80316008 3C 80 80 3D */ lis r4, __vt__13J3DPEBlockXlu@ha -/* 8031600C 38 04 E7 98 */ addi r0, r4, __vt__13J3DPEBlockXlu@l +/* 80316008 3C 80 80 3D */ lis r4, __vt__13J3DPEBlockXlu@ha /* 0x803CE798@ha */ +/* 8031600C 38 04 E7 98 */ addi r0, r4, __vt__13J3DPEBlockXlu@l /* 0x803CE798@l */ /* 80316010 90 03 00 00 */ stw r0, 0(r3) /* 80316014 48 00 00 D8 */ b lbl_803160EC lbl_80316018: @@ -55,15 +55,15 @@ lbl_80316018: /* 80316028 4B FB 8C 25 */ bl __nw__FUl /* 8031602C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80316030 41 82 00 B8 */ beq lbl_803160E8 -/* 80316034 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha -/* 80316038 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l +/* 80316034 3C 60 80 3D */ lis r3, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ +/* 80316038 38 03 DD 20 */ addi r0, r3, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ /* 8031603C 90 1F 00 00 */ stw r0, 0(r31) -/* 80316040 3C 60 80 3D */ lis r3, __vt__14J3DPEBlockFull@ha -/* 80316044 38 03 DF F0 */ addi r0, r3, __vt__14J3DPEBlockFull@l +/* 80316040 3C 60 80 3D */ lis r3, __vt__14J3DPEBlockFull@ha /* 0x803CDFF0@ha */ +/* 80316044 38 03 DF F0 */ addi r0, r3, __vt__14J3DPEBlockFull@l /* 0x803CDFF0@l */ /* 80316048 90 1F 00 00 */ stw r0, 0(r31) /* 8031604C 38 7F 00 04 */ addi r3, r31, 4 -/* 80316050 3C 80 80 3A */ lis r4, j3dDefaultFogInfo@ha -/* 80316054 38 84 1F BC */ addi r4, r4, j3dDefaultFogInfo@l +/* 80316050 3C 80 80 3A */ lis r4, j3dDefaultFogInfo@ha /* 0x803A1FBC@ha */ +/* 80316054 38 84 1F BC */ addi r4, r4, j3dDefaultFogInfo@l /* 0x803A1FBC@l */ /* 80316058 48 00 F7 A9 */ bl __as__10J3DFogInfoFRC10J3DFogInfo /* 8031605C A0 02 C9 FA */ lhz r0, struct_804563F8+0x2(r2) /* 80316060 B0 1F 00 30 */ sth r0, 0x30(r31) @@ -85,11 +85,11 @@ lbl_8031608C: /* 8031609C 4B FB 8B B1 */ bl __nw__FUl /* 803160A0 7C 7F 1B 79 */ or. r31, r3, r3 /* 803160A4 41 82 00 44 */ beq lbl_803160E8 -/* 803160A8 3C 80 80 3D */ lis r4, __vt__10J3DPEBlock@ha -/* 803160AC 38 04 DD 20 */ addi r0, r4, __vt__10J3DPEBlock@l +/* 803160A8 3C 80 80 3D */ lis r4, __vt__10J3DPEBlock@ha /* 0x803CDD20@ha */ +/* 803160AC 38 04 DD 20 */ addi r0, r4, __vt__10J3DPEBlock@l /* 0x803CDD20@l */ /* 803160B0 90 1F 00 00 */ stw r0, 0(r31) -/* 803160B4 3C 80 80 3D */ lis r4, __vt__16J3DPEBlockFogOff@ha -/* 803160B8 38 04 E0 6C */ addi r0, r4, __vt__16J3DPEBlockFogOff@l +/* 803160B4 3C 80 80 3D */ lis r4, __vt__16J3DPEBlockFogOff@ha /* 0x803CE06C@ha */ +/* 803160B8 38 04 E0 6C */ addi r0, r4, __vt__16J3DPEBlockFogOff@l /* 0x803CE06C@l */ /* 803160BC 90 1F 00 00 */ stw r0, 0(r31) /* 803160C0 A0 02 C9 FA */ lhz r0, struct_804563F8+0x2(r2) /* 803160C4 B0 1F 00 04 */ sth r0, 4(r31) diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/createTevBlock__11J3DMaterialFi.s b/asm/JSystem/J3DGraphBase/J3DMaterial/createTevBlock__11J3DMaterialFi.s index ac8d14d1ea..50b79d6a06 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/createTevBlock__11J3DMaterialFi.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/createTevBlock__11J3DMaterialFi.s @@ -10,29 +10,29 @@ lbl_80315B04: /* 80315B24 4B FB 91 29 */ bl __nw__FUl /* 80315B28 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315B2C 41 82 00 78 */ beq lbl_80315BA4 -/* 80315B30 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha -/* 80315B34 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l +/* 80315B30 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha /* 0x803CE958@ha */ +/* 80315B34 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l /* 0x803CE958@l */ /* 80315B38 90 1F 00 00 */ stw r0, 0(r31) -/* 80315B3C 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock1@ha -/* 80315B40 38 03 E3 7C */ addi r0, r3, __vt__12J3DTevBlock1@l +/* 80315B3C 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock1@ha /* 0x803CE37C@ha */ +/* 80315B40 38 03 E3 7C */ addi r0, r3, __vt__12J3DTevBlock1@l /* 0x803CE37C@l */ /* 80315B44 90 1F 00 00 */ stw r0, 0(r31) /* 80315B48 38 7F 00 0A */ addi r3, r31, 0xa -/* 80315B4C 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha -/* 80315B50 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l +/* 80315B4C 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha /* 0x8000E140@ha */ +/* 80315B50 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l /* 0x8000E140@l */ /* 80315B54 38 A0 00 00 */ li r5, 0 /* 80315B58 38 C0 00 04 */ li r6, 4 /* 80315B5C 38 E0 00 01 */ li r7, 1 /* 80315B60 48 04 C2 01 */ bl __construct_array /* 80315B64 38 7F 00 0E */ addi r3, r31, 0xe -/* 80315B68 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha -/* 80315B6C 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l +/* 80315B68 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha /* 0x8000E230@ha */ +/* 80315B6C 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l /* 0x8000E230@l */ /* 80315B70 38 A0 00 00 */ li r5, 0 /* 80315B74 38 C0 00 08 */ li r6, 8 /* 80315B78 38 E0 00 01 */ li r7, 1 /* 80315B7C 48 04 C1 E5 */ bl __construct_array /* 80315B80 38 7F 00 18 */ addi r3, r31, 0x18 -/* 80315B84 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha -/* 80315B88 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l +/* 80315B84 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha /* 0x8000E14C@ha */ +/* 80315B88 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l /* 0x8000E14C@l */ /* 80315B8C 38 A0 00 00 */ li r5, 0 /* 80315B90 38 C0 00 04 */ li r6, 4 /* 80315B94 38 E0 00 01 */ li r7, 1 @@ -49,50 +49,50 @@ lbl_80315BAC: /* 80315BB8 4B FB 90 95 */ bl __nw__FUl /* 80315BBC 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315BC0 41 82 00 CC */ beq lbl_80315C8C -/* 80315BC4 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha -/* 80315BC8 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l +/* 80315BC4 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha /* 0x803CE958@ha */ +/* 80315BC8 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l /* 0x803CE958@l */ /* 80315BCC 90 1F 00 00 */ stw r0, 0(r31) -/* 80315BD0 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock2@ha -/* 80315BD4 38 03 E2 A0 */ addi r0, r3, __vt__12J3DTevBlock2@l +/* 80315BD0 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock2@ha /* 0x803CE2A0@ha */ +/* 80315BD4 38 03 E2 A0 */ addi r0, r3, __vt__12J3DTevBlock2@l /* 0x803CE2A0@l */ /* 80315BD8 90 1F 00 00 */ stw r0, 0(r31) /* 80315BDC 38 7F 00 0C */ addi r3, r31, 0xc -/* 80315BE0 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha -/* 80315BE4 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l +/* 80315BE0 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha /* 0x8000E140@ha */ +/* 80315BE4 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l /* 0x8000E140@l */ /* 80315BE8 38 A0 00 00 */ li r5, 0 /* 80315BEC 38 C0 00 04 */ li r6, 4 /* 80315BF0 38 E0 00 02 */ li r7, 2 /* 80315BF4 48 04 C1 6D */ bl __construct_array /* 80315BF8 38 7F 00 14 */ addi r3, r31, 0x14 -/* 80315BFC 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha -/* 80315C00 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l +/* 80315BFC 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha /* 0x8000E460@ha */ +/* 80315C00 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l /* 0x8000E460@l */ /* 80315C04 38 A0 00 00 */ li r5, 0 /* 80315C08 38 C0 00 08 */ li r6, 8 /* 80315C0C 38 E0 00 04 */ li r7, 4 /* 80315C10 48 04 C1 51 */ bl __construct_array /* 80315C14 38 7F 00 35 */ addi r3, r31, 0x35 -/* 80315C18 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha -/* 80315C1C 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l +/* 80315C18 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha /* 0x8000E230@ha */ +/* 80315C1C 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l /* 0x8000E230@l */ /* 80315C20 38 A0 00 00 */ li r5, 0 /* 80315C24 38 C0 00 08 */ li r6, 8 /* 80315C28 38 E0 00 02 */ li r7, 2 /* 80315C2C 48 04 C1 35 */ bl __construct_array /* 80315C30 38 7F 00 45 */ addi r3, r31, 0x45 -/* 80315C34 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha -/* 80315C38 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l +/* 80315C34 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha /* 0x8000E538@ha */ +/* 80315C38 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 0x8000E538@l */ /* 80315C3C 38 A0 00 00 */ li r5, 0 /* 80315C40 38 C0 00 04 */ li r6, 4 /* 80315C44 38 E0 00 04 */ li r7, 4 /* 80315C48 48 04 C1 19 */ bl __construct_array /* 80315C4C 38 7F 00 59 */ addi r3, r31, 0x59 -/* 80315C50 3C 80 80 01 */ lis r4, __ct__19J3DTevSwapModeTableFv@ha -/* 80315C54 38 84 E1 34 */ addi r4, r4, __ct__19J3DTevSwapModeTableFv@l +/* 80315C50 3C 80 80 01 */ lis r4, __ct__19J3DTevSwapModeTableFv@ha /* 0x8000E134@ha */ +/* 80315C54 38 84 E1 34 */ addi r4, r4, __ct__19J3DTevSwapModeTableFv@l /* 0x8000E134@l */ /* 80315C58 38 A0 00 00 */ li r5, 0 /* 80315C5C 38 C0 00 01 */ li r6, 1 /* 80315C60 38 E0 00 04 */ li r7, 4 /* 80315C64 48 04 C0 FD */ bl __construct_array /* 80315C68 38 7F 00 60 */ addi r3, r31, 0x60 -/* 80315C6C 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha -/* 80315C70 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l +/* 80315C6C 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha /* 0x8000E14C@ha */ +/* 80315C70 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l /* 0x8000E14C@l */ /* 80315C74 38 A0 00 00 */ li r5, 0 /* 80315C78 38 C0 00 04 */ li r6, 4 /* 80315C7C 38 E0 00 02 */ li r7, 2 @@ -109,50 +109,50 @@ lbl_80315C94: /* 80315CA0 4B FB 8F AD */ bl __nw__FUl /* 80315CA4 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315CA8 41 82 00 CC */ beq lbl_80315D74 -/* 80315CAC 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha -/* 80315CB0 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l +/* 80315CAC 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha /* 0x803CE958@ha */ +/* 80315CB0 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l /* 0x803CE958@l */ /* 80315CB4 90 1F 00 00 */ stw r0, 0(r31) -/* 80315CB8 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock4@ha -/* 80315CBC 38 03 E1 C4 */ addi r0, r3, __vt__12J3DTevBlock4@l +/* 80315CB8 3C 60 80 3D */ lis r3, __vt__12J3DTevBlock4@ha /* 0x803CE1C4@ha */ +/* 80315CBC 38 03 E1 C4 */ addi r0, r3, __vt__12J3DTevBlock4@l /* 0x803CE1C4@l */ /* 80315CC0 90 1F 00 00 */ stw r0, 0(r31) /* 80315CC4 38 7F 00 10 */ addi r3, r31, 0x10 -/* 80315CC8 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha -/* 80315CCC 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l +/* 80315CC8 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha /* 0x8000E140@ha */ +/* 80315CCC 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l /* 0x8000E140@l */ /* 80315CD0 38 A0 00 00 */ li r5, 0 /* 80315CD4 38 C0 00 04 */ li r6, 4 /* 80315CD8 38 E0 00 04 */ li r7, 4 /* 80315CDC 48 04 C0 85 */ bl __construct_array /* 80315CE0 38 7F 00 21 */ addi r3, r31, 0x21 -/* 80315CE4 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha -/* 80315CE8 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l +/* 80315CE4 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha /* 0x8000E230@ha */ +/* 80315CE8 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l /* 0x8000E230@l */ /* 80315CEC 38 A0 00 00 */ li r5, 0 /* 80315CF0 38 C0 00 08 */ li r6, 8 /* 80315CF4 38 E0 00 04 */ li r7, 4 /* 80315CF8 48 04 C0 69 */ bl __construct_array /* 80315CFC 38 7F 00 42 */ addi r3, r31, 0x42 -/* 80315D00 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha -/* 80315D04 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l +/* 80315D00 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha /* 0x8000E460@ha */ +/* 80315D04 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l /* 0x8000E460@l */ /* 80315D08 38 A0 00 00 */ li r5, 0 /* 80315D0C 38 C0 00 08 */ li r6, 8 /* 80315D10 38 E0 00 04 */ li r7, 4 /* 80315D14 48 04 C0 4D */ bl __construct_array /* 80315D18 38 7F 00 62 */ addi r3, r31, 0x62 -/* 80315D1C 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha -/* 80315D20 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l +/* 80315D1C 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha /* 0x8000E538@ha */ +/* 80315D20 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 0x8000E538@l */ /* 80315D24 38 A0 00 00 */ li r5, 0 /* 80315D28 38 C0 00 04 */ li r6, 4 /* 80315D2C 38 E0 00 04 */ li r7, 4 /* 80315D30 48 04 C0 31 */ bl __construct_array /* 80315D34 38 7F 00 7A */ addi r3, r31, 0x7a -/* 80315D38 3C 80 80 01 */ lis r4, __ct__19J3DTevSwapModeTableFv@ha -/* 80315D3C 38 84 E1 34 */ addi r4, r4, __ct__19J3DTevSwapModeTableFv@l +/* 80315D38 3C 80 80 01 */ lis r4, __ct__19J3DTevSwapModeTableFv@ha /* 0x8000E134@ha */ +/* 80315D3C 38 84 E1 34 */ addi r4, r4, __ct__19J3DTevSwapModeTableFv@l /* 0x8000E134@l */ /* 80315D40 38 A0 00 00 */ li r5, 0 /* 80315D44 38 C0 00 01 */ li r6, 1 /* 80315D48 38 E0 00 04 */ li r7, 4 /* 80315D4C 48 04 C0 15 */ bl __construct_array /* 80315D50 38 7F 00 80 */ addi r3, r31, 0x80 -/* 80315D54 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha -/* 80315D58 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l +/* 80315D54 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha /* 0x8000E14C@ha */ +/* 80315D58 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l /* 0x8000E14C@l */ /* 80315D5C 38 A0 00 00 */ li r5, 0 /* 80315D60 38 C0 00 04 */ li r6, 4 /* 80315D64 38 E0 00 04 */ li r7, 4 @@ -169,50 +169,50 @@ lbl_80315D7C: /* 80315D88 4B FB 8E C5 */ bl __nw__FUl /* 80315D8C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315D90 41 82 00 CC */ beq lbl_80315E5C -/* 80315D94 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha -/* 80315D98 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l +/* 80315D94 3C 60 80 3D */ lis r3, __vt__11J3DTevBlock@ha /* 0x803CE958@ha */ +/* 80315D98 38 03 E9 58 */ addi r0, r3, __vt__11J3DTevBlock@l /* 0x803CE958@l */ /* 80315D9C 90 1F 00 00 */ stw r0, 0(r31) -/* 80315DA0 3C 60 80 3D */ lis r3, __vt__13J3DTevBlock16@ha -/* 80315DA4 38 03 E0 E8 */ addi r0, r3, __vt__13J3DTevBlock16@l +/* 80315DA0 3C 60 80 3D */ lis r3, __vt__13J3DTevBlock16@ha /* 0x803CE0E8@ha */ +/* 80315DA4 38 03 E0 E8 */ addi r0, r3, __vt__13J3DTevBlock16@l /* 0x803CE0E8@l */ /* 80315DA8 90 1F 00 00 */ stw r0, 0(r31) /* 80315DAC 38 7F 00 18 */ addi r3, r31, 0x18 -/* 80315DB0 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha -/* 80315DB4 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l +/* 80315DB0 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha /* 0x8000E140@ha */ +/* 80315DB4 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l /* 0x8000E140@l */ /* 80315DB8 38 A0 00 00 */ li r5, 0 /* 80315DBC 38 C0 00 04 */ li r6, 4 /* 80315DC0 38 E0 00 10 */ li r7, 0x10 /* 80315DC4 48 04 BF 9D */ bl __construct_array /* 80315DC8 38 7F 00 59 */ addi r3, r31, 0x59 -/* 80315DCC 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha -/* 80315DD0 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l +/* 80315DCC 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha /* 0x8000E230@ha */ +/* 80315DD0 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l /* 0x8000E230@l */ /* 80315DD4 38 A0 00 00 */ li r5, 0 /* 80315DD8 38 C0 00 08 */ li r6, 8 /* 80315DDC 38 E0 00 10 */ li r7, 0x10 /* 80315DE0 48 04 BF 81 */ bl __construct_array /* 80315DE4 38 7F 00 DA */ addi r3, r31, 0xda -/* 80315DE8 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha -/* 80315DEC 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l +/* 80315DE8 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha /* 0x8000E460@ha */ +/* 80315DEC 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l /* 0x8000E460@l */ /* 80315DF0 38 A0 00 00 */ li r5, 0 /* 80315DF4 38 C0 00 08 */ li r6, 8 /* 80315DF8 38 E0 00 04 */ li r7, 4 /* 80315DFC 48 04 BF 65 */ bl __construct_array /* 80315E00 38 7F 00 FA */ addi r3, r31, 0xfa -/* 80315E04 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha -/* 80315E08 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l +/* 80315E04 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha /* 0x8000E538@ha */ +/* 80315E08 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 0x8000E538@l */ /* 80315E0C 38 A0 00 00 */ li r5, 0 /* 80315E10 38 C0 00 04 */ li r6, 4 /* 80315E14 38 E0 00 04 */ li r7, 4 /* 80315E18 48 04 BF 49 */ bl __construct_array /* 80315E1C 38 7F 01 2A */ addi r3, r31, 0x12a -/* 80315E20 3C 80 80 01 */ lis r4, __ct__19J3DTevSwapModeTableFv@ha -/* 80315E24 38 84 E1 34 */ addi r4, r4, __ct__19J3DTevSwapModeTableFv@l +/* 80315E20 3C 80 80 01 */ lis r4, __ct__19J3DTevSwapModeTableFv@ha /* 0x8000E134@ha */ +/* 80315E24 38 84 E1 34 */ addi r4, r4, __ct__19J3DTevSwapModeTableFv@l /* 0x8000E134@l */ /* 80315E28 38 A0 00 00 */ li r5, 0 /* 80315E2C 38 C0 00 01 */ li r6, 1 /* 80315E30 38 E0 00 04 */ li r7, 4 /* 80315E34 48 04 BF 2D */ bl __construct_array /* 80315E38 38 7F 01 30 */ addi r3, r31, 0x130 -/* 80315E3C 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha -/* 80315E40 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l +/* 80315E3C 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha /* 0x8000E14C@ha */ +/* 80315E40 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l /* 0x8000E14C@l */ /* 80315E44 38 A0 00 00 */ li r5, 0 /* 80315E48 38 C0 00 04 */ li r6, 4 /* 80315E4C 38 E0 00 10 */ li r7, 0x10 diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/createTexGenBlock__11J3DMaterialFUl.s b/asm/JSystem/J3DGraphBase/J3DMaterial/createTexGenBlock__11J3DMaterialFUl.s index 16feb0f939..4078e9836d 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/createTexGenBlock__11J3DMaterialFUl.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/createTexGenBlock__11J3DMaterialFUl.s @@ -17,26 +17,26 @@ lbl_803159D0: /* 803159D8 7C 7F 1B 79 */ or. r31, r3, r3 /* 803159DC 41 82 00 7C */ beq lbl_80315A58 /* 803159E0 7F FE FB 78 */ mr r30, r31 -/* 803159E4 3C 60 80 3D */ lis r3, __vt__14J3DTexGenBlock@ha -/* 803159E8 38 03 DE 34 */ addi r0, r3, __vt__14J3DTexGenBlock@l +/* 803159E4 3C 60 80 3D */ lis r3, __vt__14J3DTexGenBlock@ha /* 0x803CDE34@ha */ +/* 803159E8 38 03 DE 34 */ addi r0, r3, __vt__14J3DTexGenBlock@l /* 0x803CDE34@l */ /* 803159EC 90 1F 00 00 */ stw r0, 0(r31) -/* 803159F0 3C 60 80 3D */ lis r3, __vt__21J3DTexGenBlockPatched@ha -/* 803159F4 38 03 E6 0C */ addi r0, r3, __vt__21J3DTexGenBlockPatched@l +/* 803159F0 3C 60 80 3D */ lis r3, __vt__21J3DTexGenBlockPatched@ha /* 0x803CE60C@ha */ +/* 803159F4 38 03 E6 0C */ addi r0, r3, __vt__21J3DTexGenBlockPatched@l /* 0x803CE60C@l */ /* 803159F8 90 1F 00 00 */ stw r0, 0(r31) /* 803159FC 38 7F 00 08 */ addi r3, r31, 8 -/* 80315A00 3C 80 80 01 */ lis r4, __ct__11J3DTexCoordFv@ha -/* 80315A04 38 84 E4 64 */ addi r4, r4, __ct__11J3DTexCoordFv@l +/* 80315A00 3C 80 80 01 */ lis r4, __ct__11J3DTexCoordFv@ha /* 0x8000E464@ha */ +/* 80315A04 38 84 E4 64 */ addi r4, r4, __ct__11J3DTexCoordFv@l /* 0x8000E464@l */ /* 80315A08 38 A0 00 00 */ li r5, 0 /* 80315A0C 38 C0 00 06 */ li r6, 6 /* 80315A10 38 E0 00 08 */ li r7, 8 /* 80315A14 48 04 C3 4D */ bl __construct_array /* 80315A18 7F E3 FB 78 */ mr r3, r31 /* 80315A1C 48 00 1C 29 */ bl initialize__21J3DTexGenBlockPatchedFv -/* 80315A20 3C 60 80 3D */ lis r3, __vt__15J3DTexGenBlock4@ha -/* 80315A24 38 03 E5 A0 */ addi r0, r3, __vt__15J3DTexGenBlock4@l +/* 80315A20 3C 60 80 3D */ lis r3, __vt__15J3DTexGenBlock4@ha /* 0x803CE5A0@ha */ +/* 80315A24 38 03 E5 A0 */ addi r0, r3, __vt__15J3DTexGenBlock4@l /* 0x803CE5A0@l */ /* 80315A28 90 1E 00 00 */ stw r0, 0(r30) -/* 80315A2C 3C 60 80 3A */ lis r3, j3dDefaultNBTScaleInfo@ha -/* 80315A30 8C 03 1F E8 */ lbzu r0, j3dDefaultNBTScaleInfo@l(r3) +/* 80315A2C 3C 60 80 3A */ lis r3, j3dDefaultNBTScaleInfo@ha /* 0x803A1FE8@ha */ +/* 80315A30 8C 03 1F E8 */ lbzu r0, j3dDefaultNBTScaleInfo@l(r3) /* 0x803A1FE8@l */ /* 80315A34 98 1E 00 5C */ stb r0, 0x5c(r30) /* 80315A38 C0 03 00 04 */ lfs f0, 4(r3) /* 80315A3C D0 1E 00 60 */ stfs f0, 0x60(r30) @@ -55,26 +55,26 @@ lbl_80315A60: /* 80315A68 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315A6C 41 82 00 7C */ beq lbl_80315AE8 /* 80315A70 7F FE FB 78 */ mr r30, r31 -/* 80315A74 3C 60 80 3D */ lis r3, __vt__14J3DTexGenBlock@ha -/* 80315A78 38 03 DE 34 */ addi r0, r3, __vt__14J3DTexGenBlock@l +/* 80315A74 3C 60 80 3D */ lis r3, __vt__14J3DTexGenBlock@ha /* 0x803CDE34@ha */ +/* 80315A78 38 03 DE 34 */ addi r0, r3, __vt__14J3DTexGenBlock@l /* 0x803CDE34@l */ /* 80315A7C 90 1F 00 00 */ stw r0, 0(r31) -/* 80315A80 3C 60 80 3D */ lis r3, __vt__21J3DTexGenBlockPatched@ha -/* 80315A84 38 03 E6 0C */ addi r0, r3, __vt__21J3DTexGenBlockPatched@l +/* 80315A80 3C 60 80 3D */ lis r3, __vt__21J3DTexGenBlockPatched@ha /* 0x803CE60C@ha */ +/* 80315A84 38 03 E6 0C */ addi r0, r3, __vt__21J3DTexGenBlockPatched@l /* 0x803CE60C@l */ /* 80315A88 90 1F 00 00 */ stw r0, 0(r31) /* 80315A8C 38 7E 00 08 */ addi r3, r30, 8 -/* 80315A90 3C 80 80 01 */ lis r4, __ct__11J3DTexCoordFv@ha -/* 80315A94 38 84 E4 64 */ addi r4, r4, __ct__11J3DTexCoordFv@l +/* 80315A90 3C 80 80 01 */ lis r4, __ct__11J3DTexCoordFv@ha /* 0x8000E464@ha */ +/* 80315A94 38 84 E4 64 */ addi r4, r4, __ct__11J3DTexCoordFv@l /* 0x8000E464@l */ /* 80315A98 38 A0 00 00 */ li r5, 0 /* 80315A9C 38 C0 00 06 */ li r6, 6 /* 80315AA0 38 E0 00 08 */ li r7, 8 /* 80315AA4 48 04 C2 BD */ bl __construct_array /* 80315AA8 7F C3 F3 78 */ mr r3, r30 /* 80315AAC 48 00 1B 99 */ bl initialize__21J3DTexGenBlockPatchedFv -/* 80315AB0 3C 60 80 3D */ lis r3, __vt__19J3DTexGenBlockBasic@ha -/* 80315AB4 38 03 E5 34 */ addi r0, r3, __vt__19J3DTexGenBlockBasic@l +/* 80315AB0 3C 60 80 3D */ lis r3, __vt__19J3DTexGenBlockBasic@ha /* 0x803CE534@ha */ +/* 80315AB4 38 03 E5 34 */ addi r0, r3, __vt__19J3DTexGenBlockBasic@l /* 0x803CE534@l */ /* 80315AB8 90 1F 00 00 */ stw r0, 0(r31) -/* 80315ABC 3C 60 80 3A */ lis r3, j3dDefaultNBTScaleInfo@ha -/* 80315AC0 8C 03 1F E8 */ lbzu r0, j3dDefaultNBTScaleInfo@l(r3) +/* 80315ABC 3C 60 80 3A */ lis r3, j3dDefaultNBTScaleInfo@ha /* 0x803A1FE8@ha */ +/* 80315AC0 8C 03 1F E8 */ lbzu r0, j3dDefaultNBTScaleInfo@l(r3) /* 0x803A1FE8@l */ /* 80315AC4 98 1F 00 5C */ stb r0, 0x5c(r31) /* 80315AC8 C0 03 00 04 */ lfs f0, 4(r3) /* 80315ACC D0 1F 00 60 */ stfs f0, 0x60(r31) diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/diff__11J3DMaterialFUl.s b/asm/JSystem/J3DGraphBase/J3DMaterial/diff__11J3DMaterialFUl.s index 8e734065bb..e78635da16 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/diff__11J3DMaterialFUl.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/diff__11J3DMaterialFUl.s @@ -6,8 +6,8 @@ lbl_803167D8: /* 803167E8 48 04 B9 ED */ bl _savegpr_27 /* 803167EC 7C 7D 1B 78 */ mr r29, r3 /* 803167F0 7C 9E 23 78 */ mr r30, r4 -/* 803167F4 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803167F8 3B E3 4A C8 */ addi r31, r3, j3dSys@l +/* 803167F4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803167F8 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ /* 803167FC 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80316800 80 83 00 28 */ lwz r4, 0x28(r3) /* 80316804 80 04 00 20 */ lwz r0, 0x20(r4) diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__11J3DMaterialFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__11J3DMaterialFv.s index e9ec84290e..eabeb63f60 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__11J3DMaterialFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__11J3DMaterialFv.s @@ -5,8 +5,8 @@ lbl_803166DC: /* 803166E8 93 E1 00 0C */ stw r31, 0xc(r1) /* 803166EC 7C 7F 1B 78 */ mr r31, r3 /* 803166F0 80 03 00 10 */ lwz r0, 0x10(r3) -/* 803166F4 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803166F8 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803166F4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803166F8 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803166FC 90 03 00 54 */ stw r0, 0x54(r3) /* 80316700 80 03 00 34 */ lwz r0, 0x34(r3) /* 80316704 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__17J3DLockedMaterialFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__17J3DLockedMaterialFv.s index d96fc2ca47..5c5a352fd5 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__17J3DLockedMaterialFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__17J3DLockedMaterialFv.s @@ -3,8 +3,8 @@ lbl_80317088: /* 8031708C 7C 08 02 A6 */ mflr r0 /* 80317090 90 01 00 14 */ stw r0, 0x14(r1) /* 80317094 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80317098 3C 80 80 43 */ lis r4, j3dSys@ha -/* 8031709C 38 84 4A C8 */ addi r4, r4, j3dSys@l +/* 80317098 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ +/* 8031709C 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */ /* 803170A0 90 04 00 54 */ stw r0, 0x54(r4) /* 803170A4 80 04 00 34 */ lwz r0, 0x34(r4) /* 803170A8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__18J3DPatchedMaterialFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__18J3DPatchedMaterialFv.s index 179bd5190c..15a23afc4c 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__18J3DPatchedMaterialFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/loadSharedDL__18J3DPatchedMaterialFv.s @@ -3,8 +3,8 @@ lbl_80316FFC: /* 80317000 7C 08 02 A6 */ mflr r0 /* 80317004 90 01 00 14 */ stw r0, 0x14(r1) /* 80317008 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8031700C 3C 80 80 43 */ lis r4, j3dSys@ha -/* 80317010 38 84 4A C8 */ addi r4, r4, j3dSys@l +/* 8031700C 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ +/* 80317010 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */ /* 80317014 90 04 00 54 */ stw r0, 0x54(r4) /* 80317018 80 04 00 34 */ lwz r0, 0x34(r4) /* 8031701C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/load__11J3DMaterialFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/load__11J3DMaterialFv.s index 62db509987..fa334326ff 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/load__11J3DMaterialFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/load__11J3DMaterialFv.s @@ -3,8 +3,8 @@ lbl_8031668C: /* 80316690 7C 08 02 A6 */ mflr r0 /* 80316694 90 01 00 14 */ stw r0, 0x14(r1) /* 80316698 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8031669C 3C 80 80 43 */ lis r4, j3dSys@ha -/* 803166A0 38 84 4A C8 */ addi r4, r4, j3dSys@l +/* 8031669C 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ +/* 803166A0 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */ /* 803166A4 90 04 00 54 */ stw r0, 0x54(r4) /* 803166A8 80 04 00 34 */ lwz r0, 0x34(r4) /* 803166AC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/load__17J3DLockedMaterialFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/load__17J3DLockedMaterialFv.s index 0f8465d410..350a8f90e5 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/load__17J3DLockedMaterialFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/load__17J3DLockedMaterialFv.s @@ -1,7 +1,7 @@ lbl_8031706C: /* 8031706C 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80317070 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80317074 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80317070 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80317074 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80317078 90 03 00 54 */ stw r0, 0x54(r3) /* 8031707C 80 03 00 34 */ lwz r0, 0x34(r3) /* 80317080 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/load__18J3DPatchedMaterialFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/load__18J3DPatchedMaterialFv.s index c91f4a4350..2264b56dab 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/load__18J3DPatchedMaterialFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/load__18J3DPatchedMaterialFv.s @@ -1,7 +1,7 @@ lbl_80316FE0: /* 80316FE0 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80316FE4 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80316FE8 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80316FE4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80316FE8 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80316FEC 90 03 00 54 */ stw r0, 0x54(r3) /* 80316FF0 80 03 00 34 */ lwz r0, 0x34(r3) /* 80316FF4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/makeDisplayList__11J3DMaterialFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/makeDisplayList__11J3DMaterialFv.s index 9913bd3515..499c0eff3e 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/makeDisplayList__11J3DMaterialFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/makeDisplayList__11J3DMaterialFv.s @@ -2,8 +2,8 @@ lbl_80316620: /* 80316620 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80316624 7C 08 02 A6 */ mflr r0 /* 80316628 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031662C 3C 80 80 43 */ lis r4, j3dSys@ha -/* 80316630 38 84 4A C8 */ addi r4, r4, j3dSys@l +/* 8031662C 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ +/* 80316630 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */ /* 80316634 80 A4 00 3C */ lwz r5, 0x3c(r4) /* 80316638 80 05 00 10 */ lwz r0, 0x10(r5) /* 8031663C 54 00 07 FF */ clrlwi. r0, r0, 0x1f diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/patch__11J3DMaterialFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/patch__11J3DMaterialFv.s index 2a7240c3dc..ed6e74d00e 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/patch__11J3DMaterialFv.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/patch__11J3DMaterialFv.s @@ -6,8 +6,8 @@ lbl_80316740: /* 80316750 93 C1 00 08 */ stw r30, 8(r1) /* 80316754 7C 7E 1B 78 */ mr r30, r3 /* 80316758 80 03 00 20 */ lwz r0, 0x20(r3) -/* 8031675C 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80316760 3B E3 4A C8 */ addi r31, r3, j3dSys@l +/* 8031675C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80316760 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ /* 80316764 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80316768 90 03 00 34 */ stw r0, 0x34(r3) /* 8031676C 80 7F 00 3C */ lwz r3, 0x3c(r31) diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__12J3DMatPacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__ct__12J3DMatPacketFv.s index 5557061fea..1f6a2f6e5d 100644 --- a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__12J3DMatPacketFv.s +++ b/asm/JSystem/J3DGraphBase/J3DPacket/__ct__12J3DMatPacketFv.s @@ -5,8 +5,8 @@ lbl_80312948: /* 80312954 93 E1 00 0C */ stw r31, 0xc(r1) /* 80312958 7C 7F 1B 78 */ mr r31, r3 /* 8031295C 4B FF FE 1D */ bl __ct__13J3DDrawPacketFv -/* 80312960 3C 60 80 3D */ lis r3, __vt__12J3DMatPacket@ha -/* 80312964 38 03 D9 54 */ addi r0, r3, __vt__12J3DMatPacket@l +/* 80312960 3C 60 80 3D */ lis r3, __vt__12J3DMatPacket@ha /* 0x803CD954@ha */ +/* 80312964 38 03 D9 54 */ addi r0, r3, __vt__12J3DMatPacket@l /* 0x803CD954@l */ /* 80312968 90 1F 00 00 */ stw r0, 0(r31) /* 8031296C 38 60 00 00 */ li r3, 0 /* 80312970 90 7F 00 28 */ stw r3, 0x28(r31) diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__13J3DDrawPacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__ct__13J3DDrawPacketFv.s index bf2a9398d7..47147f96a8 100644 --- a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__13J3DDrawPacketFv.s +++ b/asm/JSystem/J3DGraphBase/J3DPacket/__ct__13J3DDrawPacketFv.s @@ -1,13 +1,13 @@ lbl_80312778: -/* 80312778 3C 80 80 3D */ lis r4, __vt__9J3DPacket@ha -/* 8031277C 38 04 D9 7C */ addi r0, r4, __vt__9J3DPacket@l +/* 80312778 3C 80 80 3D */ lis r4, __vt__9J3DPacket@ha /* 0x803CD97C@ha */ +/* 8031277C 38 04 D9 7C */ addi r0, r4, __vt__9J3DPacket@l /* 0x803CD97C@l */ /* 80312780 90 03 00 00 */ stw r0, 0(r3) /* 80312784 38 A0 00 00 */ li r5, 0 /* 80312788 90 A3 00 04 */ stw r5, 4(r3) /* 8031278C 90 A3 00 08 */ stw r5, 8(r3) /* 80312790 90 A3 00 0C */ stw r5, 0xc(r3) -/* 80312794 3C 80 80 3D */ lis r4, __vt__13J3DDrawPacket@ha -/* 80312798 38 04 D9 68 */ addi r0, r4, __vt__13J3DDrawPacket@l +/* 80312794 3C 80 80 3D */ lis r4, __vt__13J3DDrawPacket@ha /* 0x803CD968@ha */ +/* 80312798 38 04 D9 68 */ addi r0, r4, __vt__13J3DDrawPacket@l /* 0x803CD968@l */ /* 8031279C 90 03 00 00 */ stw r0, 0(r3) /* 803127A0 90 A3 00 10 */ stw r5, 0x10(r3) /* 803127A4 90 A3 00 20 */ stw r5, 0x20(r3) diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__14J3DShapePacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__ct__14J3DShapePacketFv.s index 9a5a3681be..f3c8e9c9bf 100644 --- a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__14J3DShapePacketFv.s +++ b/asm/JSystem/J3DGraphBase/J3DPacket/__ct__14J3DShapePacketFv.s @@ -5,8 +5,8 @@ lbl_80312B20: /* 80312B2C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80312B30 7C 7F 1B 78 */ mr r31, r3 /* 80312B34 4B FF FC 45 */ bl __ct__13J3DDrawPacketFv -/* 80312B38 3C 60 80 3D */ lis r3, __vt__14J3DShapePacket@ha -/* 80312B3C 38 03 D9 40 */ addi r0, r3, __vt__14J3DShapePacket@l +/* 80312B38 3C 60 80 3D */ lis r3, __vt__14J3DShapePacket@ha /* 0x803CD940@ha */ +/* 80312B3C 38 03 D9 40 */ addi r0, r3, __vt__14J3DShapePacket@l /* 0x803CD940@l */ /* 80312B40 90 1F 00 00 */ stw r0, 0(r31) /* 80312B44 38 00 00 00 */ li r0, 0 /* 80312B48 90 1F 00 28 */ stw r0, 0x28(r31) diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__12J3DMatPacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__dt__12J3DMatPacketFv.s index cba27e87af..c1dbbe7164 100644 --- a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__12J3DMatPacketFv.s +++ b/asm/JSystem/J3DGraphBase/J3DPacket/__dt__12J3DMatPacketFv.s @@ -7,8 +7,8 @@ lbl_803129A4: /* 803129B8 7C 7E 1B 79 */ or. r30, r3, r3 /* 803129BC 7C 9F 23 78 */ mr r31, r4 /* 803129C0 41 82 00 28 */ beq lbl_803129E8 -/* 803129C4 3C 80 80 3D */ lis r4, __vt__12J3DMatPacket@ha -/* 803129C8 38 04 D9 54 */ addi r0, r4, __vt__12J3DMatPacket@l +/* 803129C4 3C 80 80 3D */ lis r4, __vt__12J3DMatPacket@ha /* 0x803CD954@ha */ +/* 803129C8 38 04 D9 54 */ addi r0, r4, __vt__12J3DMatPacket@l /* 0x803CD954@l */ /* 803129CC 90 1E 00 00 */ stw r0, 0(r30) /* 803129D0 38 80 00 00 */ li r4, 0 /* 803129D4 4B FF FD DD */ bl __dt__13J3DDrawPacketFv diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__13J3DDrawPacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__dt__13J3DDrawPacketFv.s index d5f96112d3..acb3cf6f62 100644 --- a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__13J3DDrawPacketFv.s +++ b/asm/JSystem/J3DGraphBase/J3DPacket/__dt__13J3DDrawPacketFv.s @@ -5,12 +5,12 @@ lbl_803127B0: /* 803127BC 93 E1 00 0C */ stw r31, 0xc(r1) /* 803127C0 7C 7F 1B 79 */ or. r31, r3, r3 /* 803127C4 41 82 00 30 */ beq lbl_803127F4 -/* 803127C8 3C 60 80 3D */ lis r3, __vt__13J3DDrawPacket@ha -/* 803127CC 38 03 D9 68 */ addi r0, r3, __vt__13J3DDrawPacket@l +/* 803127C8 3C 60 80 3D */ lis r3, __vt__13J3DDrawPacket@ha /* 0x803CD968@ha */ +/* 803127CC 38 03 D9 68 */ addi r0, r3, __vt__13J3DDrawPacket@l /* 0x803CD968@l */ /* 803127D0 90 1F 00 00 */ stw r0, 0(r31) /* 803127D4 41 82 00 10 */ beq lbl_803127E4 -/* 803127D8 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha -/* 803127DC 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l +/* 803127D8 3C 60 80 3D */ lis r3, __vt__9J3DPacket@ha /* 0x803CD97C@ha */ +/* 803127DC 38 03 D9 7C */ addi r0, r3, __vt__9J3DPacket@l /* 0x803CD97C@l */ /* 803127E0 90 1F 00 00 */ stw r0, 0(r31) lbl_803127E4: /* 803127E4 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__14J3DShapePacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__dt__14J3DShapePacketFv.s index 5a4b00b1ba..ea49f8a537 100644 --- a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__14J3DShapePacketFv.s +++ b/asm/JSystem/J3DGraphBase/J3DPacket/__dt__14J3DShapePacketFv.s @@ -7,8 +7,8 @@ lbl_80312B74: /* 80312B88 7C 7E 1B 79 */ or. r30, r3, r3 /* 80312B8C 7C 9F 23 78 */ mr r31, r4 /* 80312B90 41 82 00 28 */ beq lbl_80312BB8 -/* 80312B94 3C 80 80 3D */ lis r4, __vt__14J3DShapePacket@ha -/* 80312B98 38 04 D9 40 */ addi r0, r4, __vt__14J3DShapePacket@l +/* 80312B94 3C 80 80 3D */ lis r4, __vt__14J3DShapePacket@ha /* 0x803CD940@ha */ +/* 80312B98 38 04 D9 40 */ addi r0, r4, __vt__14J3DShapePacket@l /* 0x803CD940@l */ /* 80312B9C 90 1E 00 00 */ stw r0, 0(r30) /* 80312BA0 38 80 00 00 */ li r4, 0 /* 80312BA4 4B FF FC 0D */ bl __dt__13J3DDrawPacketFv diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/beginDL__17J3DDisplayListObjFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/beginDL__17J3DDisplayListObjFv.s index de3769e723..e90ca259cf 100644 --- a/asm/JSystem/J3DGraphBase/J3DPacket/beginDL__17J3DDisplayListObjFv.s +++ b/asm/JSystem/J3DGraphBase/J3DPacket/beginDL__17J3DDisplayListObjFv.s @@ -7,13 +7,13 @@ lbl_80312644: /* 80312658 4B FF FF AD */ bl swapBuffer__17J3DDisplayListObjFv /* 8031265C 48 02 B0 99 */ bl OSDisableInterrupts /* 80312660 90 6D 90 20 */ stw r3, sInterruptFlag__17J3DDisplayListObj(r13) -/* 80312664 3C 60 80 43 */ lis r3, sGDLObj__17J3DDisplayListObj@ha -/* 80312668 38 63 4C 70 */ addi r3, r3, sGDLObj__17J3DDisplayListObj@l +/* 80312664 3C 60 80 43 */ lis r3, sGDLObj__17J3DDisplayListObj@ha /* 0x80434C70@ha */ +/* 80312668 38 63 4C 70 */ addi r3, r3, sGDLObj__17J3DDisplayListObj@l /* 0x80434C70@l */ /* 8031266C 80 9F 00 00 */ lwz r4, 0(r31) /* 80312670 80 BF 00 0C */ lwz r5, 0xc(r31) /* 80312674 48 04 E9 25 */ bl GDInitGDLObj -/* 80312678 3C 60 80 43 */ lis r3, sGDLObj__17J3DDisplayListObj@ha -/* 8031267C 38 03 4C 70 */ addi r0, r3, sGDLObj__17J3DDisplayListObj@l +/* 80312678 3C 60 80 43 */ lis r3, sGDLObj__17J3DDisplayListObj@ha /* 0x80434C70@ha */ +/* 8031267C 38 03 4C 70 */ addi r0, r3, sGDLObj__17J3DDisplayListObj@l /* 0x80434C70@l */ /* 80312680 90 0D 94 00 */ stw r0, __GDCurrentDL(r13) /* 80312684 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80312688 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/calcDifferedBufferSize__14J3DShapePacketFUl.s b/asm/JSystem/J3DGraphBase/J3DPacket/calcDifferedBufferSize__14J3DShapePacketFUl.s index 1381901d09..68452fc323 100644 --- a/asm/JSystem/J3DGraphBase/J3DPacket/calcDifferedBufferSize__14J3DShapePacketFUl.s +++ b/asm/JSystem/J3DGraphBase/J3DPacket/calcDifferedBufferSize__14J3DShapePacketFUl.s @@ -8,10 +8,10 @@ lbl_80312BD4: /* 80312BEC 7C 9E 23 78 */ mr r30, r4 /* 80312BF0 3B E0 00 00 */ li r31, 0 /* 80312BF4 38 60 00 00 */ li r3, 0 -/* 80312BF8 3C 80 80 3D */ lis r4, sDifferedRegister@ha -/* 80312BFC 38 A4 D9 00 */ addi r5, r4, sDifferedRegister@l -/* 80312C00 3C 80 80 3D */ lis r4, sSizeOfDiffered@ha -/* 80312C04 38 84 D9 20 */ addi r4, r4, sSizeOfDiffered@l +/* 80312BF8 3C 80 80 3D */ lis r4, sDifferedRegister@ha /* 0x803CD900@ha */ +/* 80312BFC 38 A4 D9 00 */ addi r5, r4, sDifferedRegister@l /* 0x803CD900@l */ +/* 80312C00 3C 80 80 3D */ lis r4, sSizeOfDiffered@ha /* 0x803CD920@ha */ +/* 80312C04 38 84 D9 20 */ addi r4, r4, sSizeOfDiffered@l /* 0x803CD920@l */ /* 80312C08 38 00 00 08 */ li r0, 8 /* 80312C0C 7C 09 03 A6 */ mtctr r0 lbl_80312C10: diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/endDL__17J3DDisplayListObjFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/endDL__17J3DDisplayListObjFv.s index bdc874d508..8c8dc0dcf2 100644 --- a/asm/JSystem/J3DGraphBase/J3DPacket/endDL__17J3DDisplayListObjFv.s +++ b/asm/JSystem/J3DGraphBase/J3DPacket/endDL__17J3DDisplayListObjFv.s @@ -7,8 +7,8 @@ lbl_80312698: /* 803126AC 48 04 E9 31 */ bl GDPadCurr32 /* 803126B0 80 6D 90 20 */ lwz r3, sInterruptFlag__17J3DDisplayListObj(r13) /* 803126B4 48 02 B0 69 */ bl OSRestoreInterrupts -/* 803126B8 3C 60 80 43 */ lis r3, sGDLObj__17J3DDisplayListObj@ha -/* 803126BC 38 83 4C 70 */ addi r4, r3, sGDLObj__17J3DDisplayListObj@l +/* 803126B8 3C 60 80 43 */ lis r3, sGDLObj__17J3DDisplayListObj@ha /* 0x80434C70@ha */ +/* 803126BC 38 83 4C 70 */ addi r4, r3, sGDLObj__17J3DDisplayListObj@l /* 0x80434C70@l */ /* 803126C0 80 64 00 00 */ lwz r3, 0(r4) /* 803126C4 80 04 00 08 */ lwz r0, 8(r4) /* 803126C8 7C 03 00 50 */ subf r0, r3, r0 diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/entry__12J3DMatPacketFP13J3DDrawBuffer.s b/asm/JSystem/J3DGraphBase/J3DPacket/entry__12J3DMatPacketFP13J3DDrawBuffer.s index 1e94b13a81..8ae797a67f 100644 --- a/asm/JSystem/J3DGraphBase/J3DPacket/entry__12J3DMatPacketFP13J3DDrawBuffer.s +++ b/asm/JSystem/J3DGraphBase/J3DPacket/entry__12J3DMatPacketFP13J3DDrawBuffer.s @@ -5,8 +5,8 @@ lbl_80313048: /* 80313054 7C 66 1B 78 */ mr r6, r3 /* 80313058 80 04 00 0C */ lwz r0, 0xc(r4) /* 8031305C 1C A0 00 0C */ mulli r5, r0, 0xc -/* 80313060 3C 60 80 3D */ lis r3, sortFuncTable__13J3DDrawBuffer@ha -/* 80313064 38 03 EC 30 */ addi r0, r3, sortFuncTable__13J3DDrawBuffer@l +/* 80313060 3C 60 80 3D */ lis r3, sortFuncTable__13J3DDrawBuffer@ha /* 0x803CEC30@ha */ +/* 80313064 38 03 EC 30 */ addi r0, r3, sortFuncTable__13J3DDrawBuffer@l /* 0x803CEC30@l */ /* 80313068 7C A0 2A 14 */ add r5, r0, r5 /* 8031306C 80 65 00 00 */ lwz r3, 0(r5) /* 80313070 80 05 00 04 */ lwz r0, 4(r5) diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/prepareDraw__14J3DShapePacketCFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/prepareDraw__14J3DShapePacketCFv.s index aaedd20e90..a15080ce28 100644 --- a/asm/JSystem/J3DGraphBase/J3DPacket/prepareDraw__14J3DShapePacketCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DPacket/prepareDraw__14J3DShapePacketCFv.s @@ -8,8 +8,8 @@ lbl_80312E08: /* 80312E20 38 63 00 88 */ addi r3, r3, 0x88 /* 80312E24 4B FF E2 49 */ bl setArray__15J3DVertexBufferCFv /* 80312E28 80 9F 00 38 */ lwz r4, 0x38(r31) -/* 80312E2C 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80312E30 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80312E2C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80312E30 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80312E34 90 83 00 38 */ stw r4, 0x38(r3) /* 80312E38 93 E3 00 40 */ stw r31, 0x40(r3) /* 80312E3C 80 04 00 08 */ lwz r0, 8(r4) diff --git a/asm/JSystem/J3DGraphBase/J3DShape/J3DLoadCPCmd__FUcUl.s b/asm/JSystem/J3DGraphBase/J3DShape/J3DLoadCPCmd__FUcUl.s index 748d20a476..3b756fb273 100644 --- a/asm/JSystem/J3DGraphBase/J3DShape/J3DLoadCPCmd__FUcUl.s +++ b/asm/JSystem/J3DGraphBase/J3DShape/J3DLoadCPCmd__FUcUl.s @@ -1,7 +1,7 @@ lbl_80314E98: /* 80314E98 38 00 00 08 */ li r0, 8 /* 80314E9C 3C A0 CC 01 */ lis r5, 0xCC01 /* 0xCC008000@ha */ -/* 80314EA0 98 05 80 00 */ stb r0, 0x8000(r5) +/* 80314EA0 98 05 80 00 */ stb r0, 0x8000(r5) /* 0xCC008000@l */ /* 80314EA4 98 65 80 00 */ stb r3, -0x8000(r5) /* 80314EA8 90 85 80 00 */ stw r4, -0x8000(r5) /* 80314EAC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DShape/addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl.s b/asm/JSystem/J3DGraphBase/J3DShape/addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl.s index 765b5795ff..aa96206cbd 100644 --- a/asm/JSystem/J3DGraphBase/J3DShape/addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl.s +++ b/asm/JSystem/J3DGraphBase/J3DShape/addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl.s @@ -5,8 +5,8 @@ lbl_80314BB8: /* 80314BC4 39 61 00 30 */ addi r11, r1, 0x30 /* 80314BC8 48 04 D6 0D */ bl _savegpr_27 /* 80314BCC 7C 7F 1B 78 */ mr r31, r3 -/* 80314BD0 3C 60 80 3A */ lis r3, lit_697@ha -/* 80314BD4 38 C3 1E 98 */ addi r6, r3, lit_697@l +/* 80314BD0 3C 60 80 3A */ lis r3, lit_697@ha /* 0x803A1E98@ha */ +/* 80314BD4 38 C3 1E 98 */ addi r6, r3, lit_697@l /* 0x803A1E98@l */ /* 80314BD8 80 66 00 00 */ lwz r3, 0(r6) /* 80314BDC 80 06 00 04 */ lwz r0, 4(r6) /* 80314BE0 90 61 00 08 */ stw r3, 8(r1) diff --git a/asm/JSystem/J3DGraphBase/J3DShape/drawFast__8J3DShapeCFv.s b/asm/JSystem/J3DGraphBase/J3DShape/drawFast__8J3DShapeCFv.s index fd9fbcfa5e..86c2939d25 100644 --- a/asm/JSystem/J3DGraphBase/J3DShape/drawFast__8J3DShapeCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShape/drawFast__8J3DShapeCFv.s @@ -23,7 +23,7 @@ lbl_80315484: /* 8031549C 80 BF 00 40 */ lwz r5, 0x40(r31) /* 803154A0 38 80 00 08 */ li r4, 8 /* 803154A4 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 803154A8 98 83 80 00 */ stb r4, 0x8000(r3) +/* 803154A8 98 83 80 00 */ stb r4, 0x8000(r3) /* 0xCC008000@l */ /* 803154AC 38 00 00 30 */ li r0, 0x30 /* 803154B0 98 03 80 00 */ stb r0, -0x8000(r3) /* 803154B4 90 A3 80 00 */ stw r5, -0x8000(r3) @@ -78,8 +78,8 @@ lbl_80315558: /* 80315560 41 80 FF C4 */ blt lbl_80315524 /* 80315564 48 00 00 64 */ b lbl_803155C8 lbl_80315568: -/* 80315568 3C 60 80 43 */ lis r3, j3dSys@ha -/* 8031556C 3B C3 4A C8 */ addi r30, r3, j3dSys@l +/* 80315568 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 8031556C 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ /* 80315570 80 7E 00 40 */ lwz r3, 0x40(r30) /* 80315574 80 63 00 30 */ lwz r3, 0x30(r3) /* 80315578 38 80 00 00 */ li r4, 0 diff --git a/asm/JSystem/J3DGraphBase/J3DShape/loadPreDrawSetting__8J3DShapeCFv.s b/asm/JSystem/J3DGraphBase/J3DShape/loadPreDrawSetting__8J3DShapeCFv.s index ca698014e4..36e13e129b 100644 --- a/asm/JSystem/J3DGraphBase/J3DShape/loadPreDrawSetting__8J3DShapeCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShape/loadPreDrawSetting__8J3DShapeCFv.s @@ -16,7 +16,7 @@ lbl_80315334: /* 80315334 80 BF 00 40 */ lwz r5, 0x40(r31) /* 80315338 38 80 00 08 */ li r4, 8 /* 8031533C 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 80315340 98 83 80 00 */ stb r4, 0x8000(r3) +/* 80315340 98 83 80 00 */ stb r4, 0x8000(r3) /* 0xCC008000@l */ /* 80315344 38 00 00 30 */ li r0, 0x30 /* 80315348 98 03 80 00 */ stb r0, -0x8000(r3) /* 8031534C 90 A3 80 00 */ stw r5, -0x8000(r3) diff --git a/asm/JSystem/J3DGraphBase/J3DShape/loadVtxArray__8J3DShapeCFv.s b/asm/JSystem/J3DGraphBase/J3DShape/loadVtxArray__8J3DShapeCFv.s index 8bc89bb80d..7cdae7439b 100644 --- a/asm/JSystem/J3DGraphBase/J3DShape/loadVtxArray__8J3DShapeCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShape/loadVtxArray__8J3DShapeCFv.s @@ -5,22 +5,22 @@ lbl_80314EEC: /* 80314EF8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80314EFC 7C 7F 1B 78 */ mr r31, r3 /* 80314F00 38 60 00 09 */ li r3, 9 -/* 80314F04 3C 80 80 43 */ lis r4, j3dSys@ha -/* 80314F08 38 84 4A C8 */ addi r4, r4, j3dSys@l +/* 80314F04 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ +/* 80314F08 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */ /* 80314F0C 80 84 01 0C */ lwz r4, 0x10c(r4) /* 80314F10 4B FF FF A1 */ bl J3DLoadArrayBasePtr__F7_GXAttrPv /* 80314F14 88 1F 00 34 */ lbz r0, 0x34(r31) /* 80314F18 28 00 00 00 */ cmplwi r0, 0 /* 80314F1C 40 82 00 18 */ bne lbl_80314F34 /* 80314F20 38 60 00 0A */ li r3, 0xa -/* 80314F24 3C 80 80 43 */ lis r4, j3dSys@ha -/* 80314F28 38 84 4A C8 */ addi r4, r4, j3dSys@l +/* 80314F24 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ +/* 80314F28 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */ /* 80314F2C 80 84 01 10 */ lwz r4, 0x110(r4) /* 80314F30 4B FF FF 81 */ bl J3DLoadArrayBasePtr__F7_GXAttrPv lbl_80314F34: /* 80314F34 38 60 00 0B */ li r3, 0xb -/* 80314F38 3C 80 80 43 */ lis r4, j3dSys@ha -/* 80314F3C 38 84 4A C8 */ addi r4, r4, j3dSys@l +/* 80314F38 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ +/* 80314F3C 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */ /* 80314F40 80 84 01 14 */ lwz r4, 0x114(r4) /* 80314F44 4B FF FF 6D */ bl J3DLoadArrayBasePtr__F7_GXAttrPv /* 80314F48 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JSystem/J3DGraphBase/J3DShape/setArrayAndBindPipeline__8J3DShapeCFv.s b/asm/JSystem/J3DGraphBase/J3DShape/setArrayAndBindPipeline__8J3DShapeCFv.s index 243fb4a265..16fac84c46 100644 --- a/asm/JSystem/J3DGraphBase/J3DShape/setArrayAndBindPipeline__8J3DShapeCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShape/setArrayAndBindPipeline__8J3DShapeCFv.s @@ -13,8 +13,8 @@ lbl_80315398: /* 803153C4 80 03 00 00 */ lwz r0, 0(r3) /* 803153C8 54 00 10 3A */ slwi r0, r0, 2 /* 803153CC 7C 84 00 2E */ lwzx r4, r4, r0 -/* 803153D0 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803153D4 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803153D0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803153D4 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803153D8 90 83 01 04 */ stw r4, 0x104(r3) /* 803153DC 38 60 00 15 */ li r3, 0x15 /* 803153E0 38 A0 00 30 */ li r5, 0x30 @@ -24,8 +24,8 @@ lbl_80315398: /* 803153F0 80 03 00 00 */ lwz r0, 0(r3) /* 803153F4 54 00 10 3A */ slwi r0, r0, 2 /* 803153F8 7C 84 00 2E */ lwzx r4, r4, r0 -/* 803153FC 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80315400 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803153FC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80315400 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80315404 90 83 01 08 */ stw r4, 0x108(r3) /* 80315408 38 60 00 16 */ li r3, 0x16 /* 8031540C 38 A0 00 24 */ li r5, 0x24 diff --git a/asm/JSystem/J3DGraphBase/J3DShape/simpleDrawCache__8J3DShapeCFv.s b/asm/JSystem/J3DGraphBase/J3DShape/simpleDrawCache__8J3DShapeCFv.s index 3ffcd71919..b45781bdf5 100644 --- a/asm/JSystem/J3DGraphBase/J3DShape/simpleDrawCache__8J3DShapeCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShape/simpleDrawCache__8J3DShapeCFv.s @@ -23,7 +23,7 @@ lbl_803156E4: /* 803156FC 80 BE 00 40 */ lwz r5, 0x40(r30) /* 80315700 38 80 00 08 */ li r4, 8 /* 80315704 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 80315708 98 83 80 00 */ stb r4, 0x8000(r3) +/* 80315708 98 83 80 00 */ stb r4, 0x8000(r3) /* 0xCC008000@l */ /* 8031570C 38 00 00 30 */ li r0, 0x30 /* 80315710 98 03 80 00 */ stb r0, -0x8000(r3) /* 80315714 90 A3 80 00 */ stw r5, -0x8000(r3) diff --git a/asm/JSystem/J3DGraphBase/J3DShapeDraw/__ct__12J3DShapeDrawFPCUcUl.s b/asm/JSystem/J3DGraphBase/J3DShapeDraw/__ct__12J3DShapeDrawFPCUcUl.s index e3527a8f87..9d921f0978 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeDraw/__ct__12J3DShapeDrawFPCUcUl.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeDraw/__ct__12J3DShapeDrawFPCUcUl.s @@ -1,6 +1,6 @@ lbl_80314ABC: -/* 80314ABC 3C C0 80 3D */ lis r6, __vt__12J3DShapeDraw@ha -/* 80314AC0 38 06 DC 68 */ addi r0, r6, __vt__12J3DShapeDraw@l +/* 80314ABC 3C C0 80 3D */ lis r6, __vt__12J3DShapeDraw@ha /* 0x803CDC68@ha */ +/* 80314AC0 38 06 DC 68 */ addi r0, r6, __vt__12J3DShapeDraw@l /* 0x803CDC68@l */ /* 80314AC4 90 03 00 00 */ stw r0, 0(r3) /* 80314AC8 90 83 00 08 */ stw r4, 8(r3) /* 80314ACC 90 A3 00 04 */ stw r5, 4(r3) diff --git a/asm/JSystem/J3DGraphBase/J3DShapeDraw/__dt__12J3DShapeDrawFv.s b/asm/JSystem/J3DGraphBase/J3DShapeDraw/__dt__12J3DShapeDrawFv.s index 8d4f9de47b..544a395f98 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeDraw/__dt__12J3DShapeDrawFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeDraw/__dt__12J3DShapeDrawFv.s @@ -5,8 +5,8 @@ lbl_80314B00: /* 80314B0C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80314B10 7C 7F 1B 79 */ or. r31, r3, r3 /* 80314B14 41 82 00 1C */ beq lbl_80314B30 -/* 80314B18 3C A0 80 3D */ lis r5, __vt__12J3DShapeDraw@ha -/* 80314B1C 38 05 DC 68 */ addi r0, r5, __vt__12J3DShapeDraw@l +/* 80314B18 3C A0 80 3D */ lis r5, __vt__12J3DShapeDraw@ha /* 0x803CDC68@ha */ +/* 80314B1C 38 05 DC 68 */ addi r0, r5, __vt__12J3DShapeDraw@l /* 0x803CDC68@l */ /* 80314B20 90 1F 00 00 */ stw r0, 0(r31) /* 80314B24 7C 80 07 35 */ extsh. r0, r4 /* 80314B28 40 81 00 08 */ ble lbl_80314B30 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__11J3DShapeMtxFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__11J3DShapeMtxFv.s index a1e20ccad1..26510adff8 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__11J3DShapeMtxFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__11J3DShapeMtxFv.s @@ -5,8 +5,8 @@ lbl_80314798: /* 803147A4 93 E1 00 0C */ stw r31, 0xc(r1) /* 803147A8 7C 7F 1B 79 */ or. r31, r3, r3 /* 803147AC 41 82 00 1C */ beq lbl_803147C8 -/* 803147B0 3C A0 80 3D */ lis r5, __vt__11J3DShapeMtx@ha -/* 803147B4 38 05 DC 44 */ addi r0, r5, __vt__11J3DShapeMtx@l +/* 803147B0 3C A0 80 3D */ lis r5, __vt__11J3DShapeMtx@ha /* 0x803CDC44@ha */ +/* 803147B4 38 05 DC 44 */ addi r0, r5, __vt__11J3DShapeMtx@l /* 0x803CDC44@l */ /* 803147B8 90 1F 00 00 */ stw r0, 0(r31) /* 803147BC 7C 80 07 35 */ extsh. r0, r4 /* 803147C0 40 81 00 08 */ ble lbl_803147C8 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__16J3DShapeMtxMultiFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__16J3DShapeMtxMultiFv.s index e47d00c4ad..d3e033eee0 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__16J3DShapeMtxMultiFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__16J3DShapeMtxMultiFv.s @@ -5,12 +5,12 @@ lbl_803146B0: /* 803146BC 93 E1 00 0C */ stw r31, 0xc(r1) /* 803146C0 7C 7F 1B 79 */ or. r31, r3, r3 /* 803146C4 41 82 00 30 */ beq lbl_803146F4 -/* 803146C8 3C 60 80 3D */ lis r3, __vt__16J3DShapeMtxMulti@ha -/* 803146CC 38 03 DB FC */ addi r0, r3, __vt__16J3DShapeMtxMulti@l +/* 803146C8 3C 60 80 3D */ lis r3, __vt__16J3DShapeMtxMulti@ha /* 0x803CDBFC@ha */ +/* 803146CC 38 03 DB FC */ addi r0, r3, __vt__16J3DShapeMtxMulti@l /* 0x803CDBFC@l */ /* 803146D0 90 1F 00 00 */ stw r0, 0(r31) /* 803146D4 41 82 00 10 */ beq lbl_803146E4 -/* 803146D8 3C 60 80 3D */ lis r3, __vt__11J3DShapeMtx@ha -/* 803146DC 38 03 DC 44 */ addi r0, r3, __vt__11J3DShapeMtx@l +/* 803146D8 3C 60 80 3D */ lis r3, __vt__11J3DShapeMtx@ha /* 0x803CDC44@ha */ +/* 803146DC 38 03 DC 44 */ addi r0, r3, __vt__11J3DShapeMtx@l /* 0x803CDC44@l */ /* 803146E0 90 1F 00 00 */ stw r0, 0(r31) lbl_803146E4: /* 803146E4 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__21J3DShapeMtxConcatViewFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__21J3DShapeMtxConcatViewFv.s index a7694a16a3..9ff81d4d74 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__21J3DShapeMtxConcatViewFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__21J3DShapeMtxConcatViewFv.s @@ -5,12 +5,12 @@ lbl_80314730: /* 8031473C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80314740 7C 7F 1B 79 */ or. r31, r3, r3 /* 80314744 41 82 00 30 */ beq lbl_80314774 -/* 80314748 3C 60 80 3D */ lis r3, __vt__21J3DShapeMtxConcatView@ha -/* 8031474C 38 03 DC 1C */ addi r0, r3, __vt__21J3DShapeMtxConcatView@l +/* 80314748 3C 60 80 3D */ lis r3, __vt__21J3DShapeMtxConcatView@ha /* 0x803CDC1C@ha */ +/* 8031474C 38 03 DC 1C */ addi r0, r3, __vt__21J3DShapeMtxConcatView@l /* 0x803CDC1C@l */ /* 80314750 90 1F 00 00 */ stw r0, 0(r31) /* 80314754 41 82 00 10 */ beq lbl_80314764 -/* 80314758 3C 60 80 3D */ lis r3, __vt__11J3DShapeMtx@ha -/* 8031475C 38 03 DC 44 */ addi r0, r3, __vt__11J3DShapeMtx@l +/* 80314758 3C 60 80 3D */ lis r3, __vt__11J3DShapeMtx@ha /* 0x803CDC44@ha */ +/* 8031475C 38 03 DC 44 */ addi r0, r3, __vt__11J3DShapeMtx@l /* 0x803CDC44@l */ /* 80314760 90 1F 00 00 */ stw r0, 0(r31) lbl_80314764: /* 80314764 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__26J3DShapeMtxMultiConcatViewFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__26J3DShapeMtxMultiConcatViewFv.s index 32ce4a7c7d..bc02c30a60 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__26J3DShapeMtxMultiConcatViewFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__26J3DShapeMtxMultiConcatViewFv.s @@ -5,16 +5,16 @@ lbl_8031461C: /* 80314628 93 E1 00 0C */ stw r31, 0xc(r1) /* 8031462C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80314630 41 82 00 40 */ beq lbl_80314670 -/* 80314634 3C 60 80 3D */ lis r3, __vt__26J3DShapeMtxMultiConcatView@ha -/* 80314638 38 03 DB D4 */ addi r0, r3, __vt__26J3DShapeMtxMultiConcatView@l +/* 80314634 3C 60 80 3D */ lis r3, __vt__26J3DShapeMtxMultiConcatView@ha /* 0x803CDBD4@ha */ +/* 80314638 38 03 DB D4 */ addi r0, r3, __vt__26J3DShapeMtxMultiConcatView@l /* 0x803CDBD4@l */ /* 8031463C 90 1F 00 00 */ stw r0, 0(r31) /* 80314640 41 82 00 20 */ beq lbl_80314660 -/* 80314644 3C 60 80 3D */ lis r3, __vt__21J3DShapeMtxConcatView@ha -/* 80314648 38 03 DC 1C */ addi r0, r3, __vt__21J3DShapeMtxConcatView@l +/* 80314644 3C 60 80 3D */ lis r3, __vt__21J3DShapeMtxConcatView@ha /* 0x803CDC1C@ha */ +/* 80314648 38 03 DC 1C */ addi r0, r3, __vt__21J3DShapeMtxConcatView@l /* 0x803CDC1C@l */ /* 8031464C 90 1F 00 00 */ stw r0, 0(r31) /* 80314650 41 82 00 10 */ beq lbl_80314660 -/* 80314654 3C 60 80 3D */ lis r3, __vt__11J3DShapeMtx@ha -/* 80314658 38 03 DC 44 */ addi r0, r3, __vt__11J3DShapeMtx@l +/* 80314654 3C 60 80 3D */ lis r3, __vt__11J3DShapeMtx@ha /* 0x803CDC44@ha */ +/* 80314658 38 03 DC 44 */ addi r0, r3, __vt__11J3DShapeMtx@l /* 0x803CDC44@l */ /* 8031465C 90 1F 00 00 */ stw r0, 0(r31) lbl_80314660: /* 80314660 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__27J3DShapeMtxBBoardConcatViewFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__27J3DShapeMtxBBoardConcatViewFv.s index 55477480a1..4c88bbd74a 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__27J3DShapeMtxBBoardConcatViewFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__27J3DShapeMtxBBoardConcatViewFv.s @@ -5,16 +5,16 @@ lbl_803145A4: /* 803145B0 93 E1 00 0C */ stw r31, 0xc(r1) /* 803145B4 7C 7F 1B 79 */ or. r31, r3, r3 /* 803145B8 41 82 00 40 */ beq lbl_803145F8 -/* 803145BC 3C 60 80 3D */ lis r3, __vt__27J3DShapeMtxBBoardConcatView@ha -/* 803145C0 38 03 DB AC */ addi r0, r3, __vt__27J3DShapeMtxBBoardConcatView@l +/* 803145BC 3C 60 80 3D */ lis r3, __vt__27J3DShapeMtxBBoardConcatView@ha /* 0x803CDBAC@ha */ +/* 803145C0 38 03 DB AC */ addi r0, r3, __vt__27J3DShapeMtxBBoardConcatView@l /* 0x803CDBAC@l */ /* 803145C4 90 1F 00 00 */ stw r0, 0(r31) /* 803145C8 41 82 00 20 */ beq lbl_803145E8 -/* 803145CC 3C 60 80 3D */ lis r3, __vt__21J3DShapeMtxConcatView@ha -/* 803145D0 38 03 DC 1C */ addi r0, r3, __vt__21J3DShapeMtxConcatView@l +/* 803145CC 3C 60 80 3D */ lis r3, __vt__21J3DShapeMtxConcatView@ha /* 0x803CDC1C@ha */ +/* 803145D0 38 03 DC 1C */ addi r0, r3, __vt__21J3DShapeMtxConcatView@l /* 0x803CDC1C@l */ /* 803145D4 90 1F 00 00 */ stw r0, 0(r31) /* 803145D8 41 82 00 10 */ beq lbl_803145E8 -/* 803145DC 3C 60 80 3D */ lis r3, __vt__11J3DShapeMtx@ha -/* 803145E0 38 03 DC 44 */ addi r0, r3, __vt__11J3DShapeMtx@l +/* 803145DC 3C 60 80 3D */ lis r3, __vt__11J3DShapeMtx@ha /* 0x803CDC44@ha */ +/* 803145E0 38 03 DC 44 */ addi r0, r3, __vt__11J3DShapeMtx@l /* 0x803CDC44@l */ /* 803145E4 90 1F 00 00 */ stw r0, 0(r31) lbl_803145E8: /* 803145E8 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__28J3DShapeMtxYBBoardConcatViewFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__28J3DShapeMtxYBBoardConcatViewFv.s index 5aa865cbd1..1b1113f27b 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__28J3DShapeMtxYBBoardConcatViewFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__28J3DShapeMtxYBBoardConcatViewFv.s @@ -5,16 +5,16 @@ lbl_80314520: /* 8031452C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80314530 7C 7F 1B 79 */ or. r31, r3, r3 /* 80314534 41 82 00 40 */ beq lbl_80314574 -/* 80314538 3C 60 80 3D */ lis r3, __vt__28J3DShapeMtxYBBoardConcatView@ha -/* 8031453C 38 03 DB 84 */ addi r0, r3, __vt__28J3DShapeMtxYBBoardConcatView@l +/* 80314538 3C 60 80 3D */ lis r3, __vt__28J3DShapeMtxYBBoardConcatView@ha /* 0x803CDB84@ha */ +/* 8031453C 38 03 DB 84 */ addi r0, r3, __vt__28J3DShapeMtxYBBoardConcatView@l /* 0x803CDB84@l */ /* 80314540 90 1F 00 00 */ stw r0, 0(r31) /* 80314544 41 82 00 20 */ beq lbl_80314564 -/* 80314548 3C 60 80 3D */ lis r3, __vt__21J3DShapeMtxConcatView@ha -/* 8031454C 38 03 DC 1C */ addi r0, r3, __vt__21J3DShapeMtxConcatView@l +/* 80314548 3C 60 80 3D */ lis r3, __vt__21J3DShapeMtxConcatView@ha /* 0x803CDC1C@ha */ +/* 8031454C 38 03 DC 1C */ addi r0, r3, __vt__21J3DShapeMtxConcatView@l /* 0x803CDC1C@l */ /* 80314550 90 1F 00 00 */ stw r0, 0(r31) /* 80314554 41 82 00 10 */ beq lbl_80314564 -/* 80314558 3C 60 80 3D */ lis r3, __vt__11J3DShapeMtx@ha -/* 8031455C 38 03 DC 44 */ addi r0, r3, __vt__11J3DShapeMtx@l +/* 80314558 3C 60 80 3D */ lis r3, __vt__11J3DShapeMtx@ha /* 0x803CDC44@ha */ +/* 8031455C 38 03 DC 44 */ addi r0, r3, __vt__11J3DShapeMtx@l /* 0x803CDC44@l */ /* 80314560 90 1F 00 00 */ stw r0, 0(r31) lbl_80314564: /* 80314564 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__sinit_J3DShapeMtx_cpp.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__sinit_J3DShapeMtx_cpp.s index 1eb2e21b7a..4898016ee4 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__sinit_J3DShapeMtx_cpp.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__sinit_J3DShapeMtx_cpp.s @@ -1,6 +1,6 @@ lbl_803147EC: -/* 803147EC 3C 60 80 3D */ lis r3, lit_832@ha -/* 803147F0 38 63 D9 90 */ addi r3, r3, lit_832@l +/* 803147EC 3C 60 80 3D */ lis r3, lit_832@ha /* 0x803CD990@ha */ +/* 803147F0 38 63 D9 90 */ addi r3, r3, lit_832@l /* 0x803CD990@l */ /* 803147F4 80 83 00 00 */ lwz r4, 0(r3) /* 803147F8 80 03 00 04 */ lwz r0, 4(r3) /* 803147FC 90 83 00 30 */ stw r4, 0x30(r3) diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadExecute__17J3DDifferedTexMtxFPA4_Cf.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadExecute__17J3DDifferedTexMtxFPA4_Cf.s index 248d98c9d5..2046026ad4 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadExecute__17J3DDifferedTexMtxFPA4_Cf.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadExecute__17J3DDifferedTexMtxFPA4_Cf.s @@ -8,8 +8,8 @@ lbl_8031322C: /* 80313244 83 6D 90 40 */ lwz r27, sTexGenBlock__17J3DDifferedTexMtx(r13) /* 80313248 83 ED 90 44 */ lwz r31, sTexMtxObj__17J3DDifferedTexMtx(r13) /* 8031324C A0 9F 00 08 */ lhz r4, 8(r31) -/* 80313250 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313254 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80313250 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313254 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313258 80 03 00 34 */ lwz r0, 0x34(r3) /* 8031325C 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 /* 80313260 41 82 02 BC */ beq lbl_8031351C @@ -41,8 +41,8 @@ lbl_803132A0: /* 803132C0 54 A0 06 BE */ clrlwi r0, r5, 0x1a /* 803132C4 28 00 00 0B */ cmplwi r0, 0xb /* 803132C8 41 81 02 1C */ bgt lbl_803134E4 -/* 803132CC 3C 60 80 3D */ lis r3, lit_1034@ha -/* 803132D0 38 63 DB 40 */ addi r3, r3, lit_1034@l +/* 803132CC 3C 60 80 3D */ lis r3, lit_1034@ha /* 0x803CDB40@ha */ +/* 803132D0 38 63 DB 40 */ addi r3, r3, lit_1034@l /* 0x803CDB40@l */ /* 803132D4 54 00 10 3A */ slwi r0, r0, 2 /* 803132D8 7C 03 00 2E */ lwzx r0, r3, r0 /* 803132DC 7C 09 03 A6 */ mtctr r0 @@ -57,8 +57,8 @@ lbl_803132A0: /* 80313300 7C 03 02 14 */ add r0, r3, r0 /* 80313304 7C 03 03 78 */ mr r3, r0 /* 80313308 48 00 01 EC */ b lbl_803134F4 -/* 8031330C 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313310 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 8031330C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313310 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313314 38 81 00 88 */ addi r4, r1, 0x88 /* 80313318 48 03 32 99 */ bl PSMTXInverse /* 8031331C 80 7F 00 00 */ lwz r3, 0(r31) @@ -89,8 +89,8 @@ lbl_8031336C: /* 80313378 38 61 00 08 */ addi r3, r1, 8 /* 8031337C 38 A1 00 88 */ addi r5, r1, 0x88 /* 80313380 4B FF EA CD */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f -/* 80313384 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313388 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80313384 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313388 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 8031338C 38 81 00 48 */ addi r4, r1, 0x48 /* 80313390 48 03 32 21 */ bl PSMTXInverse /* 80313394 38 61 00 88 */ addi r3, r1, 0x88 @@ -118,8 +118,8 @@ lbl_803133D8: /* 803133E8 4B FF E8 4D */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_803133EC: /* 803133EC 38 61 00 08 */ addi r3, r1, 8 -/* 803133F0 3C 80 80 3D */ lis r4, qMtx@ha -/* 803133F4 38 84 DA B0 */ addi r4, r4, qMtx@l +/* 803133F0 3C 80 80 3D */ lis r4, qMtx@ha /* 0x803CDAB0@ha */ +/* 803133F4 38 84 DA B0 */ addi r4, r4, qMtx@l /* 0x803CDAB0@l */ /* 803133F8 7C 65 1B 78 */ mr r5, r3 /* 803133FC 48 03 30 E9 */ bl PSMTXConcat /* 80313400 80 7F 00 04 */ lwz r3, 4(r31) @@ -128,8 +128,8 @@ lbl_803133EC: /* 8031340C 38 61 00 08 */ addi r3, r1, 8 /* 80313410 38 A1 00 88 */ addi r5, r1, 0x88 /* 80313414 4B FF EA 39 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f -/* 80313418 3C 60 80 43 */ lis r3, j3dSys@ha -/* 8031341C 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80313418 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 8031341C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313420 38 81 00 48 */ addi r4, r1, 0x48 /* 80313424 48 03 31 8D */ bl PSMTXInverse /* 80313428 38 61 00 88 */ addi r3, r1, 0x88 @@ -157,8 +157,8 @@ lbl_8031346C: /* 8031347C 4B FF E7 B9 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80313480: /* 80313480 38 61 00 08 */ addi r3, r1, 8 -/* 80313484 3C 80 80 3D */ lis r4, qMtx2@ha -/* 80313488 38 84 DA E0 */ addi r4, r4, qMtx2@l +/* 80313484 3C 80 80 3D */ lis r4, qMtx2@ha /* 0x803CDAE0@ha */ +/* 80313488 38 84 DA E0 */ addi r4, r4, qMtx2@l /* 0x803CDAE0@l */ /* 8031348C 7C 65 1B 78 */ mr r5, r3 /* 80313490 48 03 30 55 */ bl PSMTXConcat /* 80313494 80 7F 00 04 */ lwz r3, 4(r31) @@ -167,8 +167,8 @@ lbl_80313480: /* 803134A0 38 61 00 08 */ addi r3, r1, 8 /* 803134A4 38 A1 00 88 */ addi r5, r1, 0x88 /* 803134A8 4B FF E9 A5 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f -/* 803134AC 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803134B0 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803134AC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803134B0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803134B4 38 81 00 48 */ addi r4, r1, 0x48 /* 803134B8 48 03 30 F9 */ bl PSMTXInverse /* 803134BC 38 61 00 88 */ addi r3, r1, 0x88 @@ -228,8 +228,8 @@ lbl_80313558: /* 80313578 54 80 06 BE */ clrlwi r0, r4, 0x1a /* 8031357C 28 00 00 0B */ cmplwi r0, 0xb /* 80313580 41 81 02 60 */ bgt lbl_803137E0 -/* 80313584 3C 60 80 3D */ lis r3, lit_1035@ha -/* 80313588 38 63 DB 10 */ addi r3, r3, lit_1035@l +/* 80313584 3C 60 80 3D */ lis r3, lit_1035@ha /* 0x803CDB10@ha */ +/* 80313588 38 63 DB 10 */ addi r3, r3, lit_1035@l /* 0x803CDB10@l */ /* 8031358C 54 00 10 3A */ slwi r0, r0, 2 /* 80313590 7C 03 00 2E */ lwzx r0, r3, r0 /* 80313594 7C 09 03 A6 */ mtctr r0 @@ -281,8 +281,8 @@ lbl_80313638: /* 80313644 38 61 00 08 */ addi r3, r1, 8 /* 80313648 38 A1 00 88 */ addi r5, r1, 0x88 /* 8031364C 4B FF E8 01 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f -/* 80313650 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313654 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80313650 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313654 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313658 38 81 00 48 */ addi r4, r1, 0x48 /* 8031365C 48 03 2F 55 */ bl PSMTXInverse /* 80313660 38 61 00 88 */ addi r3, r1, 0x88 @@ -314,8 +314,8 @@ lbl_803136B4: /* 803136C4 4B FF E5 71 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_803136C8: /* 803136C8 38 61 00 08 */ addi r3, r1, 8 -/* 803136CC 3C 80 80 3D */ lis r4, qMtx@ha -/* 803136D0 38 84 DA B0 */ addi r4, r4, qMtx@l +/* 803136CC 3C 80 80 3D */ lis r4, qMtx@ha /* 0x803CDAB0@ha */ +/* 803136D0 38 84 DA B0 */ addi r4, r4, qMtx@l /* 0x803CDAB0@l */ /* 803136D4 7C 65 1B 78 */ mr r5, r3 /* 803136D8 48 03 2E 0D */ bl PSMTXConcat /* 803136DC 80 7F 00 04 */ lwz r3, 4(r31) @@ -324,8 +324,8 @@ lbl_803136C8: /* 803136E8 38 61 00 08 */ addi r3, r1, 8 /* 803136EC 38 A1 00 88 */ addi r5, r1, 0x88 /* 803136F0 4B FF E7 5D */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f -/* 803136F4 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803136F8 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803136F4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803136F8 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803136FC 38 81 00 48 */ addi r4, r1, 0x48 /* 80313700 48 03 2E B1 */ bl PSMTXInverse /* 80313704 38 61 00 88 */ addi r3, r1, 0x88 @@ -357,8 +357,8 @@ lbl_80313758: /* 80313768 4B FF E4 CD */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_8031376C: /* 8031376C 38 61 00 08 */ addi r3, r1, 8 -/* 80313770 3C 80 80 3D */ lis r4, qMtx2@ha -/* 80313774 38 84 DA E0 */ addi r4, r4, qMtx2@l +/* 80313770 3C 80 80 3D */ lis r4, qMtx2@ha /* 0x803CDAE0@ha */ +/* 80313774 38 84 DA E0 */ addi r4, r4, qMtx2@l /* 0x803CDAE0@l */ /* 80313778 7C 65 1B 78 */ mr r5, r3 /* 8031377C 48 03 2D 69 */ bl PSMTXConcat /* 80313780 80 7F 00 04 */ lwz r3, 4(r31) @@ -367,8 +367,8 @@ lbl_8031376C: /* 8031378C 38 61 00 08 */ addi r3, r1, 8 /* 80313790 38 A1 00 88 */ addi r5, r1, 0x88 /* 80313794 4B FF E6 B9 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f -/* 80313798 3C 60 80 43 */ lis r3, j3dSys@ha -/* 8031379C 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80313798 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 8031379C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803137A0 38 81 00 48 */ addi r4, r1, 0x48 /* 803137A4 48 03 2E 0D */ bl PSMTXInverse /* 803137A8 38 61 00 88 */ addi r3, r1, 0x88 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_NCPU__21J3DShapeMtxConcatViewCFiUs.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_NCPU__21J3DShapeMtxConcatViewCFiUs.s index d9f79406ae..54c4a8fe11 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_NCPU__21J3DShapeMtxConcatViewCFiUs.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_NCPU__21J3DShapeMtxConcatViewCFiUs.s @@ -5,8 +5,8 @@ lbl_8031396C: /* 80313978 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8031397C 93 C1 00 38 */ stw r30, 0x38(r1) /* 80313980 7C 9E 23 78 */ mr r30, r4 -/* 80313984 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313988 3B E3 4A C8 */ addi r31, r3, j3dSys@l +/* 80313984 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313988 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ /* 8031398C 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80313990 80 63 00 30 */ lwz r3, 0x30(r3) /* 80313994 80 9F 01 04 */ lwz r4, 0x104(r31) diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PCPU__21J3DShapeMtxConcatViewCFiUs.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PCPU__21J3DShapeMtxConcatViewCFiUs.s index a26f8c16f8..764a7251f6 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PCPU__21J3DShapeMtxConcatViewCFiUs.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PCPU__21J3DShapeMtxConcatViewCFiUs.s @@ -7,8 +7,8 @@ lbl_803138C8: /* 803138DC 7C 7C 1B 78 */ mr r28, r3 /* 803138E0 7C 9D 23 78 */ mr r29, r4 /* 803138E4 7C BE 2B 78 */ mr r30, r5 -/* 803138E8 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803138EC 3B E3 4A C8 */ addi r31, r3, j3dSys@l +/* 803138E8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803138EC 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ /* 803138F0 80 7F 00 40 */ lwz r3, 0x40(r31) /* 803138F4 80 63 00 30 */ lwz r3, 0x30(r3) /* 803138F8 80 9F 01 04 */ lwz r4, 0x104(r31) diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNCPU__21J3DShapeMtxConcatViewCFiUs.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNCPU__21J3DShapeMtxConcatViewCFiUs.s index 6b3010d6d3..39c73b1543 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNCPU__21J3DShapeMtxConcatViewCFiUs.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNCPU__21J3DShapeMtxConcatViewCFiUs.s @@ -8,8 +8,8 @@ lbl_80313A14: /* 80313A2C 80 0D 90 40 */ lwz r0, sTexGenBlock__17J3DDifferedTexMtx(r13) /* 80313A30 28 00 00 00 */ cmplwi r0, 0 /* 80313A34 41 82 00 34 */ beq lbl_80313A68 -/* 80313A38 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313A3C 38 83 4A C8 */ addi r4, r3, j3dSys@l +/* 80313A38 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313A3C 38 83 4A C8 */ addi r4, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313A40 80 64 00 40 */ lwz r3, 0x40(r4) /* 80313A44 80 63 00 30 */ lwz r3, 0x30(r3) /* 80313A48 80 84 01 04 */ lwz r4, 0x104(r4) @@ -21,8 +21,8 @@ lbl_80313A14: /* 80313A60 38 61 00 08 */ addi r3, r1, 8 /* 80313A64 4B FF F7 C9 */ bl loadExecute__17J3DDifferedTexMtxFPA4_Cf lbl_80313A68: -/* 80313A68 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313A6C 3B E3 4A C8 */ addi r31, r3, j3dSys@l +/* 80313A68 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313A6C 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313A70 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80313A74 80 63 00 30 */ lwz r3, 0x30(r3) /* 80313A78 1F DE 00 03 */ mulli r30, r30, 3 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNGP_LOD__21J3DShapeMtxConcatViewCFiUs.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNGP_LOD__21J3DShapeMtxConcatViewCFiUs.s index 2d1957e8b5..7ec4b0758c 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNGP_LOD__21J3DShapeMtxConcatViewCFiUs.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNGP_LOD__21J3DShapeMtxConcatViewCFiUs.s @@ -7,8 +7,8 @@ lbl_80313AC8: /* 80313ADC 7C 7D 1B 78 */ mr r29, r3 /* 80313AE0 7C 9E 23 78 */ mr r30, r4 /* 80313AE4 7C BF 2B 78 */ mr r31, r5 -/* 80313AE8 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313AEC 38 83 4A C8 */ addi r4, r3, j3dSys@l +/* 80313AE8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313AEC 38 83 4A C8 */ addi r4, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313AF0 80 64 00 40 */ lwz r3, 0x40(r4) /* 80313AF4 80 63 00 30 */ lwz r3, 0x30(r3) /* 80313AF8 80 84 01 04 */ lwz r4, 0x104(r4) @@ -17,8 +17,8 @@ lbl_80313AC8: /* 80313B04 7C 84 02 14 */ add r4, r4, r0 /* 80313B08 38 A1 00 08 */ addi r5, r1, 8 /* 80313B0C 48 03 29 D9 */ bl PSMTXConcat -/* 80313B10 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313B14 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80313B10 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313B14 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313B18 80 63 00 38 */ lwz r3, 0x38(r3) /* 80313B1C 80 63 00 04 */ lwz r3, 4(r3) /* 80313B20 80 63 00 3C */ lwz r3, 0x3c(r3) diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNGP__21J3DShapeMtxConcatViewCFiUs.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNGP__21J3DShapeMtxConcatViewCFiUs.s index 45b750ab51..38e4331b9d 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNGP__21J3DShapeMtxConcatViewCFiUs.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxConcatView_PNGP__21J3DShapeMtxConcatViewCFiUs.s @@ -7,8 +7,8 @@ lbl_80313828: /* 8031383C 7C 7D 1B 78 */ mr r29, r3 /* 80313840 7C 9E 23 78 */ mr r30, r4 /* 80313844 7C BF 2B 78 */ mr r31, r5 -/* 80313848 3C 60 80 43 */ lis r3, j3dSys@ha -/* 8031384C 38 83 4A C8 */ addi r4, r3, j3dSys@l +/* 80313848 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 8031384C 38 83 4A C8 */ addi r4, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313850 80 64 00 40 */ lwz r3, 0x40(r4) /* 80313854 80 63 00 30 */ lwz r3, 0x30(r3) /* 80313858 80 84 01 04 */ lwz r4, 0x104(r4) diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_NCPU__11J3DShapeMtxCFiUs.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_NCPU__11J3DShapeMtxCFiUs.s index 446e27937e..e3a24c9b7e 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_NCPU__11J3DShapeMtxCFiUs.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_NCPU__11J3DShapeMtxCFiUs.s @@ -4,11 +4,11 @@ lbl_80313188: /* 80313190 90 01 00 14 */ stw r0, 0x14(r1) /* 80313194 93 E1 00 0C */ stw r31, 0xc(r1) /* 80313198 7C 9F 23 78 */ mr r31, r4 -/* 8031319C 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803131A0 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 8031319C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803131A0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803131A4 4B FF CD 1D */ bl loadPosMtxIndx__6J3DSysCFiUs -/* 803131A8 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803131AC 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803131A8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803131AC 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803131B0 80 63 00 40 */ lwz r3, 0x40(r3) /* 803131B4 80 63 00 30 */ lwz r3, 0x30(r3) /* 803131B8 1C 9F 00 03 */ mulli r4, r31, 3 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PCPU__11J3DShapeMtxCFiUs.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PCPU__11J3DShapeMtxCFiUs.s index df24ec5981..5dddc88ff8 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PCPU__11J3DShapeMtxCFiUs.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PCPU__11J3DShapeMtxCFiUs.s @@ -6,14 +6,14 @@ lbl_80313128: /* 80313138 93 C1 00 08 */ stw r30, 8(r1) /* 8031313C 7C 9E 23 78 */ mr r30, r4 /* 80313140 7C BF 2B 78 */ mr r31, r5 -/* 80313144 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313148 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80313144 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313148 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 8031314C 80 63 00 40 */ lwz r3, 0x40(r3) /* 80313150 80 63 00 30 */ lwz r3, 0x30(r3) /* 80313154 1C 9E 00 03 */ mulli r4, r30, 3 /* 80313158 4B FF C9 89 */ bl J3DFifoLoadPosMtxImm__FPA4_fUl -/* 8031315C 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313160 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 8031315C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313160 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313164 7F C4 F3 78 */ mr r4, r30 /* 80313168 7F E5 FB 78 */ mr r5, r31 /* 8031316C 4B FF CD 79 */ bl loadNrmMtxIndx__6J3DSysCFiUs diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PNCPU__11J3DShapeMtxCFiUs.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PNCPU__11J3DShapeMtxCFiUs.s index 5b7b056143..b7a6bf538c 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PNCPU__11J3DShapeMtxCFiUs.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PNCPU__11J3DShapeMtxCFiUs.s @@ -4,8 +4,8 @@ lbl_803131D4: /* 803131DC 90 01 00 14 */ stw r0, 0x14(r1) /* 803131E0 93 E1 00 0C */ stw r31, 0xc(r1) /* 803131E4 93 C1 00 08 */ stw r30, 8(r1) -/* 803131E8 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803131EC 3B E3 4A C8 */ addi r31, r3, j3dSys@l +/* 803131E8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803131EC 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ /* 803131F0 80 7F 00 40 */ lwz r3, 0x40(r31) /* 803131F4 80 63 00 30 */ lwz r3, 0x30(r3) /* 803131F8 1F C4 00 03 */ mulli r30, r4, 3 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PNGP__11J3DShapeMtxCFiUs.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PNGP__11J3DShapeMtxCFiUs.s index b0c8aa09ad..71d459bd1f 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PNGP__11J3DShapeMtxCFiUs.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadMtxIndx_PNGP__11J3DShapeMtxCFiUs.s @@ -1,7 +1,7 @@ lbl_803130E4: /* 803130E4 38 00 00 20 */ li r0, 0x20 /* 803130E8 3C C0 CC 01 */ lis r6, 0xCC01 /* 0xCC008000@ha */ -/* 803130EC 98 06 80 00 */ stb r0, 0x8000(r6) +/* 803130EC 98 06 80 00 */ stb r0, 0x8000(r6) /* 0xCC008000@l */ /* 803130F0 B0 A6 80 00 */ sth r5, -0x8000(r6) /* 803130F4 1C 04 00 0C */ mulli r0, r4, 0xc /* 803130F8 54 00 04 3E */ clrlwi r0, r0, 0x10 diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadNrmMtx__21J3DShapeMtxConcatViewCFiUsPA4_f.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadNrmMtx__21J3DShapeMtxConcatViewCFiUsPA4_f.s index 0a74d94d39..ffa8a602a8 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadNrmMtx__21J3DShapeMtxConcatViewCFiUsPA4_f.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadNrmMtx__21J3DShapeMtxConcatViewCFiUsPA4_f.s @@ -24,8 +24,8 @@ lbl_80313D68: /* 80313D7C 4B FF BD E5 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 80313D80 48 00 00 B8 */ b lbl_80313E38 lbl_80313D84: -/* 80313D84 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313D88 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80313D84 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313D88 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313D8C 80 83 01 18 */ lwz r4, 0x118(r3) /* 80313D90 38 61 00 2C */ addi r3, r1, 0x2c /* 80313D94 E0 BF 00 00 */ psq_l f5, 0(r31), 0, 0 /* qr0 */ @@ -64,8 +64,8 @@ lbl_80313DFC: /* 80313E10 4B FF BD BD */ bl J3DFifoLoadNrmMtxImm3x3__FPA3_fUl /* 80313E14 48 00 00 24 */ b lbl_80313E38 lbl_80313E18: -/* 80313E18 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313E1C 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80313E18 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313E1C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313E20 80 83 01 18 */ lwz r4, 0x118(r3) /* 80313E24 38 61 00 08 */ addi r3, r1, 8 /* 80313E28 4B FF DF D1 */ bl J3DScaleNrmMtx33__FPA3_fRC3Vec diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUsPA4_f.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUsPA4_f.s index 01e7fce08a..2657cfeef0 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUsPA4_f.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUsPA4_f.s @@ -27,8 +27,8 @@ lbl_803141E8: /* 803141FC 4B FF B9 65 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 80314200 48 00 00 BC */ b lbl_803142BC lbl_80314204: -/* 80314204 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80314208 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80314204 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80314208 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 8031420C 80 83 01 18 */ lwz r4, 0x118(r3) /* 80314210 38 61 00 2C */ addi r3, r1, 0x2c /* 80314214 E0 BF 00 00 */ psq_l f5, 0(r31), 0, 0 /* qr0 */ @@ -68,8 +68,8 @@ lbl_80314280: /* 80314294 4B FF B9 39 */ bl J3DFifoLoadNrmMtxImm3x3__FPA3_fUl /* 80314298 48 00 00 24 */ b lbl_803142BC lbl_8031429C: -/* 8031429C 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803142A0 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 8031429C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803142A0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803142A4 80 83 01 18 */ lwz r4, 0x118(r3) /* 803142A8 38 61 00 08 */ addi r3, r1, 8 /* 803142AC 4B FF DB 4D */ bl J3DScaleNrmMtx33__FPA3_fRC3Vec diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__11J3DShapeMtxCFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__11J3DShapeMtxCFv.s index f5e4a4cf24..add8d6f488 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__11J3DShapeMtxCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__11J3DShapeMtxCFv.s @@ -4,8 +4,8 @@ lbl_80313B94: /* 80313B9C 90 01 00 24 */ stw r0, 0x24(r1) /* 80313BA0 80 0D 90 28 */ lwz r0, sCurrentPipeline__11J3DShapeMtx(r13) /* 80313BA4 1C A0 00 0C */ mulli r5, r0, 0xc -/* 80313BA8 3C 80 80 3D */ lis r4, sMtxLoadPipeline__11J3DShapeMtx@ha -/* 80313BAC 38 04 D9 C0 */ addi r0, r4, sMtxLoadPipeline__11J3DShapeMtx@l +/* 80313BA8 3C 80 80 3D */ lis r4, sMtxLoadPipeline__11J3DShapeMtx@ha /* 0x803CD9C0@ha */ +/* 80313BAC 38 04 D9 C0 */ addi r0, r4, sMtxLoadPipeline__11J3DShapeMtx@l /* 0x803CD9C0@l */ /* 80313BB0 7C A0 2A 14 */ add r5, r0, r5 /* 80313BB4 80 85 00 00 */ lwz r4, 0(r5) /* 80313BB8 80 05 00 04 */ lwz r0, 4(r5) diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__16J3DShapeMtxMultiCFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__16J3DShapeMtxMultiCFv.s index a44bc3a919..e0976b0e5f 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__16J3DShapeMtxMultiCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__16J3DShapeMtxMultiCFv.s @@ -7,8 +7,8 @@ lbl_80313E4C: /* 80313E60 7C 7B 1B 78 */ mr r27, r3 /* 80313E64 80 0D 90 28 */ lwz r0, sCurrentPipeline__11J3DShapeMtx(r13) /* 80313E68 1C 80 00 0C */ mulli r4, r0, 0xc -/* 80313E6C 3C 60 80 3D */ lis r3, sMtxLoadPipeline__11J3DShapeMtx@ha -/* 80313E70 38 03 D9 C0 */ addi r0, r3, sMtxLoadPipeline__11J3DShapeMtx@l +/* 80313E6C 3C 60 80 3D */ lis r3, sMtxLoadPipeline__11J3DShapeMtx@ha /* 0x803CD9C0@ha */ +/* 80313E70 38 03 D9 C0 */ addi r0, r3, sMtxLoadPipeline__11J3DShapeMtx@l /* 0x803CD9C0@l */ /* 80313E74 7C 80 22 14 */ add r4, r0, r4 /* 80313E78 80 64 00 00 */ lwz r3, 0(r4) /* 80313E7C 80 04 00 04 */ lwz r0, 4(r4) diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__21J3DShapeMtxConcatViewCFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__21J3DShapeMtxConcatViewCFv.s index 6187cc1160..d89b7bf19a 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__21J3DShapeMtxConcatViewCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__21J3DShapeMtxConcatViewCFv.s @@ -5,8 +5,8 @@ lbl_80313C54: /* 80313C60 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80313C64 93 C1 00 18 */ stw r30, 0x18(r1) /* 80313C68 7C 7F 1B 78 */ mr r31, r3 -/* 80313C6C 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313C70 3B C3 4A C8 */ addi r30, r3, j3dSys@l +/* 80313C6C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313C70 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313C74 80 DE 00 38 */ lwz r6, 0x38(r30) /* 80313C78 80 66 00 84 */ lwz r3, 0x84(r6) /* 80313C7C 80 03 00 34 */ lwz r0, 0x34(r3) @@ -16,8 +16,8 @@ lbl_80313C54: /* 80313C8C 90 05 00 04 */ stw r0, 4(r5) /* 80313C90 80 0D 90 28 */ lwz r0, sCurrentPipeline__11J3DShapeMtx(r13) /* 80313C94 1C 80 00 0C */ mulli r4, r0, 0xc -/* 80313C98 3C 60 80 3D */ lis r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@ha -/* 80313C9C 38 03 DA 20 */ addi r0, r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@l +/* 80313C98 3C 60 80 3D */ lis r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@ha /* 0x803CDA20@ha */ +/* 80313C9C 38 03 DA 20 */ addi r0, r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@l /* 0x803CDA20@l */ /* 80313CA0 7C 80 22 14 */ add r4, r0, r4 /* 80313CA4 80 64 00 00 */ lwz r3, 0(r4) /* 80313CA8 80 04 00 04 */ lwz r0, 4(r4) diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__26J3DShapeMtxMultiConcatViewCFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__26J3DShapeMtxMultiConcatViewCFv.s index a64624c6ac..4990bb9f52 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__26J3DShapeMtxMultiConcatViewCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__26J3DShapeMtxMultiConcatViewCFv.s @@ -5,8 +5,8 @@ lbl_80313FA4: /* 80313FB0 39 61 00 50 */ addi r11, r1, 0x50 /* 80313FB4 48 04 E2 0D */ bl _savegpr_22 /* 80313FB8 7C 77 1B 78 */ mr r23, r3 -/* 80313FBC 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80313FC0 3B 83 4A C8 */ addi r28, r3, j3dSys@l +/* 80313FBC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80313FC0 3B 83 4A C8 */ addi r28, r3, j3dSys@l /* 0x80434AC8@l */ /* 80313FC4 80 BC 00 38 */ lwz r5, 0x38(r28) /* 80313FC8 80 65 00 84 */ lwz r3, 0x84(r5) /* 80313FCC 80 83 00 34 */ lwz r4, 0x34(r3) @@ -19,8 +19,8 @@ lbl_80313FA4: /* 80313FE8 40 82 00 B4 */ bne lbl_8031409C /* 80313FEC 80 0D 90 28 */ lwz r0, sCurrentPipeline__11J3DShapeMtx(r13) /* 80313FF0 1C 80 00 0C */ mulli r4, r0, 0xc -/* 80313FF4 3C 60 80 3D */ lis r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@ha -/* 80313FF8 38 03 DA 20 */ addi r0, r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@l +/* 80313FF4 3C 60 80 3D */ lis r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@ha /* 0x803CDA20@ha */ +/* 80313FF8 38 03 DA 20 */ addi r0, r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@l /* 0x803CDA20@l */ /* 80313FFC 7C 80 22 14 */ add r4, r0, r4 /* 80314000 80 64 00 00 */ lwz r3, 0(r4) /* 80314004 80 04 00 04 */ lwz r0, 4(r4) @@ -74,8 +74,8 @@ lbl_8031409C: /* 803140B4 A3 57 00 08 */ lhz r26, 8(r23) /* 803140B8 3B 20 00 00 */ li r25, 0 /* 803140BC 3A C0 00 00 */ li r22, 0 -/* 803140C0 3C 60 80 3D */ lis r3, sMtxLoadLODPipeline__21J3DShapeMtxConcatView@ha -/* 803140C4 3B A3 DA 80 */ addi r29, r3, sMtxLoadLODPipeline__21J3DShapeMtxConcatView@l +/* 803140C0 3C 60 80 3D */ lis r3, sMtxLoadLODPipeline__21J3DShapeMtxConcatView@ha /* 0x803CDA80@ha */ +/* 803140C4 3B A3 DA 80 */ addi r29, r3, sMtxLoadLODPipeline__21J3DShapeMtxConcatView@l /* 0x803CDA80@l */ /* 803140C8 83 D7 00 0C */ lwz r30, 0xc(r23) /* 803140CC 48 00 00 B0 */ b lbl_8031417C lbl_803140D0: @@ -93,8 +93,8 @@ lbl_803140D0: /* 803140FC 41 82 00 78 */ beq lbl_80314174 /* 80314100 54 80 0B FC */ rlwinm r0, r4, 1, 0xf, 0x1e /* 80314104 7F 1B 02 2E */ lhzx r24, r27, r0 -/* 80314108 3C 60 80 43 */ lis r3, sMtxLoadCache__11J3DShapeMtx@ha -/* 8031410C 3B E3 4C 80 */ addi r31, r3, sMtxLoadCache__11J3DShapeMtx@l +/* 80314108 3C 60 80 43 */ lis r3, sMtxLoadCache__11J3DShapeMtx@ha /* 0x80434C80@ha */ +/* 8031410C 3B E3 4C 80 */ addi r31, r3, sMtxLoadCache__11J3DShapeMtx@l /* 0x80434C80@l */ /* 80314110 7C 1F B2 2E */ lhzx r0, r31, r22 /* 80314114 7C 18 00 40 */ cmplw r24, r0 /* 80314118 41 82 00 5C */ beq lbl_80314174 @@ -104,8 +104,8 @@ lbl_803140D0: /* 80314128 7C 03 20 AE */ lbzx r0, r3, r4 /* 8031412C 28 00 00 00 */ cmplwi r0, 0 /* 80314130 40 82 00 28 */ bne lbl_80314158 -/* 80314134 3C 60 80 3D */ lis r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@ha -/* 80314138 38 03 DA 20 */ addi r0, r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@l +/* 80314134 3C 60 80 3D */ lis r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@ha /* 0x803CDA20@ha */ +/* 80314138 38 03 DA 20 */ addi r0, r3, sMtxLoadPipeline__21J3DShapeMtxConcatView@l /* 0x803CDA20@l */ /* 8031413C 7C 80 2A 14 */ add r4, r0, r5 /* 80314140 80 64 00 00 */ lwz r3, 0(r4) /* 80314144 80 04 00 04 */ lwz r0, 4(r4) diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__27J3DShapeMtxBBoardConcatViewCFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__27J3DShapeMtxBBoardConcatViewCFv.s index 8cc3723d5b..1915c99b71 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__27J3DShapeMtxBBoardConcatViewCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__27J3DShapeMtxBBoardConcatViewCFv.s @@ -2,8 +2,8 @@ lbl_803142D4: /* 803142D4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 803142D8 7C 08 02 A6 */ mflr r0 /* 803142DC 90 01 00 44 */ stw r0, 0x44(r1) -/* 803142E0 3C 80 80 43 */ lis r4, j3dSys@ha -/* 803142E4 38 C4 4A C8 */ addi r6, r4, j3dSys@l +/* 803142E0 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ +/* 803142E4 38 C4 4A C8 */ addi r6, r4, j3dSys@l /* 0x80434AC8@l */ /* 803142E8 81 06 00 38 */ lwz r8, 0x38(r6) /* 803142EC 80 E8 00 04 */ lwz r7, 4(r8) /* 803142F0 80 A7 00 4C */ lwz r5, 0x4c(r7) @@ -58,8 +58,8 @@ lbl_8031434C: /* 803143AC 4B FF B7 B5 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 803143B0 48 00 00 24 */ b lbl_803143D4 lbl_803143B4: -/* 803143B4 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803143B8 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803143B4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803143B8 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803143BC 80 83 01 18 */ lwz r4, 0x118(r3) /* 803143C0 38 61 00 08 */ addi r3, r1, 8 /* 803143C4 4B FF D9 D1 */ bl J3DScaleNrmMtx__FPA4_fRC3Vec diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__28J3DShapeMtxYBBoardConcatViewCFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__28J3DShapeMtxYBBoardConcatViewCFv.s index e6d6959912..bd2bc4f89a 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__28J3DShapeMtxYBBoardConcatViewCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/load__28J3DShapeMtxYBBoardConcatViewCFv.s @@ -4,8 +4,8 @@ lbl_803143E4: /* 803143EC 90 01 00 74 */ stw r0, 0x74(r1) /* 803143F0 93 E1 00 6C */ stw r31, 0x6c(r1) /* 803143F4 7C 7F 1B 78 */ mr r31, r3 -/* 803143F8 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803143FC 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803143F8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803143FC 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80314400 80 E3 00 38 */ lwz r7, 0x38(r3) /* 80314404 80 C7 00 04 */ lwz r6, 4(r7) /* 80314408 80 86 00 4C */ lwz r4, 0x4c(r6) @@ -49,8 +49,8 @@ lbl_8031445C: /* 80314498 4B FF B6 C9 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 8031449C 48 00 00 70 */ b lbl_8031450C lbl_803144A0: -/* 803144A0 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803144A4 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803144A0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803144A4 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803144A8 80 83 01 18 */ lwz r4, 0x118(r3) /* 803144AC 38 61 00 2C */ addi r3, r1, 0x2c /* 803144B0 4B FF D8 E5 */ bl J3DScaleNrmMtx__FPA4_fRC3Vec @@ -70,8 +70,8 @@ lbl_803144C4: /* 803144E4 4B FF B6 E9 */ bl J3DFifoLoadNrmMtxImm3x3__FPA3_fUl /* 803144E8 48 00 00 24 */ b lbl_8031450C lbl_803144EC: -/* 803144EC 3C 60 80 43 */ lis r3, j3dSys@ha -/* 803144F0 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 803144EC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 803144F0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803144F4 80 83 01 18 */ lwz r4, 0x118(r3) /* 803144F8 38 61 00 08 */ addi r3, r1, 8 /* 803144FC 4B FF D8 FD */ bl J3DScaleNrmMtx33__FPA3_fRC3Vec diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/resetMtxLoadCache__11J3DShapeMtxFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/resetMtxLoadCache__11J3DShapeMtxFv.s index 51ba2818e0..ed18122710 100644 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/resetMtxLoadCache__11J3DShapeMtxFv.s +++ b/asm/JSystem/J3DGraphBase/J3DShapeMtx/resetMtxLoadCache__11J3DShapeMtxFv.s @@ -1,8 +1,8 @@ lbl_803130A8: /* 803130A8 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ /* 803130AC 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 803130B0 3C 60 80 43 */ lis r3, sMtxLoadCache__11J3DShapeMtx@ha -/* 803130B4 38 63 4C 80 */ addi r3, r3, sMtxLoadCache__11J3DShapeMtx@l +/* 803130B0 3C 60 80 43 */ lis r3, sMtxLoadCache__11J3DShapeMtx@ha /* 0x80434C80@ha */ +/* 803130B4 38 63 4C 80 */ addi r3, r3, sMtxLoadCache__11J3DShapeMtx@l /* 0x80434C80@l */ /* 803130B8 B0 03 00 12 */ sth r0, 0x12(r3) /* 803130BC B0 03 00 10 */ sth r0, 0x10(r3) /* 803130C0 B0 03 00 0E */ sth r0, 0xe(r3) diff --git a/asm/JSystem/J3DGraphBase/J3DSys/__ct__6J3DSysFv.s b/asm/JSystem/J3DGraphBase/J3DSys/__ct__6J3DSysFv.s index 62b7dbb6d2..fa5060515d 100644 --- a/asm/JSystem/J3DGraphBase/J3DSys/__ct__6J3DSysFv.s +++ b/asm/JSystem/J3DGraphBase/J3DSys/__ct__6J3DSysFv.s @@ -37,8 +37,8 @@ lbl_8030FE40: /* 8030FE70 90 DF 01 14 */ stw r6, 0x114(r31) /* 8030FE74 38 60 00 00 */ li r3, 0 /* 8030FE78 38 A0 00 01 */ li r5, 1 -/* 8030FE7C 3C 80 80 43 */ lis r4, sTexCoordScaleTable__6J3DSys@ha -/* 8030FE80 38 84 4C 2C */ addi r4, r4, sTexCoordScaleTable__6J3DSys@l +/* 8030FE7C 3C 80 80 43 */ lis r4, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 8030FE80 38 84 4C 2C */ addi r4, r4, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 8030FE84 38 00 00 08 */ li r0, 8 /* 8030FE88 7C 09 03 A6 */ mtctr r0 lbl_8030FE8C: diff --git a/asm/JSystem/J3DGraphBase/J3DSys/__sinit_J3DSys_cpp.s b/asm/JSystem/J3DGraphBase/J3DSys/__sinit_J3DSys_cpp.s index 963cd6527c..d71b70337e 100644 --- a/asm/JSystem/J3DGraphBase/J3DSys/__sinit_J3DSys_cpp.s +++ b/asm/JSystem/J3DGraphBase/J3DSys/__sinit_J3DSys_cpp.s @@ -2,8 +2,8 @@ lbl_80310ED0: /* 80310ED0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80310ED4 7C 08 02 A6 */ mflr r0 /* 80310ED8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80310EDC 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80310EE0 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80310EDC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80310EE0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80310EE4 4B FF EF 05 */ bl __ct__6J3DSysFv /* 80310EE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80310EEC 7C 08 03 A6 */ mtlr r0 diff --git a/asm/JSystem/J3DGraphBase/J3DSys/drawInit__6J3DSysFv.s b/asm/JSystem/J3DGraphBase/J3DSys/drawInit__6J3DSysFv.s index 63b5388358..c9f20aad5e 100644 --- a/asm/JSystem/J3DGraphBase/J3DSys/drawInit__6J3DSysFv.s +++ b/asm/JSystem/J3DGraphBase/J3DSys/drawInit__6J3DSysFv.s @@ -193,8 +193,8 @@ lbl_803100BC: /* 803103B8 48 04 F3 3D */ bl GXSetTevOrder /* 803103BC 3B 80 00 00 */ li r28, 0 /* 803103C0 3B C0 00 00 */ li r30, 0 -/* 803103C4 3C 80 80 3D */ lis r4, j3dIdentityMtx@ha -/* 803103C8 3B A4 D8 B0 */ addi r29, r4, j3dIdentityMtx@l +/* 803103C4 3C 80 80 3D */ lis r4, j3dIdentityMtx@ha /* 0x803CD8B0@ha */ +/* 803103C8 3B A4 D8 B0 */ addi r29, r4, j3dIdentityMtx@l /* 0x803CD8B0@l */ lbl_803103CC: /* 803103CC 7F A3 EB 78 */ mr r3, r29 /* 803103D0 38 9E 00 1E */ addi r4, r30, 0x1e @@ -205,8 +205,8 @@ lbl_803103CC: /* 803103E4 3B DE 00 03 */ addi r30, r30, 3 /* 803103E8 41 80 FF E4 */ blt lbl_803103CC /* 803103EC 38 C1 00 20 */ addi r6, r1, 0x20 -/* 803103F0 3C 80 80 3A */ lis r4, lit_737@ha -/* 803103F4 38 84 1E 18 */ addi r4, r4, lit_737@l +/* 803103F0 3C 80 80 3A */ lis r4, lit_737@ha /* 0x803A1E18@ha */ +/* 803103F4 38 84 1E 18 */ addi r4, r4, lit_737@l /* 0x803A1E18@l */ /* 803103F8 38 A4 FF FC */ addi r5, r4, -4 /* 803103FC 38 00 00 03 */ li r0, 3 /* 80310400 7C 09 03 A6 */ mtctr r0 @@ -262,8 +262,8 @@ lbl_80310438: /* 803104BC 39 20 00 02 */ li r9, 2 /* 803104C0 48 04 D6 AD */ bl GXSetChanCtrl /* 803104C4 3B 80 00 00 */ li r28, 0 -/* 803104C8 3C 80 80 3A */ lis r4, j3dDefaultTexCoordInfo@ha -/* 803104CC 3B A4 1E FC */ addi r29, r4, j3dDefaultTexCoordInfo@l +/* 803104C8 3C 80 80 3A */ lis r4, j3dDefaultTexCoordInfo@ha /* 0x803A1EFC@ha */ +/* 803104CC 3B A4 1E FC */ addi r29, r4, j3dDefaultTexCoordInfo@l /* 0x803A1EFC@l */ /* 803104D0 48 00 00 2C */ b lbl_803104FC lbl_803104D4: /* 803104D4 57 83 06 3E */ clrlwi r3, r28, 0x18 diff --git a/asm/JSystem/J3DGraphBase/J3DSys/loadNrmMtxIndx__6J3DSysCFiUs.s b/asm/JSystem/J3DGraphBase/J3DSys/loadNrmMtxIndx__6J3DSysCFiUs.s index aecd4d942f..dffe136901 100644 --- a/asm/JSystem/J3DGraphBase/J3DSys/loadNrmMtxIndx__6J3DSysCFiUs.s +++ b/asm/JSystem/J3DGraphBase/J3DSys/loadNrmMtxIndx__6J3DSysCFiUs.s @@ -1,7 +1,7 @@ lbl_8030FEE4: /* 8030FEE4 38 00 00 28 */ li r0, 0x28 /* 8030FEE8 3C C0 CC 01 */ lis r6, 0xCC01 /* 0xCC008000@ha */ -/* 8030FEEC 98 06 80 00 */ stb r0, 0x8000(r6) +/* 8030FEEC 98 06 80 00 */ stb r0, 0x8000(r6) /* 0xCC008000@l */ /* 8030FEF0 B0 A6 80 00 */ sth r5, -0x8000(r6) /* 8030FEF4 1C 64 00 09 */ mulli r3, r4, 9 /* 8030FEF8 38 03 04 00 */ addi r0, r3, 0x400 diff --git a/asm/JSystem/J3DGraphBase/J3DSys/loadPosMtxIndx__6J3DSysCFiUs.s b/asm/JSystem/J3DGraphBase/J3DSys/loadPosMtxIndx__6J3DSysCFiUs.s index 053a14259e..e04061114f 100644 --- a/asm/JSystem/J3DGraphBase/J3DSys/loadPosMtxIndx__6J3DSysCFiUs.s +++ b/asm/JSystem/J3DGraphBase/J3DSys/loadPosMtxIndx__6J3DSysCFiUs.s @@ -1,7 +1,7 @@ lbl_8030FEC0: /* 8030FEC0 38 00 00 20 */ li r0, 0x20 /* 8030FEC4 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 8030FEC8 98 03 80 00 */ stb r0, 0x8000(r3) +/* 8030FEC8 98 03 80 00 */ stb r0, 0x8000(r3) /* 0xCC008000@l */ /* 8030FECC B0 A3 80 00 */ sth r5, -0x8000(r3) /* 8030FED0 1C 04 00 0C */ mulli r0, r4, 0xc /* 8030FED4 54 00 04 3E */ clrlwi r0, r0, 0x10 diff --git a/asm/JSystem/J3DGraphBase/J3DSys/reinitIndStages__6J3DSysFv.s b/asm/JSystem/J3DGraphBase/J3DSys/reinitIndStages__6J3DSysFv.s index 1b3280b628..c093999d63 100644 --- a/asm/JSystem/J3DGraphBase/J3DSys/reinitIndStages__6J3DSysFv.s +++ b/asm/JSystem/J3DGraphBase/J3DSys/reinitIndStages__6J3DSysFv.s @@ -43,18 +43,18 @@ lbl_80310D58: /* 80310DE4 38 A0 00 00 */ li r5, 0 /* 80310DE8 48 04 E0 BD */ bl GXSetIndTexCoordScale /* 80310DEC 38 60 00 01 */ li r3, 1 -/* 80310DF0 3C 80 80 3D */ lis r4, IndMtx@ha -/* 80310DF4 38 84 D8 E0 */ addi r4, r4, IndMtx@l +/* 80310DF0 3C 80 80 3D */ lis r4, IndMtx@ha /* 0x803CD8E0@ha */ +/* 80310DF4 38 84 D8 E0 */ addi r4, r4, IndMtx@l /* 0x803CD8E0@l */ /* 80310DF8 38 A0 00 01 */ li r5, 1 /* 80310DFC 48 04 DF 31 */ bl GXSetIndTexMtx /* 80310E00 38 60 00 02 */ li r3, 2 -/* 80310E04 3C 80 80 3D */ lis r4, IndMtx@ha -/* 80310E08 38 84 D8 E0 */ addi r4, r4, IndMtx@l +/* 80310E04 3C 80 80 3D */ lis r4, IndMtx@ha /* 0x803CD8E0@ha */ +/* 80310E08 38 84 D8 E0 */ addi r4, r4, IndMtx@l /* 0x803CD8E0@l */ /* 80310E0C 38 A0 00 01 */ li r5, 1 /* 80310E10 48 04 DF 1D */ bl GXSetIndTexMtx /* 80310E14 38 60 00 03 */ li r3, 3 -/* 80310E18 3C 80 80 3D */ lis r4, IndMtx@ha -/* 80310E1C 38 84 D8 E0 */ addi r4, r4, IndMtx@l +/* 80310E18 3C 80 80 3D */ lis r4, IndMtx@ha /* 0x803CD8E0@ha */ +/* 80310E1C 38 84 D8 E0 */ addi r4, r4, IndMtx@l /* 0x803CD8E0@l */ /* 80310E20 38 A0 00 01 */ li r5, 1 /* 80310E24 48 04 DF 09 */ bl GXSetIndTexMtx /* 80310E28 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JSystem/J3DGraphBase/J3DSys/reinitTexture__6J3DSysFv.s b/asm/JSystem/J3DGraphBase/J3DSys/reinitTexture__6J3DSysFv.s index 9f0aebfb96..5f81d3286d 100644 --- a/asm/JSystem/J3DGraphBase/J3DSys/reinitTexture__6J3DSysFv.s +++ b/asm/JSystem/J3DGraphBase/J3DSys/reinitTexture__6J3DSysFv.s @@ -3,8 +3,8 @@ lbl_80310998: /* 8031099C 7C 08 02 A6 */ mflr r0 /* 803109A0 90 01 00 34 */ stw r0, 0x34(r1) /* 803109A4 38 61 00 08 */ addi r3, r1, 8 -/* 803109A8 3C 80 80 3D */ lis r4, NullTexData@ha -/* 803109AC 38 84 D8 A0 */ addi r4, r4, NullTexData@l +/* 803109A8 3C 80 80 3D */ lis r4, NullTexData@ha /* 0x803CD8A0@ha */ +/* 803109AC 38 84 D8 A0 */ addi r4, r4, NullTexData@l /* 0x803CD8A0@l */ /* 803109B0 38 A0 00 04 */ li r5, 4 /* 803109B4 38 C0 00 04 */ li r6, 4 /* 803109B8 38 E0 00 03 */ li r7, 3 diff --git a/asm/JSystem/J3DGraphBase/J3DSys/setTexCacheRegion__6J3DSysF15_GXTexCacheSize.s b/asm/JSystem/J3DGraphBase/J3DSys/setTexCacheRegion__6J3DSysF15_GXTexCacheSize.s index 6aafb04089..ca75ed1c93 100644 --- a/asm/JSystem/J3DGraphBase/J3DSys/setTexCacheRegion__6J3DSysF15_GXTexCacheSize.s +++ b/asm/JSystem/J3DGraphBase/J3DSys/setTexCacheRegion__6J3DSysF15_GXTexCacheSize.s @@ -6,8 +6,8 @@ lbl_8030FF0C: /* 8030FF1C 48 05 22 B1 */ bl _savegpr_25 /* 8030FF20 7C 7C 1B 78 */ mr r28, r3 /* 8030FF24 7C 9D 23 78 */ mr r29, r4 -/* 8030FF28 3C 60 80 3A */ lis r3, lit_695@ha -/* 8030FF2C 38 83 1D F8 */ addi r4, r3, lit_695@l +/* 8030FF28 3C 60 80 3A */ lis r3, lit_695@ha /* 0x803A1DF8@ha */ +/* 8030FF2C 38 83 1D F8 */ addi r4, r3, lit_695@l /* 0x803A1DF8@l */ /* 8030FF30 80 64 00 00 */ lwz r3, 0(r4) /* 8030FF34 80 04 00 04 */ lwz r0, 4(r4) /* 8030FF38 90 61 00 18 */ stw r3, 0x18(r1) @@ -16,8 +16,8 @@ lbl_8030FF0C: /* 8030FF44 80 04 00 0C */ lwz r0, 0xc(r4) /* 8030FF48 90 61 00 20 */ stw r3, 0x20(r1) /* 8030FF4C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8030FF50 3C 60 80 3A */ lis r3, lit_696@ha -/* 8030FF54 38 83 1E 08 */ addi r4, r3, lit_696@l +/* 8030FF50 3C 60 80 3A */ lis r3, lit_696@ha /* 0x803A1E08@ha */ +/* 8030FF54 38 83 1E 08 */ addi r4, r3, lit_696@l /* 0x803A1E08@l */ /* 8030FF58 80 64 00 00 */ lwz r3, 0(r4) /* 8030FF5C 80 04 00 04 */ lwz r0, 4(r4) /* 8030FF60 90 61 00 08 */ stw r3, 8(r1) diff --git a/asm/JSystem/J3DGraphBase/J3DTevs/calcPostTexMtx__9J3DTexMtxFPA4_Cf.s b/asm/JSystem/J3DGraphBase/J3DTevs/calcPostTexMtx__9J3DTexMtxFPA4_Cf.s index f8109c2e23..f64966e789 100644 --- a/asm/JSystem/J3DGraphBase/J3DTevs/calcPostTexMtx__9J3DTexMtxFPA4_Cf.s +++ b/asm/JSystem/J3DGraphBase/J3DTevs/calcPostTexMtx__9J3DTexMtxFPA4_Cf.s @@ -11,8 +11,8 @@ lbl_80323C0C: /* 80323C30 54 00 06 BE */ clrlwi r0, r0, 0x1a /* 80323C34 28 00 00 0B */ cmplwi r0, 0xb /* 80323C38 41 81 02 E4 */ bgt lbl_80323F1C -/* 80323C3C 3C 60 80 3D */ lis r3, lit_1131@ha -/* 80323C40 38 63 EB B8 */ addi r3, r3, lit_1131@l +/* 80323C3C 3C 60 80 3D */ lis r3, lit_1131@ha /* 0x803CEBB8@ha */ +/* 80323C40 38 63 EB B8 */ addi r3, r3, lit_1131@l /* 0x803CEBB8@l */ /* 80323C44 54 00 10 3A */ slwi r0, r0, 2 /* 80323C48 7C 03 00 2E */ lwzx r0, r3, r0 /* 80323C4C 7C 09 03 A6 */ mtctr r0 @@ -32,8 +32,8 @@ lbl_80323C70: /* 80323C80 4B FE DF B5 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80323C84: /* 80323C84 38 61 00 08 */ addi r3, r1, 8 -/* 80323C88 3C 80 80 3D */ lis r4, qMtx_1063@ha -/* 80323C8C 38 84 EB 58 */ addi r4, r4, qMtx_1063@l +/* 80323C88 3C 80 80 3D */ lis r4, qMtx_1063@ha /* 0x803CEB58@ha */ +/* 80323C8C 38 84 EB 58 */ addi r4, r4, qMtx_1063@l /* 0x803CEB58@l */ /* 80323C90 7C 65 1B 78 */ mr r5, r3 /* 80323C94 48 02 28 51 */ bl PSMTXConcat /* 80323C98 38 61 00 08 */ addi r3, r1, 8 @@ -60,8 +60,8 @@ lbl_80323CD8: /* 80323CE8 4B FE DF 4D */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80323CEC: /* 80323CEC 38 61 00 08 */ addi r3, r1, 8 -/* 80323CF0 3C 80 80 3D */ lis r4, qMtx_1063@ha -/* 80323CF4 38 84 EB 58 */ addi r4, r4, qMtx_1063@l +/* 80323CF0 3C 80 80 3D */ lis r4, qMtx_1063@ha /* 0x803CEB58@ha */ +/* 80323CF4 38 84 EB 58 */ addi r4, r4, qMtx_1063@l /* 0x803CEB58@l */ /* 80323CF8 7C 65 1B 78 */ mr r5, r3 /* 80323CFC 48 02 27 E9 */ bl PSMTXConcat /* 80323D00 38 61 00 08 */ addi r3, r1, 8 @@ -84,8 +84,8 @@ lbl_80323D30: /* 80323D40 4B FE DE F5 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80323D44: /* 80323D44 38 61 00 48 */ addi r3, r1, 0x48 -/* 80323D48 3C 80 80 3D */ lis r4, qMtx_1063@ha -/* 80323D4C 38 84 EB 58 */ addi r4, r4, qMtx_1063@l +/* 80323D48 3C 80 80 3D */ lis r4, qMtx_1063@ha /* 0x803CEB58@ha */ +/* 80323D4C 38 84 EB 58 */ addi r4, r4, qMtx_1063@l /* 0x803CEB58@l */ /* 80323D50 38 BF 00 64 */ addi r5, r31, 0x64 /* 80323D54 48 02 27 91 */ bl PSMTXConcat /* 80323D58 48 00 01 F4 */ b lbl_80323F4C @@ -104,8 +104,8 @@ lbl_80323D78: /* 80323D88 4B FE DF 5D */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323D8C: /* 80323D8C 38 61 00 08 */ addi r3, r1, 8 -/* 80323D90 3C 80 80 3D */ lis r4, qMtx2_1064@ha -/* 80323D94 38 84 EB 88 */ addi r4, r4, qMtx2_1064@l +/* 80323D90 3C 80 80 3D */ lis r4, qMtx2_1064@ha /* 0x803CEB88@ha */ +/* 80323D94 38 84 EB 88 */ addi r4, r4, qMtx2_1064@l /* 0x803CEB88@l */ /* 80323D98 7C 65 1B 78 */ mr r5, r3 /* 80323D9C 48 02 27 49 */ bl PSMTXConcat /* 80323DA0 38 61 00 08 */ addi r3, r1, 8 @@ -132,8 +132,8 @@ lbl_80323DE0: /* 80323DF0 4B FE DE F5 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323DF4: /* 80323DF4 38 61 00 48 */ addi r3, r1, 0x48 -/* 80323DF8 3C 80 80 3D */ lis r4, qMtx2_1064@ha -/* 80323DFC 38 84 EB 88 */ addi r4, r4, qMtx2_1064@l +/* 80323DF8 3C 80 80 3D */ lis r4, qMtx2_1064@ha /* 0x803CEB88@ha */ +/* 80323DFC 38 84 EB 88 */ addi r4, r4, qMtx2_1064@l /* 0x803CEB88@l */ /* 80323E00 38 BF 00 64 */ addi r5, r31, 0x64 /* 80323E04 48 02 26 E1 */ bl PSMTXConcat /* 80323E08 48 00 01 44 */ b lbl_80323F4C diff --git a/asm/JSystem/J3DGraphBase/J3DTevs/calcTexMtx__9J3DTexMtxFPA4_Cf.s b/asm/JSystem/J3DGraphBase/J3DTevs/calcTexMtx__9J3DTexMtxFPA4_Cf.s index 7cecb54e21..4c51c9ea03 100644 --- a/asm/JSystem/J3DGraphBase/J3DTevs/calcTexMtx__9J3DTexMtxFPA4_Cf.s +++ b/asm/JSystem/J3DGraphBase/J3DTevs/calcTexMtx__9J3DTexMtxFPA4_Cf.s @@ -11,8 +11,8 @@ lbl_80323920: /* 80323944 54 00 06 BE */ clrlwi r0, r0, 0x1a /* 80323948 28 00 00 0B */ cmplwi r0, 0xb /* 8032394C 41 81 02 78 */ bgt lbl_80323BC4 -/* 80323950 3C 60 80 3D */ lis r3, lit_1059@ha -/* 80323954 38 63 EB 28 */ addi r3, r3, lit_1059@l +/* 80323950 3C 60 80 3D */ lis r3, lit_1059@ha /* 0x803CEB28@ha */ +/* 80323954 38 63 EB 28 */ addi r3, r3, lit_1059@l /* 0x803CEB28@l */ /* 80323958 54 00 10 3A */ slwi r0, r0, 2 /* 8032395C 7C 03 00 2E */ lwzx r0, r3, r0 /* 80323960 7C 09 03 A6 */ mtctr r0 @@ -32,8 +32,8 @@ lbl_80323984: /* 80323994 4B FE E2 A1 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80323998: /* 80323998 38 61 00 08 */ addi r3, r1, 8 -/* 8032399C 3C 80 80 3D */ lis r4, qMtx_1001@ha -/* 803239A0 38 84 EA C8 */ addi r4, r4, qMtx_1001@l +/* 8032399C 3C 80 80 3D */ lis r4, qMtx_1001@ha /* 0x803CEAC8@ha */ +/* 803239A0 38 84 EA C8 */ addi r4, r4, qMtx_1001@l /* 0x803CEAC8@l */ /* 803239A4 7C 65 1B 78 */ mr r5, r3 /* 803239A8 48 02 2B 3D */ bl PSMTXConcat /* 803239AC 38 61 00 08 */ addi r3, r1, 8 @@ -60,8 +60,8 @@ lbl_803239EC: /* 803239FC 4B FE E2 39 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80323A00: /* 80323A00 38 61 00 48 */ addi r3, r1, 0x48 -/* 80323A04 3C 80 80 3D */ lis r4, qMtx_1001@ha -/* 80323A08 38 84 EA C8 */ addi r4, r4, qMtx_1001@l +/* 80323A04 3C 80 80 3D */ lis r4, qMtx_1001@ha /* 0x803CEAC8@ha */ +/* 80323A08 38 84 EA C8 */ addi r4, r4, qMtx_1001@l /* 0x803CEAC8@l */ /* 80323A0C 7C 65 1B 78 */ mr r5, r3 /* 80323A10 48 02 2A D5 */ bl PSMTXConcat /* 80323A14 38 61 00 48 */ addi r3, r1, 0x48 @@ -84,8 +84,8 @@ lbl_80323A44: /* 80323A54 4B FE E2 91 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323A58: /* 80323A58 38 61 00 08 */ addi r3, r1, 8 -/* 80323A5C 3C 80 80 3D */ lis r4, qMtx2_1002@ha -/* 80323A60 38 84 EA F8 */ addi r4, r4, qMtx2_1002@l +/* 80323A5C 3C 80 80 3D */ lis r4, qMtx2_1002@ha /* 0x803CEAF8@ha */ +/* 80323A60 38 84 EA F8 */ addi r4, r4, qMtx2_1002@l /* 0x803CEAF8@l */ /* 80323A64 7C 65 1B 78 */ mr r5, r3 /* 80323A68 48 02 2A 7D */ bl PSMTXConcat /* 80323A6C 38 61 00 08 */ addi r3, r1, 8 @@ -112,8 +112,8 @@ lbl_80323AAC: /* 80323ABC 4B FE E2 29 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323AC0: /* 80323AC0 38 61 00 48 */ addi r3, r1, 0x48 -/* 80323AC4 3C 80 80 3D */ lis r4, qMtx2_1002@ha -/* 80323AC8 38 84 EA F8 */ addi r4, r4, qMtx2_1002@l +/* 80323AC4 3C 80 80 3D */ lis r4, qMtx2_1002@ha /* 0x803CEAF8@ha */ +/* 80323AC8 38 84 EA F8 */ addi r4, r4, qMtx2_1002@l /* 0x803CEAF8@l */ /* 80323ACC 7C 65 1B 78 */ mr r5, r3 /* 80323AD0 48 02 2A 15 */ bl PSMTXConcat /* 80323AD4 38 61 00 48 */ addi r3, r1, 0x48 diff --git a/asm/JSystem/J3DGraphBase/J3DTevs/loadNBTScale__FR11J3DNBTScale.s b/asm/JSystem/J3DGraphBase/J3DTevs/loadNBTScale__FR11J3DNBTScale.s index 2eb3d2057a..b76aab103c 100644 --- a/asm/JSystem/J3DGraphBase/J3DTevs/loadNBTScale__FR11J3DNBTScale.s +++ b/asm/JSystem/J3DGraphBase/J3DTevs/loadNBTScale__FR11J3DNBTScale.s @@ -3,13 +3,13 @@ lbl_80324160: /* 80324164 28 00 00 01 */ cmplwi r0, 1 /* 80324168 40 82 00 18 */ bne lbl_80324180 /* 8032416C 38 03 00 04 */ addi r0, r3, 4 -/* 80324170 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80324174 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80324170 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80324174 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80324178 90 03 01 18 */ stw r0, 0x118(r3) /* 8032417C 4E 80 00 20 */ blr lbl_80324180: /* 80324180 38 00 00 00 */ li r0, 0 -/* 80324184 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80324188 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80324184 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80324188 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 8032418C 90 03 01 18 */ stw r0, 0x118(r3) /* 80324190 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DTevs/loadTexCoordGens__FUlP11J3DTexCoord.s b/asm/JSystem/J3DGraphBase/J3DTevs/loadTexCoordGens__FUlP11J3DTexCoord.s index 3edd4c8dec..a3cce7e0db 100644 --- a/asm/JSystem/J3DGraphBase/J3DTevs/loadTexCoordGens__FUlP11J3DTexCoord.s +++ b/asm/JSystem/J3DGraphBase/J3DTevs/loadTexCoordGens__FUlP11J3DTexCoord.s @@ -87,8 +87,8 @@ lbl_80323724: /* 8032378C 38 03 00 01 */ addi r0, r3, 1 /* 80323790 90 04 00 08 */ stw r0, 8(r4) /* 80323794 98 A3 00 00 */ stb r5, 0(r3) -/* 80323798 3C 60 80 43 */ lis r3, j3dSys@ha -/* 8032379C 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80323798 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 8032379C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 803237A0 80 03 00 34 */ lwz r0, 0x34(r3) /* 803237A4 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 /* 803237A8 41 82 00 9C */ beq lbl_80323844 diff --git a/asm/JSystem/J3DGraphBase/J3DTevs/loadTexNo__FUlRCUs.s b/asm/JSystem/J3DGraphBase/J3DTevs/loadTexNo__FUlRCUs.s index 7816c8f878..84d003fd40 100644 --- a/asm/JSystem/J3DGraphBase/J3DTevs/loadTexNo__FUlRCUs.s +++ b/asm/JSystem/J3DGraphBase/J3DTevs/loadTexNo__FUlRCUs.s @@ -5,8 +5,8 @@ lbl_80323F94: /* 80323FA0 39 61 00 30 */ addi r11, r1, 0x30 /* 80323FA4 48 03 E2 35 */ bl _savegpr_28 /* 80323FA8 7C 7E 1B 78 */ mr r30, r3 -/* 80323FAC 3C 60 80 43 */ lis r3, j3dSys@ha -/* 80323FB0 38 63 4A C8 */ addi r3, r3, j3dSys@l +/* 80323FAC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ +/* 80323FB0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ /* 80323FB4 80 63 00 58 */ lwz r3, 0x58(r3) /* 80323FB8 80 63 00 04 */ lwz r3, 4(r3) /* 80323FBC A0 04 00 00 */ lhz r0, 0(r4) @@ -14,8 +14,8 @@ lbl_80323F94: /* 80323FC4 7F E3 02 14 */ add r31, r3, r0 /* 80323FC8 A0 1F 00 02 */ lhz r0, 2(r31) /* 80323FCC 57 C4 18 38 */ slwi r4, r30, 3 -/* 80323FD0 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha -/* 80323FD4 38 63 4C 2C */ addi r3, r3, sTexCoordScaleTable__6J3DSys@l +/* 80323FD0 3C 60 80 43 */ lis r3, sTexCoordScaleTable__6J3DSys@ha /* 0x80434C2C@ha */ +/* 80323FD4 38 63 4C 2C */ addi r3, r3, sTexCoordScaleTable__6J3DSys@l /* 0x80434C2C@l */ /* 80323FD8 7C 03 23 2E */ sthx r0, r3, r4 /* 80323FDC A0 1F 00 04 */ lhz r0, 4(r31) /* 80323FE0 7C 63 22 14 */ add r3, r3, r4 diff --git a/asm/JSystem/J3DGraphBase/J3DTevs/load__9J3DTexMtxCFUl.s b/asm/JSystem/J3DGraphBase/J3DTevs/load__9J3DTexMtxCFUl.s index cfa9841b26..5a400960a3 100644 --- a/asm/JSystem/J3DGraphBase/J3DTevs/load__9J3DTexMtxCFUl.s +++ b/asm/JSystem/J3DGraphBase/J3DTevs/load__9J3DTexMtxCFUl.s @@ -2,8 +2,8 @@ lbl_803238C4: /* 803238C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803238C8 7C 08 02 A6 */ mflr r0 /* 803238CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 803238D0 3C A0 80 43 */ lis r5, j3dSys@ha -/* 803238D4 38 A5 4A C8 */ addi r5, r5, j3dSys@l +/* 803238D0 3C A0 80 43 */ lis r5, j3dSys@ha /* 0x80434AC8@ha */ +/* 803238D4 38 A5 4A C8 */ addi r5, r5, j3dSys@l /* 0x80434AC8@l */ /* 803238D8 80 05 00 34 */ lwz r0, 0x34(r5) /* 803238DC 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 /* 803238E0 41 82 00 0C */ beq lbl_803238EC diff --git a/asm/JSystem/J3DGraphBase/J3DTevs/makeAlphaCmpTable__Fv.s b/asm/JSystem/J3DGraphBase/J3DTevs/makeAlphaCmpTable__Fv.s index 2473897b54..e9c7647520 100644 --- a/asm/JSystem/J3DGraphBase/J3DTevs/makeAlphaCmpTable__Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DTevs/makeAlphaCmpTable__Fv.s @@ -1,6 +1,6 @@ lbl_8032423C: -/* 8032423C 3C 60 80 43 */ lis r3, j3dAlphaCmpTable@ha -/* 80324240 38 A3 6E 60 */ addi r5, r3, j3dAlphaCmpTable@l +/* 8032423C 3C 60 80 43 */ lis r3, j3dAlphaCmpTable@ha /* 0x80436E60@ha */ +/* 80324240 38 A3 6E 60 */ addi r5, r3, j3dAlphaCmpTable@l /* 0x80436E60@l */ /* 80324244 39 00 00 00 */ li r8, 0 /* 80324248 38 60 00 00 */ li r3, 0 lbl_8032424C: diff --git a/asm/JSystem/J3DGraphBase/J3DTevs/makeTevSwapTable__Fv.s b/asm/JSystem/J3DGraphBase/J3DTevs/makeTevSwapTable__Fv.s index d33e2e1e39..ba9c4d0973 100644 --- a/asm/JSystem/J3DGraphBase/J3DTevs/makeTevSwapTable__Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DTevs/makeTevSwapTable__Fv.s @@ -1,6 +1,6 @@ lbl_80324314: -/* 80324314 3C 60 80 43 */ lis r3, j3dTevSwapTableTable@ha -/* 80324318 38 03 6A 60 */ addi r0, r3, j3dTevSwapTableTable@l +/* 80324314 3C 60 80 43 */ lis r3, j3dTevSwapTableTable@ha /* 0x80436A60@ha */ +/* 80324318 38 03 6A 60 */ addi r0, r3, j3dTevSwapTableTable@l /* 0x80436A60@l */ /* 8032431C 7C 03 03 78 */ mr r3, r0 /* 80324320 38 80 00 00 */ li r4, 0 lbl_80324324: diff --git a/asm/JSystem/J3DGraphBase/J3DTevs/makeTexCoordTable__Fv.s b/asm/JSystem/J3DGraphBase/J3DTevs/makeTexCoordTable__Fv.s index f480b83149..40eb271804 100644 --- a/asm/JSystem/J3DGraphBase/J3DTevs/makeTexCoordTable__Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DTevs/makeTexCoordTable__Fv.s @@ -1,7 +1,7 @@ lbl_80324194: /* 80324194 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80324198 3C 60 80 3A */ lis r3, lit_1197@ha -/* 8032419C 38 83 1F F8 */ addi r4, r3, lit_1197@l +/* 80324198 3C 60 80 3A */ lis r3, lit_1197@ha /* 0x803A1FF8@ha */ +/* 8032419C 38 83 1F F8 */ addi r4, r3, lit_1197@l /* 0x803A1FF8@l */ /* 803241A0 80 64 00 00 */ lwz r3, 0(r4) /* 803241A4 80 04 00 04 */ lwz r0, 4(r4) /* 803241A8 90 61 00 08 */ stw r3, 8(r1) @@ -10,8 +10,8 @@ lbl_80324194: /* 803241B4 B0 01 00 10 */ sth r0, 0x10(r1) /* 803241B8 88 04 00 0A */ lbz r0, 0xa(r4) /* 803241BC 98 01 00 12 */ stb r0, 0x12(r1) -/* 803241C0 3C 60 80 43 */ lis r3, j3dTexCoordTable@ha -/* 803241C4 38 C3 4C 98 */ addi r6, r3, j3dTexCoordTable@l +/* 803241C0 3C 60 80 43 */ lis r3, j3dTexCoordTable@ha /* 0x80434C98@ha */ +/* 803241C4 38 C3 4C 98 */ addi r6, r3, j3dTexCoordTable@l /* 0x80434C98@l */ /* 803241C8 39 20 00 00 */ li r9, 0 /* 803241CC 38 60 00 00 */ li r3, 0 lbl_803241D0: diff --git a/asm/JSystem/J3DGraphBase/J3DTevs/makeZModeTable__Fv.s b/asm/JSystem/J3DGraphBase/J3DTevs/makeZModeTable__Fv.s index 51461dc610..0c0e94ad24 100644 --- a/asm/JSystem/J3DGraphBase/J3DTevs/makeZModeTable__Fv.s +++ b/asm/JSystem/J3DGraphBase/J3DTevs/makeZModeTable__Fv.s @@ -1,6 +1,6 @@ lbl_803242A8: -/* 803242A8 3C 60 80 43 */ lis r3, j3dZModeTable@ha -/* 803242AC 38 A3 71 60 */ addi r5, r3, j3dZModeTable@l +/* 803242A8 3C 60 80 43 */ lis r3, j3dZModeTable@ha /* 0x80437160@ha */ +/* 803242AC 38 A3 71 60 */ addi r5, r3, j3dZModeTable@l /* 0x80437160@l */ /* 803242B0 39 00 00 00 */ li r8, 0 /* 803242B4 38 60 00 00 */ li r3, 0 lbl_803242B8: diff --git a/asm/JSystem/J3DGraphBase/J3DTransform/J3DCalcYBBoardMtx__FPA4_f.s b/asm/JSystem/J3DGraphBase/J3DTransform/J3DCalcYBBoardMtx__FPA4_f.s index de58a0007c..c940cdbe48 100644 --- a/asm/JSystem/J3DGraphBase/J3DTransform/J3DCalcYBBoardMtx__FPA4_f.s +++ b/asm/JSystem/J3DGraphBase/J3DTransform/J3DCalcYBBoardMtx__FPA4_f.s @@ -48,8 +48,8 @@ lbl_80311804: lbl_80311808: /* 80311808 FF C0 00 90 */ fmr f30, f0 lbl_8031180C: -/* 8031180C 3C 60 80 3A */ lis r3, lit_443@ha -/* 80311810 38 83 1E 8C */ addi r4, r3, lit_443@l +/* 8031180C 3C 60 80 3A */ lis r3, lit_443@ha /* 0x803A1E8C@ha */ +/* 80311810 38 83 1E 8C */ addi r4, r3, lit_443@l /* 0x803A1E8C@l */ /* 80311814 80 64 00 00 */ lwz r3, 0(r4) /* 80311818 80 04 00 04 */ lwz r0, 4(r4) /* 8031181C 90 61 00 08 */ stw r3, 8(r1) diff --git a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f.s b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f.s index 37e92795c0..a38df681d2 100644 --- a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f.s +++ b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f.s @@ -1,8 +1,8 @@ lbl_80311CE4: /* 80311CE4 A8 03 00 08 */ lha r0, 8(r3) /* 80311CE8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80311CEC 3C A0 80 44 */ lis r5, sincosTable___5JMath@ha -/* 80311CF0 38 A5 9A 20 */ addi r5, r5, sincosTable___5JMath@l +/* 80311CEC 3C A0 80 44 */ lis r5, sincosTable___5JMath@ha /* 0x80439A20@ha */ +/* 80311CF0 38 A5 9A 20 */ addi r5, r5, sincosTable___5JMath@l /* 0x80439A20@l */ /* 80311CF4 7C C5 04 2E */ lfsx f6, r5, r0 /* 80311CF8 7C A5 02 14 */ add r5, r5, r0 /* 80311CFC C0 E5 00 04 */ lfs f7, 4(r5) diff --git a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f.s b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f.s index bcac952f23..64a0f4d1ea 100644 --- a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f.s +++ b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f.s @@ -1,8 +1,8 @@ lbl_80311C34: /* 80311C34 A8 03 00 08 */ lha r0, 8(r3) /* 80311C38 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80311C3C 3C A0 80 44 */ lis r5, sincosTable___5JMath@ha -/* 80311C40 38 A5 9A 20 */ addi r5, r5, sincosTable___5JMath@l +/* 80311C3C 3C A0 80 44 */ lis r5, sincosTable___5JMath@ha /* 0x80439A20@ha */ +/* 80311C40 38 A5 9A 20 */ addi r5, r5, sincosTable___5JMath@l /* 0x80439A20@l */ /* 80311C44 7C C5 04 2E */ lfsx f6, r5, r0 /* 80311C48 7C A5 02 14 */ add r5, r5, r0 /* 80311C4C C0 E5 00 04 */ lfs f7, 4(r5) diff --git a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f.s b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f.s index ae54e73bd1..bbcc5a7a8a 100644 --- a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f.s +++ b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f.s @@ -1,8 +1,8 @@ lbl_80311B80: /* 80311B80 A8 03 00 08 */ lha r0, 8(r3) /* 80311B84 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80311B88 3C C0 80 44 */ lis r6, sincosTable___5JMath@ha -/* 80311B8C 38 C6 9A 20 */ addi r6, r6, sincosTable___5JMath@l +/* 80311B88 3C C0 80 44 */ lis r6, sincosTable___5JMath@ha /* 0x80439A20@ha */ +/* 80311B8C 38 C6 9A 20 */ addi r6, r6, sincosTable___5JMath@l /* 0x80439A20@l */ /* 80311B90 7C 06 04 2E */ lfsx f0, r6, r0 /* 80311B94 7C C6 02 14 */ add r6, r6, r0 /* 80311B98 C0 26 00 04 */ lfs f1, 4(r6) diff --git a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f.s b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f.s index 0a6c5361b2..85f9dce0b7 100644 --- a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f.s +++ b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f.s @@ -1,8 +1,8 @@ lbl_80311ACC: /* 80311ACC A8 03 00 08 */ lha r0, 8(r3) /* 80311AD0 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80311AD4 3C C0 80 44 */ lis r6, sincosTable___5JMath@ha -/* 80311AD8 38 C6 9A 20 */ addi r6, r6, sincosTable___5JMath@l +/* 80311AD4 3C C0 80 44 */ lis r6, sincosTable___5JMath@ha /* 0x80439A20@ha */ +/* 80311AD8 38 C6 9A 20 */ addi r6, r6, sincosTable___5JMath@l /* 0x80439A20@l */ /* 80311ADC 7C 06 04 2E */ lfsx f0, r6, r0 /* 80311AE0 7C C6 02 14 */ add r6, r6, r0 /* 80311AE4 C0 26 00 04 */ lfs f1, 4(r6) diff --git a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f.s b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f.s index 735d5e4573..367ae1869b 100644 --- a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f.s +++ b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f.s @@ -1,8 +1,8 @@ lbl_80311964: /* 80311964 A8 03 00 0C */ lha r0, 0xc(r3) /* 80311968 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8031196C 3C A0 80 44 */ lis r5, sincosTable___5JMath@ha -/* 80311970 38 A5 9A 20 */ addi r5, r5, sincosTable___5JMath@l +/* 8031196C 3C A0 80 44 */ lis r5, sincosTable___5JMath@ha /* 0x80439A20@ha */ +/* 80311970 38 A5 9A 20 */ addi r5, r5, sincosTable___5JMath@l /* 0x80439A20@l */ /* 80311974 7C 25 04 2E */ lfsx f1, r5, r0 /* 80311978 38 C5 00 04 */ addi r6, r5, 4 /* 8031197C 7C 46 04 2E */ lfsx f2, r6, r0 diff --git a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTranslateRotateMtx__FsssfffPA4_f.s b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTranslateRotateMtx__FsssfffPA4_f.s index b79cd18127..13368af4d1 100644 --- a/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTranslateRotateMtx__FsssfffPA4_f.s +++ b/asm/JSystem/J3DGraphBase/J3DTransform/J3DGetTranslateRotateMtx__FsssfffPA4_f.s @@ -1,7 +1,7 @@ lbl_80311A24: /* 80311A24 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c -/* 80311A28 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha -/* 80311A2C 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l +/* 80311A28 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ +/* 80311A2C 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ /* 80311A30 7C 83 04 2E */ lfsx f4, r3, r0 /* 80311A34 38 E3 00 04 */ addi r7, r3, 4 /* 80311A38 7C A7 04 2E */ lfsx f5, r7, r0 diff --git a/asm/JSystem/J3DGraphBase/J3DTransform/J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl.s b/asm/JSystem/J3DGraphBase/J3DTransform/J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl.s index 1ce62f5dc5..f4bee5c387 100644 --- a/asm/JSystem/J3DGraphBase/J3DTransform/J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl.s +++ b/asm/JSystem/J3DGraphBase/J3DTransform/J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl.s @@ -1,9 +1,9 @@ lbl_80311F70: /* 80311F70 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80311F74 D9 C1 00 08 */ stfd f14, 8(r1) -/* 80311F78 3C E0 80 45 */ lis r7, Unit01@ha +/* 80311F78 3C E0 80 45 */ lis r7, Unit01@ha /* 0x80450958@ha */ /* 80311F7C D9 E1 00 10 */ stfd f15, 0x10(r1) -/* 80311F80 38 E7 09 58 */ addi r7, r7, Unit01@l +/* 80311F80 38 E7 09 58 */ addi r7, r7, Unit01@l /* 0x80450958@l */ /* 80311F84 DB E1 00 28 */ stfd f31, 0x28(r1) /* 80311F88 38 84 FF F8 */ addi r4, r4, -8 /* 80311F8C 38 A5 FF F8 */ addi r5, r5, -8 diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/setArray__15J3DVertexBufferCFv.s b/asm/JSystem/J3DGraphBase/J3DVertex/setArray__15J3DVertexBufferCFv.s index 0980af80d4..2a455b69c5 100644 --- a/asm/JSystem/J3DGraphBase/J3DVertex/setArray__15J3DVertexBufferCFv.s +++ b/asm/JSystem/J3DGraphBase/J3DVertex/setArray__15J3DVertexBufferCFv.s @@ -1,7 +1,7 @@ lbl_8031106C: /* 8031106C 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80311070 3C 80 80 43 */ lis r4, j3dSys@ha -/* 80311074 38 84 4A C8 */ addi r4, r4, j3dSys@l +/* 80311070 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ +/* 80311074 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */ /* 80311078 90 04 01 0C */ stw r0, 0x10c(r4) /* 8031107C 80 03 00 30 */ lwz r0, 0x30(r3) /* 80311080 90 04 01 10 */ stw r0, 0x110(r4) |