diff options
| -rw-r--r-- | asm/nw4r/lyt/lyt_material.s | 8 | ||||
| -rw-r--r-- | asm/nw4r/lyt/lyt_picture.s | 8 | ||||
| -rw-r--r-- | asm/nw4r/lyt/lyt_textBox.s | 8 | ||||
| -rw-r--r-- | asm/nw4r/lyt/lyt_window.s | 8 | ||||
| -rw-r--r-- | asm/nw4r/ut/ut_CharWriter.s | 26 | ||||
| -rw-r--r-- | asm/text_10_2.s | 8 |
6 files changed, 33 insertions, 33 deletions
diff --git a/asm/nw4r/lyt/lyt_material.s b/asm/nw4r/lyt/lyt_material.s index dd7e5de..7345ab8 100644 --- a/asm/nw4r/lyt/lyt_material.s +++ b/asm/nw4r/lyt/lyt_material.s @@ -220,11 +220,11 @@ __ct__Q34nw4r3lyt8MaterialFPCQ44nw4r3lyt3res8MaterialRCQ34nw4r3lyt11ResBlockSet: /* 8038A700 00386360 39 08 E5 28 */ addi r8, r8, lbl_8044E528@l
/* 8038A704 00386364 3C E0 80 38 */ lis r7, __ct__Q34nw4r2ut5ColorFv@ha
/* 8038A708 00386368 91 C3 00 0C */ stw r14, 0xc(r3)
-/* 8038A70C 0038636C 3C C0 80 36 */ lis r6, func_80362698@ha
+/* 8038A70C 0038636C 3C C0 80 36 */ lis r6, __dt__Q34nw4r2ut5ColorFv@ha
/* 8038A710 00386370 7C 90 23 78 */ mr r16, r4
/* 8038A714 00386374 7C B1 2B 78 */ mr r17, r5
/* 8038A718 00386378 38 87 6D B4 */ addi r4, r7, __ct__Q34nw4r2ut5ColorFv@l
-/* 8038A71C 0038637C 38 A6 26 98 */ addi r5, r6, func_80362698@l
+/* 8038A71C 0038637C 38 A6 26 98 */ addi r5, r6, __dt__Q34nw4r2ut5ColorFv@l
/* 8038A720 00386380 91 03 00 00 */ stw r8, 0(r3)
/* 8038A724 00386384 7C 6F 1B 78 */ mr r15, r3
/* 8038A728 00386388 38 C0 00 04 */ li r6, 4
@@ -1323,9 +1323,9 @@ __dt__Q34nw4r3lyt8MaterialFv: /* 8038B768 003873C8 38 00 00 00 */ li r0, 0
/* 8038B76C 003873CC 90 1E 00 40 */ stw r0, 0x40(r30)
lbl_8038B770:
-/* 8038B770 003873D0 3C 80 80 36 */ lis r4, func_80362698@ha
+/* 8038B770 003873D0 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut5ColorFv@ha
/* 8038B774 003873D4 38 7E 00 28 */ addi r3, r30, 0x28
-/* 8038B778 003873D8 38 84 26 98 */ addi r4, r4, func_80362698@l
+/* 8038B778 003873D8 38 84 26 98 */ addi r4, r4, __dt__Q34nw4r2ut5ColorFv@l
/* 8038B77C 003873DC 38 A0 00 04 */ li r5, 4
/* 8038B780 003873E0 38 C0 00 04 */ li r6, 4
/* 8038B784 003873E4 4B E3 B7 DD */ bl __destroy_arr
diff --git a/asm/nw4r/lyt/lyt_picture.s b/asm/nw4r/lyt/lyt_picture.s index be0bf0c..9a10bf8 100644 --- a/asm/nw4r/lyt/lyt_picture.s +++ b/asm/nw4r/lyt/lyt_picture.s @@ -24,11 +24,11 @@ __ct__Q34nw4r3lyt7PictureFPCQ44nw4r3lyt3res7PictureRCQ34nw4r3lyt11ResBlockSet: /* 80386DEC 00382A4C 3C 60 80 45 */ lis r3, lbl_8044E2E8@ha
/* 80386DF0 00382A50 3C 80 80 38 */ lis r4, __ct__Q34nw4r2ut5ColorFv@ha
/* 80386DF4 00382A54 38 63 E2 E8 */ addi r3, r3, lbl_8044E2E8@l
-/* 80386DF8 00382A58 3C A0 80 36 */ lis r5, func_80362698@ha
+/* 80386DF8 00382A58 3C A0 80 36 */ lis r5, __dt__Q34nw4r2ut5ColorFv@ha
/* 80386DFC 00382A5C 90 7C 00 00 */ stw r3, 0(r28)
/* 80386E00 00382A60 38 7C 00 D4 */ addi r3, r28, 0xd4
/* 80386E04 00382A64 38 84 6D B4 */ addi r4, r4, __ct__Q34nw4r2ut5ColorFv@l
-/* 80386E08 00382A68 38 A5 26 98 */ addi r5, r5, func_80362698@l
+/* 80386E08 00382A68 38 A5 26 98 */ addi r5, r5, __dt__Q34nw4r2ut5ColorFv@l
/* 80386E0C 00382A6C 38 C0 00 04 */ li r6, 4
/* 80386E10 00382A70 38 E0 00 04 */ li r7, 4
/* 80386E14 00382A74 4B E4 00 55 */ bl __construct_array
@@ -123,9 +123,9 @@ __dt__Q34nw4r3lyt7PictureFv: lbl_80386F58:
/* 80386F58 00382BB8 38 7E 00 E4 */ addi r3, r30, 0xe4
/* 80386F5C 00382BBC 48 00 78 2D */ bl Free__Q44nw4r3lyt6detail11TexCoordAryFv
-/* 80386F60 00382BC0 3C 80 80 36 */ lis r4, func_80362698@ha
+/* 80386F60 00382BC0 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut5ColorFv@ha
/* 80386F64 00382BC4 38 7E 00 D4 */ addi r3, r30, 0xd4
-/* 80386F68 00382BC8 38 84 26 98 */ addi r4, r4, func_80362698@l
+/* 80386F68 00382BC8 38 84 26 98 */ addi r4, r4, __dt__Q34nw4r2ut5ColorFv@l
/* 80386F6C 00382BCC 38 A0 00 04 */ li r5, 4
/* 80386F70 00382BD0 38 C0 00 04 */ li r6, 4
/* 80386F74 00382BD4 4B E3 FF ED */ bl __destroy_arr
diff --git a/asm/nw4r/lyt/lyt_textBox.s b/asm/nw4r/lyt/lyt_textBox.s index b091a6e..e0c747f 100644 --- a/asm/nw4r/lyt/lyt_textBox.s +++ b/asm/nw4r/lyt/lyt_textBox.s @@ -72,11 +72,11 @@ __ct__Q34nw4r3lyt7TextBoxFPCQ44nw4r3lyt3res7TextBoxRCQ34nw4r3lyt11ResBlockSet: /* 803873B4 00383014 3C 60 80 45 */ lis r3, lbl_8044E350@ha
/* 803873B8 00383018 3C 80 80 38 */ lis r4, __ct__Q34nw4r2ut5ColorFv@ha
/* 803873BC 0038301C 38 63 E3 50 */ addi r3, r3, lbl_8044E350@l
-/* 803873C0 00383020 3C A0 80 36 */ lis r5, func_80362698@ha
+/* 803873C0 00383020 3C A0 80 36 */ lis r5, __dt__Q34nw4r2ut5ColorFv@ha
/* 803873C4 00383024 90 7C 00 00 */ stw r3, 0(r28)
/* 803873C8 00383028 38 7C 00 D8 */ addi r3, r28, 0xd8
/* 803873CC 0038302C 38 84 6D B4 */ addi r4, r4, __ct__Q34nw4r2ut5ColorFv@l
-/* 803873D0 00383030 38 A5 26 98 */ addi r5, r5, func_80362698@l
+/* 803873D0 00383030 38 A5 26 98 */ addi r5, r5, __dt__Q34nw4r2ut5ColorFv@l
/* 803873D4 00383034 38 C0 00 04 */ li r6, 4
/* 803873D8 00383038 38 E0 00 02 */ li r7, 2
/* 803873DC 0038303C 4B E3 FA 8D */ bl __construct_array
@@ -321,9 +321,9 @@ lbl_80387754: /* 8038775C 003833BC 81 8C 00 68 */ lwz r12, 0x68(r12)
/* 80387760 003833C0 7D 89 03 A6 */ mtctr r12
/* 80387764 003833C4 4E 80 04 21 */ bctrl
-/* 80387768 003833C8 3C 80 80 36 */ lis r4, func_80362698@ha
+/* 80387768 003833C8 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut5ColorFv@ha
/* 8038776C 003833CC 38 7E 00 D8 */ addi r3, r30, 0xd8
-/* 80387770 003833D0 38 84 26 98 */ addi r4, r4, func_80362698@l
+/* 80387770 003833D0 38 84 26 98 */ addi r4, r4, __dt__Q34nw4r2ut5ColorFv@l
/* 80387774 003833D4 38 A0 00 04 */ li r5, 4
/* 80387778 003833D8 38 C0 00 02 */ li r6, 2
/* 8038777C 003833DC 4B E3 F7 E5 */ bl __destroy_arr
diff --git a/asm/nw4r/lyt/lyt_window.s b/asm/nw4r/lyt/lyt_window.s index 7b28277..d7b2ce7 100644 --- a/asm/nw4r/lyt/lyt_window.s +++ b/asm/nw4r/lyt/lyt_window.s @@ -16,12 +16,12 @@ __ct__Q34nw4r3lyt6WindowFPCQ44nw4r3lyt3res6WindowRCQ34nw4r3lyt11ResBlockSet: /* 80387ED8 00383B38 3C 60 80 45 */ lis r3, lbl_8044E404@ha
/* 80387EDC 00383B3C 3C 80 80 38 */ lis r4, __ct__Q34nw4r2ut5ColorFv@ha
/* 80387EE0 00383B40 38 63 E4 04 */ addi r3, r3, lbl_8044E404@l
-/* 80387EE4 00383B44 3C A0 80 36 */ lis r5, func_80362698@ha
+/* 80387EE4 00383B44 3C A0 80 36 */ lis r5, __dt__Q34nw4r2ut5ColorFv@ha
/* 80387EE8 00383B48 3B 78 00 E4 */ addi r27, r24, 0xe4
/* 80387EEC 00383B4C 90 78 00 00 */ stw r3, 0(r24)
/* 80387EF0 00383B50 7F 63 DB 78 */ mr r3, r27
/* 80387EF4 00383B54 38 84 6D B4 */ addi r4, r4, __ct__Q34nw4r2ut5ColorFv@l
-/* 80387EF8 00383B58 38 A5 26 98 */ addi r5, r5, func_80362698@l
+/* 80387EF8 00383B58 38 A5 26 98 */ addi r5, r5, __dt__Q34nw4r2ut5ColorFv@l
/* 80387EFC 00383B5C 38 C0 00 04 */ li r6, 4
/* 80387F00 00383B60 38 E0 00 04 */ li r7, 4
/* 80387F04 00383B64 4B E3 EF 65 */ bl __construct_array
@@ -211,9 +211,9 @@ lbl_803881A0: /* 803881A4 00383E04 48 00 65 E5 */ bl Free__Q44nw4r3lyt6detail11TexCoordAryFv
/* 803881A8 00383E08 34 7C 00 E4 */ addic. r3, r28, 0xe4
/* 803881AC 00383E0C 41 82 00 18 */ beq lbl_803881C4
-/* 803881B0 00383E10 3C 80 80 36 */ lis r4, func_80362698@ha
+/* 803881B0 00383E10 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut5ColorFv@ha
/* 803881B4 00383E14 38 A0 00 04 */ li r5, 4
-/* 803881B8 00383E18 38 84 26 98 */ addi r4, r4, func_80362698@l
+/* 803881B8 00383E18 38 84 26 98 */ addi r4, r4, __dt__Q34nw4r2ut5ColorFv@l
/* 803881BC 00383E1C 38 C0 00 04 */ li r6, 4
/* 803881C0 00383E20 4B E3 ED A1 */ bl __destroy_arr
lbl_803881C4:
diff --git a/asm/nw4r/ut/ut_CharWriter.s b/asm/nw4r/ut/ut_CharWriter.s index 741a471..7c275a3 100644 --- a/asm/nw4r/ut/ut_CharWriter.s +++ b/asm/nw4r/ut/ut_CharWriter.s @@ -128,7 +128,7 @@ lbl_80364964: /* 80364A0C 0036066C 7C A5 32 14 */ add r5, r5, r6
/* 80364A10 00360670 98 BF 00 17 */ stb r5, 0x17(r31)
/* 80364A14 00360674 90 01 00 10 */ stw r0, 0x10(r1)
-/* 80364A18 00360678 4B FF DC C1 */ bl func_803626D8
+/* 80364A18 00360678 4B FF DC C1 */ bl SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color
/* 80364A1C 0036067C C0 02 A5 10 */ lfs f0, lbl_80642B10-_SDA2_BASE_(r2)
/* 80364A20 00360680 38 00 00 01 */ li r0, 1
/* 80364A24 00360684 C0 22 A5 14 */ lfs f1, lbl_80642B14-_SDA2_BASE_(r2)
@@ -251,10 +251,10 @@ lbl_80364BBC: /* 80364BBC 0036081C 88 0D B1 C0 */ lbz r0, lbl_80640480-_SDA_BASE_(r13)
/* 80364BC0 00360820 7C 00 07 75 */ extsb. r0, r0
/* 80364BC4 00360824 40 82 00 28 */ bne lbl_80364BEC
-/* 80364BC8 00360828 3C 80 80 36 */ lis r4, func_80362698@ha
+/* 80364BC8 00360828 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut5ColorFv@ha
/* 80364BCC 0036082C 3C A0 80 62 */ lis r5, lbl_80621708@ha
/* 80364BD0 00360830 93 ED B1 C4 */ stw r31, lbl_80640484-_SDA_BASE_(r13)
-/* 80364BD4 00360834 38 84 26 98 */ addi r4, r4, func_80362698@l
+/* 80364BD4 00360834 38 84 26 98 */ addi r4, r4, __dt__Q34nw4r2ut5ColorFv@l
/* 80364BD8 00360838 38 A5 17 08 */ addi r5, r5, lbl_80621708@l
/* 80364BDC 0036083C 38 6D B1 C4 */ addi r3, r13, lbl_80640484-_SDA_BASE_
/* 80364BE0 00360840 4B E6 20 69 */ bl __register_global_object_tmp
@@ -392,10 +392,10 @@ lbl_80364DE8: /* 80364DE8 00360A48 88 0D B1 C0 */ lbz r0, lbl_80640480-_SDA_BASE_(r13)
/* 80364DEC 00360A4C 7C 00 07 75 */ extsb. r0, r0
/* 80364DF0 00360A50 40 82 00 28 */ bne lbl_80364E18
-/* 80364DF4 00360A54 3C 80 80 36 */ lis r4, func_80362698@ha
+/* 80364DF4 00360A54 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut5ColorFv@ha
/* 80364DF8 00360A58 3C A0 80 62 */ lis r5, lbl_80621708@ha
/* 80364DFC 00360A5C 93 ED B1 C4 */ stw r31, lbl_80640484-_SDA_BASE_(r13)
-/* 80364E00 00360A60 38 84 26 98 */ addi r4, r4, func_80362698@l
+/* 80364E00 00360A60 38 84 26 98 */ addi r4, r4, __dt__Q34nw4r2ut5ColorFv@l
/* 80364E04 00360A64 38 A5 17 08 */ addi r5, r5, lbl_80621708@l
/* 80364E08 00360A68 38 6D B1 C4 */ addi r3, r13, lbl_80640484-_SDA_BASE_
/* 80364E0C 00360A6C 4B E6 1E 3D */ bl __register_global_object_tmp
@@ -510,10 +510,10 @@ lbl_80364FB8: /* 80364FB8 00360C18 88 0D B1 C0 */ lbz r0, lbl_80640480-_SDA_BASE_(r13)
/* 80364FBC 00360C1C 7C 00 07 75 */ extsb. r0, r0
/* 80364FC0 00360C20 40 82 00 28 */ bne lbl_80364FE8
-/* 80364FC4 00360C24 3C 80 80 36 */ lis r4, func_80362698@ha
+/* 80364FC4 00360C24 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut5ColorFv@ha
/* 80364FC8 00360C28 3C A0 80 62 */ lis r5, lbl_80621708@ha
/* 80364FCC 00360C2C 93 ED B1 C4 */ stw r31, lbl_80640484-_SDA_BASE_(r13)
-/* 80364FD0 00360C30 38 84 26 98 */ addi r4, r4, func_80362698@l
+/* 80364FD0 00360C30 38 84 26 98 */ addi r4, r4, __dt__Q34nw4r2ut5ColorFv@l
/* 80364FD4 00360C34 38 A5 17 08 */ addi r5, r5, lbl_80621708@l
/* 80364FD8 00360C38 38 6D B1 C4 */ addi r3, r13, lbl_80640484-_SDA_BASE_
/* 80364FDC 00360C3C 4B E6 1C 6D */ bl __register_global_object_tmp
@@ -629,10 +629,10 @@ lbl_80365188: /* 8036518C 00360DEC 7C 00 07 75 */ extsb. r0, r0
/* 80365190 00360DF0 40 82 00 2C */ bne lbl_803651BC
/* 80365194 00360DF4 38 00 00 00 */ li r0, 0
-/* 80365198 00360DF8 3C 80 80 36 */ lis r4, func_80362698@ha
+/* 80365198 00360DF8 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut5ColorFv@ha
/* 8036519C 00360DFC 3C A0 80 62 */ lis r5, lbl_80621708@ha
/* 803651A0 00360E00 90 0D B1 C4 */ stw r0, lbl_80640484-_SDA_BASE_(r13)
-/* 803651A4 00360E04 38 84 26 98 */ addi r4, r4, func_80362698@l
+/* 803651A4 00360E04 38 84 26 98 */ addi r4, r4, __dt__Q34nw4r2ut5ColorFv@l
/* 803651A8 00360E08 38 6D B1 C4 */ addi r3, r13, lbl_80640484-_SDA_BASE_
/* 803651AC 00360E0C 38 A5 17 08 */ addi r5, r5, lbl_80621708@l
/* 803651B0 00360E10 4B E6 1A 99 */ bl __register_global_object_tmp
@@ -747,10 +747,10 @@ lbl_8036535C: /* 8036535C 00360FBC 88 0D B1 C0 */ lbz r0, lbl_80640480-_SDA_BASE_(r13)
/* 80365360 00360FC0 7C 00 07 75 */ extsb. r0, r0
/* 80365364 00360FC4 40 82 00 28 */ bne lbl_8036538C
-/* 80365368 00360FC8 3C 80 80 36 */ lis r4, func_80362698@ha
+/* 80365368 00360FC8 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut5ColorFv@ha
/* 8036536C 00360FCC 3C A0 80 62 */ lis r5, lbl_80621708@ha
/* 80365370 00360FD0 93 ED B1 C4 */ stw r31, lbl_80640484-_SDA_BASE_(r13)
-/* 80365374 00360FD4 38 84 26 98 */ addi r4, r4, func_80362698@l
+/* 80365374 00360FD4 38 84 26 98 */ addi r4, r4, __dt__Q34nw4r2ut5ColorFv@l
/* 80365378 00360FD8 38 A5 17 08 */ addi r5, r5, lbl_80621708@l
/* 8036537C 00360FDC 38 6D B1 C4 */ addi r3, r13, lbl_80640484-_SDA_BASE_
/* 80365380 00360FE0 4B E6 18 C9 */ bl __register_global_object_tmp
@@ -1352,10 +1352,10 @@ SetupGXWithColorMapping__Q34nw4r2ut10CharWriterFQ34nw4r2ut5ColorQ34nw4r2ut5Color /* 80365C3C 0036189C 7C 00 07 75 */ extsb. r0, r0
/* 80365C40 003618A0 40 82 00 2C */ bne lbl_80365C6C
/* 80365C44 003618A4 38 00 00 00 */ li r0, 0
-/* 80365C48 003618A8 3C 80 80 36 */ lis r4, func_80362698@ha
+/* 80365C48 003618A8 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut5ColorFv@ha
/* 80365C4C 003618AC 3C A0 80 62 */ lis r5, lbl_80621708@ha
/* 80365C50 003618B0 90 0D B1 C4 */ stw r0, lbl_80640484-_SDA_BASE_(r13)
-/* 80365C54 003618B4 38 84 26 98 */ addi r4, r4, func_80362698@l
+/* 80365C54 003618B4 38 84 26 98 */ addi r4, r4, __dt__Q34nw4r2ut5ColorFv@l
/* 80365C58 003618B8 38 6D B1 C4 */ addi r3, r13, lbl_80640484-_SDA_BASE_
/* 80365C5C 003618BC 38 A5 17 08 */ addi r5, r5, lbl_80621708@l
/* 80365C60 003618C0 4B E6 0F E9 */ bl __register_global_object_tmp
diff --git a/asm/text_10_2.s b/asm/text_10_2.s index 0eaa8ca..4ced9f2 100644 --- a/asm/text_10_2.s +++ b/asm/text_10_2.s @@ -2,8 +2,8 @@ .section .text, "ax" # 0x80006980 - 0x803E1E60
-.global func_80362698
-func_80362698:
+.global __dt__Q34nw4r2ut5ColorFv
+__dt__Q34nw4r2ut5ColorFv:
/* 80362698 0035E2F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8036269C 0035E2FC 7C 08 02 A6 */ mflr r0
/* 803626A0 0035E300 2C 03 00 00 */ cmpwi r3, 0
@@ -22,8 +22,8 @@ lbl_803626C0: /* 803626D0 0035E330 38 21 00 10 */ addi r1, r1, 0x10
/* 803626D4 0035E334 4E 80 00 20 */ blr
-.global func_803626D8
-func_803626D8:
+.global SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color
+SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color:
/* 803626D8 0035E338 88 E4 00 00 */ lbz r7, 0(r4)
/* 803626DC 0035E33C 88 C4 00 01 */ lbz r6, 1(r4)
/* 803626E0 0035E340 88 A4 00 02 */ lbz r5, 2(r4)
|